The branch, v3-3-test has been updated
via 14327b11baa18f185e747a321e75abe581d153d2 (commit)
via d2cd011f4379ed2972c8e4c96f6757961fdceaee (commit)
via 909c9ae7ecbaa1bcc38d5c9ebc10fc5fb9a7bf59 (commit)
via bc92507fb425ae56568c72298b9d7e964ae372d0 (commit)
from 225fbe743c34fa7658f8f2e9daf6f51ec1b6e944 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 14327b11baa18f185e747a321e75abe581d153d2
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed Apr 30 16:03:58 2008 +0200
re-run make idl.
Guenther
commit d2cd011f4379ed2972c8e4c96f6757961fdceaee
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed Apr 30 16:02:23 2008 +0200
build: fix make everything.
Guenther
commit 909c9ae7ecbaa1bcc38d5c9ebc10fc5fb9a7bf59
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed Apr 30 15:49:20 2008 +0200
IDL: add nbt_cldap_netlogon_29 which includes the next_closest_site.
Guenther
commit bc92507fb425ae56568c72298b9d7e964ae372d0
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed Apr 30 15:19:32 2008 +0200
IDL: use nbt_netlogon_command in cldap replies.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 25 +++--
source/librpc/gen_ndr/nbt.h | 34 +++++-
source/librpc/gen_ndr/ndr_nbt.c | 235 ++++++++++++++++++++++++++++++++++++---
source/librpc/gen_ndr/ndr_nbt.h | 1 +
source/librpc/idl/nbt.idl | 39 ++++++-
5 files changed, 300 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 0f1df49..cbe36fc 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -916,24 +916,29 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o
torture/scanner.o torture/uta
torture/denytest.o torture/mangle_test.o
SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) \
- $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ)
+ $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
+ librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIB_NONSMBD_OBJ)
+ $(LIB_NONSMBD_OBJ) \
+ librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIB_NONSMBD_OBJ)
+ $(LIB_NONSMBD_OBJ) \
+ librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ)
\
- $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ)
+ $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
+ librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIB_NONSMBD_OBJ)
+ $(LIB_NONSMBD_OBJ) \
+ librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@
$(GROUPDB_OBJ) \
- $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ)
-
+ $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ) \
+ librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE)
$(READLINE_OBJ)
@@ -942,7 +947,8 @@ SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o
$(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ
LOG2PCAP_OBJ = utils/log2pcaphex.o
LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
- $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ)
+ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
+ librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
@@ -983,7 +989,8 @@ NDRDUMP_OBJ = librpc/tools/ndrdump.o \
DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
- $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ)
+ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
+ librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \
$(SMBD_OBJ_SRV) $(NMBD_OBJ1) $(LIBSMB_OBJ) \
diff --git a/source/librpc/gen_ndr/nbt.h b/source/librpc/gen_ndr/nbt.h
index 8093648..a60e04a 100644
--- a/source/librpc/gen_ndr/nbt.h
+++ b/source/librpc/gen_ndr/nbt.h
@@ -534,7 +534,7 @@ struct nbt_netlogon_packet {
}/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
struct nbt_cldap_netlogon_1 {
- uint16_t type;
+ enum nbt_netlogon_command type;
const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -544,7 +544,7 @@ struct nbt_cldap_netlogon_1 {
};
struct nbt_cldap_netlogon_3 {
- uint16_t type;
+ enum nbt_netlogon_command type;
const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -561,7 +561,8 @@ struct nbt_cldap_netlogon_3 {
};
struct nbt_cldap_netlogon_5 {
- uint32_t type;
+ enum nbt_netlogon_command type;
+ uint16_t sbz;
uint32_t server_type;
struct GUID domain_uuid;
const char * forest;
@@ -578,7 +579,8 @@ struct nbt_cldap_netlogon_5 {
}/* [public] */;
struct nbt_cldap_netlogon_13 {
- uint32_t type;
+ enum nbt_netlogon_command type;
+ uint16_t sbz;
uint32_t server_type;
struct GUID domain_uuid;
const char * forest;
@@ -596,11 +598,33 @@ struct nbt_cldap_netlogon_13 {
uint16_t lm20_token;
};
+struct nbt_cldap_netlogon_29 {
+ enum nbt_netlogon_command type;
+ uint16_t sbz;
+ uint32_t server_type;
+ struct GUID domain_uuid;
+ const char * forest;
+ const char * dns_domain;
+ const char * pdc_dns_name;
+ const char * domain;
+ const char * pdc_name;
+ const char * user_name;
+ const char * server_site;
+ const char * client_site;
+ uint8_t dc_sock_addr_size;
+ struct nbt_dc_sock_addr dc_sock_addr;/*
[subcontext_size(dc_sock_addr_size),subcontext(0)] */
+ const char * next_closest_site;
+ uint32_t nt_version;/* [value(29)] */
+ uint16_t lmnt_token;
+ uint16_t lm20_token;
+};
+
union nbt_cldap_netlogon {
struct nbt_cldap_netlogon_1 logon1;/* [case(0)] */
struct nbt_cldap_netlogon_3 logon3;/* [case(2)] */
struct nbt_cldap_netlogon_5 logon5;/* [case(4)] */
- struct nbt_cldap_netlogon_13 logon13;/* [default] */
+ struct nbt_cldap_netlogon_13 logon13;/* [case(8)] */
+ struct nbt_cldap_netlogon_29 logon29;/* [default] */
}/* [public,nodiscriminant,flag(LIBNDR_FLAG_NOALIGN)] */;
enum nbt_ntlogon_command
diff --git a/source/librpc/gen_ndr/ndr_nbt.c b/source/librpc/gen_ndr/ndr_nbt.c
index 85514ed..ed2ea81 100644
--- a/source/librpc/gen_ndr/ndr_nbt.c
+++ b/source/librpc/gen_ndr/ndr_nbt.c
@@ -2488,7 +2488,7 @@ static enum ndr_err_code
ndr_push_nbt_cldap_netlogon_1(struct ndr_push *ndr, int
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->type));
+ NDR_CHECK(ndr_push_nbt_netlogon_command(ndr, NDR_SCALARS,
r->type));
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
@@ -2520,7 +2520,7 @@ static enum ndr_err_code
ndr_pull_nbt_cldap_netlogon_1(struct ndr_pull *ndr, int
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->type));
+ NDR_CHECK(ndr_pull_nbt_netlogon_command(ndr, NDR_SCALARS,
&r->type));
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
@@ -2552,7 +2552,7 @@ _PUBLIC_ void ndr_print_nbt_cldap_netlogon_1(struct
ndr_print *ndr, const char *
{
ndr_print_struct(ndr, name, "nbt_cldap_netlogon_1");
ndr->depth++;
- ndr_print_uint16(ndr, "type", r->type);
+ ndr_print_nbt_netlogon_command(ndr, "type", r->type);
ndr_print_string(ndr, "pdc_name", r->pdc_name);
ndr_print_string(ndr, "user_name", r->user_name);
ndr_print_string(ndr, "domain_name", r->domain_name);
@@ -2566,7 +2566,7 @@ static enum ndr_err_code
ndr_push_nbt_cldap_netlogon_3(struct ndr_push *ndr, int
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->type));
+ NDR_CHECK(ndr_push_nbt_netlogon_command(ndr, NDR_SCALARS,
r->type));
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
@@ -2605,7 +2605,7 @@ static enum ndr_err_code
ndr_pull_nbt_cldap_netlogon_3(struct ndr_pull *ndr, int
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->type));
+ NDR_CHECK(ndr_pull_nbt_netlogon_command(ndr, NDR_SCALARS,
&r->type));
{
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
@@ -2644,7 +2644,7 @@ _PUBLIC_ void ndr_print_nbt_cldap_netlogon_3(struct
ndr_print *ndr, const char *
{
ndr_print_struct(ndr, name, "nbt_cldap_netlogon_3");
ndr->depth++;
- ndr_print_uint16(ndr, "type", r->type);
+ ndr_print_nbt_netlogon_command(ndr, "type", r->type);
ndr_print_string(ndr, "pdc_name", r->pdc_name);
ndr_print_string(ndr, "user_name", r->user_name);
ndr_print_string(ndr, "domain_name", r->domain_name);
@@ -2665,7 +2665,8 @@ _PUBLIC_ enum ndr_err_code
ndr_push_nbt_cldap_netlogon_5(struct ndr_push *ndr, i
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->type));
+ NDR_CHECK(ndr_push_nbt_netlogon_command(ndr, NDR_SCALARS,
r->type));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->sbz));
NDR_CHECK(ndr_push_nbt_server_type(ndr, NDR_SCALARS,
r->server_type));
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->domain_uuid));
NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->forest));
@@ -2689,7 +2690,8 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_nbt_cldap_netlogon_5(struct ndr_pull *ndr, i
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->type));
+ NDR_CHECK(ndr_pull_nbt_netlogon_command(ndr, NDR_SCALARS,
&r->type));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->sbz));
NDR_CHECK(ndr_pull_nbt_server_type(ndr, NDR_SCALARS,
&r->server_type));
NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->domain_uuid));
NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->forest));
@@ -2713,7 +2715,8 @@ _PUBLIC_ void ndr_print_nbt_cldap_netlogon_5(struct
ndr_print *ndr, const char *
{
ndr_print_struct(ndr, name, "nbt_cldap_netlogon_5");
ndr->depth++;
- ndr_print_uint32(ndr, "type", r->type);
+ ndr_print_nbt_netlogon_command(ndr, "type", r->type);
+ ndr_print_uint16(ndr, "sbz", r->sbz);
ndr_print_nbt_server_type(ndr, "server_type", r->server_type);
ndr_print_GUID(ndr, "domain_uuid", &r->domain_uuid);
ndr_print_nbt_string(ndr, "forest", r->forest);
@@ -2734,7 +2737,8 @@ static enum ndr_err_code
ndr_push_nbt_cldap_netlogon_13(struct ndr_push *ndr, in
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->type));
+ NDR_CHECK(ndr_push_nbt_netlogon_command(ndr, NDR_SCALARS,
r->type));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->sbz));
NDR_CHECK(ndr_push_nbt_server_type(ndr, NDR_SCALARS,
r->server_type));
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->domain_uuid));
NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->forest));
@@ -2765,7 +2769,8 @@ static enum ndr_err_code
ndr_pull_nbt_cldap_netlogon_13(struct ndr_pull *ndr, in
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->type));
+ NDR_CHECK(ndr_pull_nbt_netlogon_command(ndr, NDR_SCALARS,
&r->type));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->sbz));
NDR_CHECK(ndr_pull_nbt_server_type(ndr, NDR_SCALARS,
&r->server_type));
NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->domain_uuid));
NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->forest));
@@ -2796,7 +2801,8 @@ _PUBLIC_ void ndr_print_nbt_cldap_netlogon_13(struct
ndr_print *ndr, const char
{
ndr_print_struct(ndr, name, "nbt_cldap_netlogon_13");
ndr->depth++;
- ndr_print_uint32(ndr, "type", r->type);
+ ndr_print_nbt_netlogon_command(ndr, "type", r->type);
+ ndr_print_uint16(ndr, "sbz", r->sbz);
ndr_print_nbt_server_type(ndr, "server_type", r->server_type);
ndr_print_GUID(ndr, "domain_uuid", &r->domain_uuid);
ndr_print_nbt_string(ndr, "forest", r->forest);
@@ -2815,6 +2821,97 @@ _PUBLIC_ void ndr_print_nbt_cldap_netlogon_13(struct
ndr_print *ndr, const char
ndr->depth--;
}
+static enum ndr_err_code ndr_push_nbt_cldap_netlogon_29(struct ndr_push *ndr,
int ndr_flags, const struct nbt_cldap_netlogon_29 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_nbt_netlogon_command(ndr, NDR_SCALARS,
r->type));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->sbz));
+ NDR_CHECK(ndr_push_nbt_server_type(ndr, NDR_SCALARS,
r->server_type));
+ NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->domain_uuid));
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->forest));
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->dns_domain));
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS,
r->pdc_dns_name));
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->domain));
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->pdc_name));
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->user_name));
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS,
r->server_site));
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS,
r->client_site));
+ NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS,
r->dc_sock_addr_size));
+ {
+ struct ndr_push *_ndr_dc_sock_addr;
+ NDR_CHECK(ndr_push_subcontext_start(ndr,
&_ndr_dc_sock_addr, 0, r->dc_sock_addr_size));
+ NDR_CHECK(ndr_push_nbt_dc_sock_addr(_ndr_dc_sock_addr,
NDR_SCALARS, &r->dc_sock_addr));
+ NDR_CHECK(ndr_push_subcontext_end(ndr,
_ndr_dc_sock_addr, 0, r->dc_sock_addr_size));
+ }
+ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS,
r->next_closest_site));
+ NDR_CHECK(ndr_push_nbt_netlogon_version(ndr, NDR_SCALARS, 29));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lmnt_token));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lm20_token));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_nbt_cldap_netlogon_29(struct ndr_pull *ndr,
int ndr_flags, struct nbt_cldap_netlogon_29 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_nbt_netlogon_command(ndr, NDR_SCALARS,
&r->type));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->sbz));
+ NDR_CHECK(ndr_pull_nbt_server_type(ndr, NDR_SCALARS,
&r->server_type));
+ NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->domain_uuid));
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->forest));
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS,
&r->dns_domain));
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS,
&r->pdc_dns_name));
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->domain));
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->pdc_name));
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->user_name));
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS,
&r->server_site));
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS,
&r->client_site));
+ NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS,
&r->dc_sock_addr_size));
+ {
+ struct ndr_pull *_ndr_dc_sock_addr;
+ NDR_CHECK(ndr_pull_subcontext_start(ndr,
&_ndr_dc_sock_addr, 0, r->dc_sock_addr_size));
+ NDR_CHECK(ndr_pull_nbt_dc_sock_addr(_ndr_dc_sock_addr,
NDR_SCALARS, &r->dc_sock_addr));
+ NDR_CHECK(ndr_pull_subcontext_end(ndr,
_ndr_dc_sock_addr, 0, r->dc_sock_addr_size));
+ }
+ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS,
&r->next_closest_site));
+ NDR_CHECK(ndr_pull_nbt_netlogon_version(ndr, NDR_SCALARS,
&r->nt_version));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lmnt_token));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lm20_token));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_nbt_cldap_netlogon_29(struct ndr_print *ndr, const
char *name, const struct nbt_cldap_netlogon_29 *r)
+{
+ ndr_print_struct(ndr, name, "nbt_cldap_netlogon_29");
+ ndr->depth++;
+ ndr_print_nbt_netlogon_command(ndr, "type", r->type);
+ ndr_print_uint16(ndr, "sbz", r->sbz);
+ ndr_print_nbt_server_type(ndr, "server_type", r->server_type);
+ ndr_print_GUID(ndr, "domain_uuid", &r->domain_uuid);
+ ndr_print_nbt_string(ndr, "forest", r->forest);
+ ndr_print_nbt_string(ndr, "dns_domain", r->dns_domain);
+ ndr_print_nbt_string(ndr, "pdc_dns_name", r->pdc_dns_name);
+ ndr_print_nbt_string(ndr, "domain", r->domain);
+ ndr_print_nbt_string(ndr, "pdc_name", r->pdc_name);
+ ndr_print_nbt_string(ndr, "user_name", r->user_name);
+ ndr_print_nbt_string(ndr, "server_site", r->server_site);
+ ndr_print_nbt_string(ndr, "client_site", r->client_site);
+ ndr_print_uint8(ndr, "dc_sock_addr_size", r->dc_sock_addr_size);
+ ndr_print_nbt_dc_sock_addr(ndr, "dc_sock_addr", &r->dc_sock_addr);
+ ndr_print_nbt_string(ndr, "next_closest_site", r->next_closest_site);
+ ndr_print_nbt_netlogon_version(ndr, "nt_version", (ndr->flags &
LIBNDR_PRINT_SET_VALUES)?29:r->nt_version);
+ ndr_print_uint16(ndr, "lmnt_token", r->lmnt_token);
+ ndr_print_uint16(ndr, "lm20_token", r->lm20_token);
+ ndr->depth--;
+}
+
_PUBLIC_ enum ndr_err_code ndr_push_nbt_cldap_netlogon(struct ndr_push *ndr,
int ndr_flags, const union nbt_cldap_netlogon *r)
{
{
@@ -2855,10 +2952,34 @@ _PUBLIC_ enum ndr_err_code
ndr_push_nbt_cldap_netlogon(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_nbt_cldap_netlogon_5(ndr, NDR_SCALARS, &r->logon5));
break; }
- default: {
+ case 8: {
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
break; }
+ case 9: {
+
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 10: {
+
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 11: {
+
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 12: {
+
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 13: {
+
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ default: {
+
NDR_CHECK(ndr_push_nbt_cldap_netlogon_29(ndr, NDR_SCALARS, &r->logon29));
+ break; }
+
}
}
if (ndr_flags & NDR_BUFFERS) {
@@ -2888,6 +3009,24 @@ _PUBLIC_ enum ndr_err_code
ndr_push_nbt_cldap_netlogon(struct ndr_push *ndr, int
case 7:
break;
+ case 8:
+ break;
+
+ case 9:
+ break;
+
+ case 10:
+ break;
+
+ case 11:
+ break;
+
+ case 12:
+ break;
+
+ case 13:
+ break;
+
default:
break;
@@ -2939,10 +3078,34 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_nbt_cldap_netlogon(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_5(ndr, NDR_SCALARS, &r->logon5));
break; }
- default: {
+ case 8: {
+
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 9: {
+
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 10: {
+
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 11: {
+
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 12: {
+
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 13: {
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
break; }
+ default: {
+
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_29(ndr, NDR_SCALARS, &r->logon29));
+ break; }
+
}
}
if (ndr_flags & NDR_BUFFERS) {
@@ -2971,6 +3134,24 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_nbt_cldap_netlogon(struct ndr_pull *ndr, int
case 7:
break;
+ case 8:
+ break;
+
+ case 9:
+ break;
+
+ case 10:
+ break;
+
+ case 11:
+ break;
+
+ case 12:
+ break;
+
+ case 13:
+ break;
+
default:
break;
@@ -3022,10 +3203,34 @@ _PUBLIC_ void ndr_print_nbt_cldap_netlogon(struct
ndr_print *ndr, const char *na
ndr_print_nbt_cldap_netlogon_5(ndr, "logon5",
&r->logon5);
break;
- default:
+ case 8:
+ ndr_print_nbt_cldap_netlogon_13(ndr, "logon13",
&r->logon13);
+ break;
+
+ case 9:
+ ndr_print_nbt_cldap_netlogon_13(ndr, "logon13",
&r->logon13);
+ break;
+
+ case 10:
+ ndr_print_nbt_cldap_netlogon_13(ndr, "logon13",
&r->logon13);
+ break;
+
+ case 11:
ndr_print_nbt_cldap_netlogon_13(ndr, "logon13",
&r->logon13);
break;
+ case 12:
+ ndr_print_nbt_cldap_netlogon_13(ndr, "logon13",
&r->logon13);
+ break;
--
Samba Shared Repository
