From a0b1968167c36c345711a98c65c3974590b1ce6a Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 2 Sep 2009 15:29:44 +0200 Subject: s3-netlogon: use WERRORs in NETLOGON_INFO structures. Guenther --- librpc/gen_ndr/ndr_netlogon.c | 18 +++++++++--------- librpc/gen_ndr/netlogon.h | 6 +++--- librpc/idl/netlogon.idl | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'librpc') diff --git a/librpc/gen_ndr/ndr_netlogon.c b/librpc/gen_ndr/ndr_netlogon.c index 46247b4998..7337d2697a 100644 --- a/librpc/gen_ndr/ndr_netlogon.c +++ b/librpc/gen_ndr/ndr_netlogon.c @@ -5627,7 +5627,7 @@ static enum ndr_err_code ndr_push_netr_NETLOGON_INFO_1(struct ndr_push *ndr, int if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); NDR_CHECK(ndr_push_netr_InfoFlags(ndr, NDR_SCALARS, r->flags)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->pdc_connection_status)); + NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->pdc_connection_status)); } if (ndr_flags & NDR_BUFFERS) { } @@ -5639,7 +5639,7 @@ static enum ndr_err_code ndr_pull_netr_NETLOGON_INFO_1(struct ndr_pull *ndr, int if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); NDR_CHECK(ndr_pull_netr_InfoFlags(ndr, NDR_SCALARS, &r->flags)); - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->pdc_connection_status)); + NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->pdc_connection_status)); } if (ndr_flags & NDR_BUFFERS) { } @@ -5651,7 +5651,7 @@ _PUBLIC_ void ndr_print_netr_NETLOGON_INFO_1(struct ndr_print *ndr, const char * ndr_print_struct(ndr, name, "netr_NETLOGON_INFO_1"); ndr->depth++; ndr_print_netr_InfoFlags(ndr, "flags", r->flags); - ndr_print_uint32(ndr, "pdc_connection_status", r->pdc_connection_status); + ndr_print_WERROR(ndr, "pdc_connection_status", r->pdc_connection_status); ndr->depth--; } @@ -5660,9 +5660,9 @@ static enum ndr_err_code ndr_push_netr_NETLOGON_INFO_2(struct ndr_push *ndr, int if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); NDR_CHECK(ndr_push_netr_InfoFlags(ndr, NDR_SCALARS, r->flags)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->pdc_connection_status)); + NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->pdc_connection_status)); NDR_CHECK(ndr_push_unique_ptr(ndr, r->trusted_dc_name)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->tc_connection_status)); + NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->tc_connection_status)); } if (ndr_flags & NDR_BUFFERS) { if (r->trusted_dc_name) { @@ -5682,14 +5682,14 @@ static enum ndr_err_code ndr_pull_netr_NETLOGON_INFO_2(struct ndr_pull *ndr, int if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); NDR_CHECK(ndr_pull_netr_InfoFlags(ndr, NDR_SCALARS, &r->flags)); - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->pdc_connection_status)); + NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->pdc_connection_status)); NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_trusted_dc_name)); if (_ptr_trusted_dc_name) { NDR_PULL_ALLOC(ndr, r->trusted_dc_name); } else { r->trusted_dc_name = NULL; } - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->tc_connection_status)); + NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->tc_connection_status)); } if (ndr_flags & NDR_BUFFERS) { if (r->trusted_dc_name) { @@ -5713,14 +5713,14 @@ _PUBLIC_ void ndr_print_netr_NETLOGON_INFO_2(struct ndr_print *ndr, const char * ndr_print_struct(ndr, name, "netr_NETLOGON_INFO_2"); ndr->depth++; ndr_print_netr_InfoFlags(ndr, "flags", r->flags); - ndr_print_uint32(ndr, "pdc_connection_status", r->pdc_connection_status); + ndr_print_WERROR(ndr, "pdc_connection_status", r->pdc_connection_status); ndr_print_ptr(ndr, "trusted_dc_name", r->trusted_dc_name); ndr->depth++; if (r->trusted_dc_name) { ndr_print_string(ndr, "trusted_dc_name", r->trusted_dc_name); } ndr->depth--; - ndr_print_uint32(ndr, "tc_connection_status", r->tc_connection_status); + ndr_print_WERROR(ndr, "tc_connection_status", r->tc_connection_status); ndr->depth--; } diff --git a/librpc/gen_ndr/netlogon.h b/librpc/gen_ndr/netlogon.h index b3cf3f35cf..931222f27c 100644 --- a/librpc/gen_ndr/netlogon.h +++ b/librpc/gen_ndr/netlogon.h @@ -656,14 +656,14 @@ struct netr_AccountBuffer { struct netr_NETLOGON_INFO_1 { uint32_t flags; - uint32_t pdc_connection_status; + WERROR pdc_connection_status; }; struct netr_NETLOGON_INFO_2 { uint32_t flags; - uint32_t pdc_connection_status; + WERROR pdc_connection_status; const char *trusted_dc_name;/* [unique,charset(UTF16)] */ - uint32_t tc_connection_status; + WERROR tc_connection_status; }; struct netr_NETLOGON_INFO_3 { diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl index cec686b538..736a0fd9e4 100644 --- a/librpc/idl/netlogon.idl +++ b/librpc/idl/netlogon.idl @@ -843,14 +843,14 @@ interface netlogon typedef struct { netr_InfoFlags flags; - uint32 pdc_connection_status; + WERROR pdc_connection_status; } netr_NETLOGON_INFO_1; typedef struct { netr_InfoFlags flags; - uint32 pdc_connection_status; + WERROR pdc_connection_status; [string,charset(UTF16)] uint16 *trusted_dc_name; - uint32 tc_connection_status; + WERROR tc_connection_status; } netr_NETLOGON_INFO_2; typedef struct { -- cgit