From 792b544e3704c792d969ebe55b950919283df5b1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 31 Aug 2009 17:12:07 +0200 Subject: netlogon: fill in more details for the netr_LogonControlX family of calls. Guenther --- librpc/gen_ndr/ndr_netlogon.c | 49 ++++++++++++++++++++++++++++--------------- librpc/gen_ndr/netlogon.h | 11 +++++++--- librpc/idl/netlogon.idl | 13 +++++++++--- 3 files changed, 50 insertions(+), 23 deletions(-) diff --git a/librpc/gen_ndr/ndr_netlogon.c b/librpc/gen_ndr/ndr_netlogon.c index 81fc9aca9b..46247b4998 100644 --- a/librpc/gen_ndr/ndr_netlogon.c +++ b/librpc/gen_ndr/ndr_netlogon.c @@ -5611,9 +5611,14 @@ _PUBLIC_ void ndr_print_netr_InfoFlags(struct ndr_print *ndr, const char *name, { ndr_print_uint32(ndr, name, r); ndr->depth++; - ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_CTRL_REPL_NEEDED", NETLOGON_CTRL_REPL_NEEDED, r); - ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_CTRL_REPL_IN_PROGRESS", NETLOGON_CTRL_REPL_IN_PROGRESS, r); - ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_CTRL_REPL_FULL_SYNC", NETLOGON_CTRL_REPL_FULL_SYNC, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_REPLICATION_NEEDED", NETLOGON_REPLICATION_NEEDED, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_REPLICATION_IN_PROGRESS", NETLOGON_REPLICATION_IN_PROGRESS, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_FULL_SYNC_REPLICATION", NETLOGON_FULL_SYNC_REPLICATION, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_REDO_NEEDED", NETLOGON_REDO_NEEDED, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_HAS_IP", NETLOGON_HAS_IP, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_HAS_TIMESERV", NETLOGON_HAS_TIMESERV, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_DNS_UPDATE_FAILURE", NETLOGON_DNS_UPDATE_FAILURE, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_VERIFY_STATUS_RETURNED", NETLOGON_VERIFY_STATUS_RETURNED, r); ndr->depth--; } @@ -5882,8 +5887,9 @@ static enum ndr_err_code ndr_push_netr_CONTROL_QUERY_INFORMATION(struct ndr_push NDR_CHECK(ndr_push_unique_ptr(ndr, r->info4)); break; } - default: - return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); + default: { + break; } + } } if (ndr_flags & NDR_BUFFERS) { @@ -5914,7 +5920,8 @@ static enum ndr_err_code ndr_push_netr_CONTROL_QUERY_INFORMATION(struct ndr_push break; default: - return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); + break; + } } return NDR_ERR_SUCCESS; @@ -5975,8 +5982,9 @@ static enum ndr_err_code ndr_pull_netr_CONTROL_QUERY_INFORMATION(struct ndr_pull } break; } - default: - return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); + default: { + break; } + } } if (ndr_flags & NDR_BUFFERS) { @@ -6018,7 +6026,8 @@ static enum ndr_err_code ndr_pull_netr_CONTROL_QUERY_INFORMATION(struct ndr_pull break; default: - return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); + break; + } } return NDR_ERR_SUCCESS; @@ -6067,7 +6076,8 @@ _PUBLIC_ void ndr_print_netr_CONTROL_QUERY_INFORMATION(struct ndr_print *ndr, co break; default: - ndr_print_bad_level(ndr, name, level); + break; + } } @@ -6144,8 +6154,9 @@ static enum ndr_err_code ndr_push_netr_CONTROL_DATA_INFORMATION(struct ndr_push NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->debug_level)); break; } - default: - return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); + default: { + break; } + } } if (ndr_flags & NDR_BUFFERS) { @@ -6209,7 +6220,8 @@ static enum ndr_err_code ndr_push_netr_CONTROL_DATA_INFORMATION(struct ndr_push break; default: - return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); + break; + } } return NDR_ERR_SUCCESS; @@ -6292,8 +6304,9 @@ static enum ndr_err_code ndr_pull_netr_CONTROL_DATA_INFORMATION(struct ndr_pull NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->debug_level)); break; } - default: - return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); + default: { + break; } + } } if (ndr_flags & NDR_BUFFERS) { @@ -6392,7 +6405,8 @@ static enum ndr_err_code ndr_pull_netr_CONTROL_DATA_INFORMATION(struct ndr_pull break; default: - return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); + break; + } } return NDR_ERR_SUCCESS; @@ -6463,7 +6477,8 @@ _PUBLIC_ void ndr_print_netr_CONTROL_DATA_INFORMATION(struct ndr_print *ndr, con break; default: - ndr_print_bad_level(ndr, name, level); + break; + } } diff --git a/librpc/gen_ndr/netlogon.h b/librpc/gen_ndr/netlogon.h index 64a9b1cd4b..b3cf3f35cf 100644 --- a/librpc/gen_ndr/netlogon.h +++ b/librpc/gen_ndr/netlogon.h @@ -645,9 +645,14 @@ struct netr_AccountBuffer { }; /* bitmap netr_InfoFlags */ -#define NETLOGON_CTRL_REPL_NEEDED ( 0x0001 ) -#define NETLOGON_CTRL_REPL_IN_PROGRESS ( 0x0002 ) -#define NETLOGON_CTRL_REPL_FULL_SYNC ( 0x0004 ) +#define NETLOGON_REPLICATION_NEEDED ( 0x00000001 ) +#define NETLOGON_REPLICATION_IN_PROGRESS ( 0x00000002 ) +#define NETLOGON_FULL_SYNC_REPLICATION ( 0x00000004 ) +#define NETLOGON_REDO_NEEDED ( 0x00000008 ) +#define NETLOGON_HAS_IP ( 0x00000010 ) +#define NETLOGON_HAS_TIMESERV ( 0x00000020 ) +#define NETLOGON_DNS_UPDATE_FAILURE ( 0x00000040 ) +#define NETLOGON_VERIFY_STATUS_RETURNED ( 0x00000080 ) struct netr_NETLOGON_INFO_1 { uint32_t flags; diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl index e0eb9ec11f..cec686b538 100644 --- a/librpc/idl/netlogon.idl +++ b/librpc/idl/netlogon.idl @@ -831,9 +831,14 @@ interface netlogon /* Function 0x0C */ typedef [bitmap32bit] bitmap { - NETLOGON_CTRL_REPL_NEEDED = 0x0001, - NETLOGON_CTRL_REPL_IN_PROGRESS = 0x0002, - NETLOGON_CTRL_REPL_FULL_SYNC = 0x0004 + NETLOGON_REPLICATION_NEEDED = 0x00000001, + NETLOGON_REPLICATION_IN_PROGRESS = 0x00000002, + NETLOGON_FULL_SYNC_REPLICATION = 0x00000004, + NETLOGON_REDO_NEEDED = 0x00000008, + NETLOGON_HAS_IP = 0x00000010, + NETLOGON_HAS_TIMESERV = 0x00000020, + NETLOGON_DNS_UPDATE_FAILURE = 0x00000040, + NETLOGON_VERIFY_STATUS_RETURNED = 0x00000080 } netr_InfoFlags; typedef struct { @@ -868,6 +873,7 @@ interface netlogon [case(2)] netr_NETLOGON_INFO_2 *info2; [case(3)] netr_NETLOGON_INFO_3 *info3; [case(4)] netr_NETLOGON_INFO_4 *info4; + [default] ; } netr_CONTROL_QUERY_INFORMATION; /* function_code values */ @@ -919,6 +925,7 @@ interface netlogon [case(NETLOGON_CONTROL_TC_VERIFY)] [string,charset(UTF16)] uint16 *domain; [case(NETLOGON_CONTROL_FIND_USER)] [string,charset(UTF16)] uint16 *user; [case(NETLOGON_CONTROL_SET_DBFLAG)] uint32 debug_level; + [default] ; } netr_CONTROL_DATA_INFORMATION; WERROR netr_LogonControl2( -- cgit