r23808: Make us a bit more C++ friendly. Thanks to Constantine Vetoshev

<gepardcv@yahoo.com> for checking.
(This used to be commit 84b8a56fe9aef1e0583cf5f5abb037199cf21fd9)

5 files changed, 13 insertions, 17 deletions

diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index acd3322784..ca106e93ff 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -1147,7 +1147,7 @@ typedef struct net_q_dsr_getdcnameex {
 } NET_Q_DSR_GETDCNAMEEX;
 
 /* NET_R_DSR_GETDCNAMEEX */
-typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX;
+typedef struct net_r_dsr_getdcnameex NET_R_DSR_GETDCNAMEEX;
 
 /* NET_Q_DSR_GETDCNAMEEX2 */
 typedef struct net_q_dsr_getdcnameex2 {
@@ -1165,8 +1165,8 @@ typedef struct net_q_dsr_getdcnameex2 {
 	uint32 flags;
 } NET_Q_DSR_GETDCNAMEEX2;
 
-/* NET_R_DSR_GETDCNAMEEX */
-typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX2;
+/* NET_R_DSR_GETDCNAMEEX2 */
+typedef struct net_r_dsr_getdcnameex2 NET_R_DSR_GETDCNAMEEX2;
 
 /* NET_Q_DSR_GESITENAME */
 typedef struct net_q_dsr_getsitename {
diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index e212904070..1e42aef20c 100644
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -122,15 +122,11 @@
 
 /* utility structures for RPCs */
 
-typedef struct {
-	uint32 type;
-	uint32 state;
-	uint32 controls_accepted;
-	WERROR win32_exit_code;
-	uint32 service_exit_code;
-	uint32 check_point;
-	uint32 wait_hint;
-} SERVICE_STATUS;
+/*
+ * "struct SERVICE_STATUS" comes from librpc/gen_ndr/svcctl.h
+ */
+
+typedef struct SERVICE_STATUS SERVICE_STATUS;
 
 typedef struct {
 	SERVICE_STATUS status;
diff --git a/source3/librpc/gen_ndr/ndr_svcctl.c b/source3/librpc/gen_ndr/ndr_svcctl.c
index f3ea9862a9..789503346e 100644
--- a/source3/librpc/gen_ndr/ndr_svcctl.c
+++ b/source3/librpc/gen_ndr/ndr_svcctl.c
@@ -76,7 +76,7 @@ NTSTATUS ndr_push_SERVICE_STATUS(struct ndr_push *ndr, int ndr_flags, const stru
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->type));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->state));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->controls_accepted));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->win32_exit_code));
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->win32_exit_code));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->service_exit_code));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->check_point));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->wait_hint));
@@ -93,7 +93,7 @@ NTSTATUS ndr_pull_SERVICE_STATUS(struct ndr_pull *ndr, int ndr_flags, struct SER
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->type));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->state));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->controls_accepted));
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->win32_exit_code));
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->win32_exit_code));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->service_exit_code));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->check_point));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->wait_hint));
@@ -110,7 +110,7 @@ _PUBLIC_ void ndr_print_SERVICE_STATUS(struct ndr_print *ndr, const char *name,
 	ndr_print_uint32(ndr, "type", r->type);
 	ndr_print_uint32(ndr, "state", r->state);
 	ndr_print_uint32(ndr, "controls_accepted", r->controls_accepted);
-	ndr_print_uint32(ndr, "win32_exit_code", r->win32_exit_code);
+	ndr_print_WERROR(ndr, "win32_exit_code", r->win32_exit_code);
 	ndr_print_uint32(ndr, "service_exit_code", r->service_exit_code);
 	ndr_print_uint32(ndr, "check_point", r->check_point);
 	ndr_print_uint32(ndr, "wait_hint", r->wait_hint);
diff --git a/source3/librpc/gen_ndr/svcctl.h b/source3/librpc/gen_ndr/svcctl.h
index 5c7f32cd7b..fbb995e0a7 100644
--- a/source3/librpc/gen_ndr/svcctl.h
+++ b/source3/librpc/gen_ndr/svcctl.h
@@ -27,7 +27,7 @@ struct SERVICE_STATUS {
 	uint32_t type;
 	uint32_t state;
 	uint32_t controls_accepted;
-	uint32_t win32_exit_code;
+	WERROR win32_exit_code;
 	uint32_t service_exit_code;
 	uint32_t check_point;
 	uint32_t wait_hint;
diff --git a/source3/librpc/idl/svcctl.idl b/source3/librpc/idl/svcctl.idl
index c2ede616ee..8d5c8cd244 100644
--- a/source3/librpc/idl/svcctl.idl
+++ b/source3/librpc/idl/svcctl.idl
@@ -22,7 +22,7 @@
 		uint32 type;
 		uint32 state;
 		uint32 controls_accepted;
-		uint32 win32_exit_code;
+		WERROR win32_exit_code;
 		uint32 service_exit_code;
 		uint32 check_point;
 		uint32 wait_hint;