idl: Regenerate DRSUAPI idl files

Signed-off-by: Stefan Metzmacher <metze@samba.org>

5 files changed, 225 insertions, 299 deletions

diff --git a/librpc/gen_ndr/cli_drsuapi.c b/librpc/gen_ndr/cli_drsuapi.c
index 352442f9f9..2ecf0061d1 100644
--- a/librpc/gen_ndr/cli_drsuapi.c
+++ b/librpc/gen_ndr/cli_drsuapi.c
@@ -475,9 +475,9 @@ struct tevent_req *rpccli_drsuapi_DsGetNCChanges_send(TALLOC_CTX *mem_ctx,
 						      struct tevent_context *ev,
 						      struct rpc_pipe_client *cli,
 						      struct policy_handle *_bind_handle /* [in] [ref] */,
-						      int32_t _level /* [in]  */,
+						      uint32_t _level /* [in]  */,
 						      union drsuapi_DsGetNCChangesRequest *_req /* [in] [ref,switch_is(level)] */,
-						      int32_t *_level_out /* [out] [ref] */,
+						      uint32_t *_level_out /* [out] [ref] */,
 						      union drsuapi_DsGetNCChangesCtr *_ctr /* [out] [ref,switch_is(*level_out)] */)
 {
 	struct tevent_req *req;
@@ -585,9 +585,9 @@ NTSTATUS rpccli_drsuapi_DsGetNCChanges_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsGetNCChanges(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
 				       struct policy_handle *bind_handle /* [in] [ref] */,
-				       int32_t level /* [in]  */,
+				       uint32_t level /* [in]  */,
 				       union drsuapi_DsGetNCChangesRequest *req /* [in] [ref,switch_is(level)] */,
-				       int32_t *level_out /* [out] [ref] */,
+				       uint32_t *level_out /* [out] [ref] */,
 				       union drsuapi_DsGetNCChangesCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
 				       WERROR *werror)
 {
@@ -638,7 +638,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaUpdateRefs_send(TALLOC_CTX *mem_ctx,
 							   struct tevent_context *ev,
 							   struct rpc_pipe_client *cli,
 							   struct policy_handle *_bind_handle /* [in] [ref] */,
-							   int32_t _level /* [in]  */,
+							   uint32_t _level /* [in]  */,
 							   union drsuapi_DsReplicaUpdateRefsRequest _req /* [in] [switch_is(level)] */)
 {
 	struct tevent_req *req;
@@ -736,7 +736,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaUpdateRefs_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsReplicaUpdateRefs(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
 					    struct policy_handle *bind_handle /* [in] [ref] */,
-					    int32_t level /* [in]  */,
+					    uint32_t level /* [in]  */,
 					    union drsuapi_DsReplicaUpdateRefsRequest req /* [in] [switch_is(level)] */,
 					    WERROR *werror)
 {
@@ -785,7 +785,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaAdd_send(TALLOC_CTX *mem_ctx,
 						    struct tevent_context *ev,
 						    struct rpc_pipe_client *cli,
 						    struct policy_handle *_bind_handle /* [in] [ref] */,
-						    int32_t _level /* [in]  */,
+						    uint32_t _level /* [in]  */,
 						    union drsuapi_DsReplicaAddRequest _req /* [in] [switch_is(level)] */)
 {
 	struct tevent_req *req;
@@ -883,7 +883,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaAdd_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsReplicaAdd(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
 				     struct policy_handle *bind_handle /* [in] [ref] */,
-				     int32_t level /* [in]  */,
+				     uint32_t level /* [in]  */,
 				     union drsuapi_DsReplicaAddRequest req /* [in] [switch_is(level)] */,
 				     WERROR *werror)
 {
@@ -932,7 +932,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaDel_send(TALLOC_CTX *mem_ctx,
 						    struct tevent_context *ev,
 						    struct rpc_pipe_client *cli,
 						    struct policy_handle *_bind_handle /* [in] [ref] */,
-						    int32_t _level /* [in]  */,
+						    uint32_t _level /* [in]  */,
 						    union drsuapi_DsReplicaDelRequest _req /* [in] [switch_is(level)] */)
 {
 	struct tevent_req *req;
@@ -1030,7 +1030,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaDel_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsReplicaDel(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
 				     struct policy_handle *bind_handle /* [in] [ref] */,
-				     int32_t level /* [in]  */,
+				     uint32_t level /* [in]  */,
 				     union drsuapi_DsReplicaDelRequest req /* [in] [switch_is(level)] */,
 				     WERROR *werror)
 {
@@ -1079,7 +1079,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaMod_send(TALLOC_CTX *mem_ctx,
 						    struct tevent_context *ev,
 						    struct rpc_pipe_client *cli,
 						    struct policy_handle *_bind_handle /* [in] [ref] */,
-						    int32_t _level /* [in]  */,
+						    uint32_t _level /* [in]  */,
 						    union drsuapi_DsReplicaModRequest _req /* [in] [switch_is(level)] */)
 {
 	struct tevent_req *req;
@@ -1177,7 +1177,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaMod_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsReplicaMod(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
 				     struct policy_handle *bind_handle /* [in] [ref] */,
-				     int32_t level /* [in]  */,
+				     uint32_t level /* [in]  */,
 				     union drsuapi_DsReplicaModRequest req /* [in] [switch_is(level)] */,
 				     WERROR *werror)
 {
@@ -1361,9 +1361,9 @@ struct tevent_req *rpccli_drsuapi_DsGetMemberships_send(TALLOC_CTX *mem_ctx,
 							struct tevent_context *ev,
 							struct rpc_pipe_client *cli,
 							struct policy_handle *_bind_handle /* [in] [ref] */,
-							int32_t _level /* [in]  */,
+							uint32_t _level /* [in]  */,
 							union drsuapi_DsGetMembershipsRequest *_req /* [in] [ref,switch_is(level)] */,
-							int32_t *_level_out /* [out] [ref] */,
+							uint32_t *_level_out /* [out] [ref] */,
 							union drsuapi_DsGetMembershipsCtr *_ctr /* [out] [ref,switch_is(*level_out)] */)
 {
 	struct tevent_req *req;
@@ -1471,9 +1471,9 @@ NTSTATUS rpccli_drsuapi_DsGetMemberships_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsGetMemberships(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
 					 struct policy_handle *bind_handle /* [in] [ref] */,
-					 int32_t level /* [in]  */,
+					 uint32_t level /* [in]  */,
 					 union drsuapi_DsGetMembershipsRequest *req /* [in] [ref,switch_is(level)] */,
-					 int32_t *level_out /* [out] [ref] */,
+					 uint32_t *level_out /* [out] [ref] */,
 					 union drsuapi_DsGetMembershipsCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
 					 WERROR *werror)
 {
@@ -1822,9 +1822,9 @@ struct tevent_req *rpccli_drsuapi_DsCrackNames_send(TALLOC_CTX *mem_ctx,
 						    struct tevent_context *ev,
 						    struct rpc_pipe_client *cli,
 						    struct policy_handle *_bind_handle /* [in] [ref] */,
-						    int32_t _level /* [in]  */,
+						    uint32_t _level /* [in]  */,
 						    union drsuapi_DsNameRequest *_req /* [in] [ref,switch_is(level)] */,
-						    int32_t *_level_out /* [out] [ref] */,
+						    uint32_t *_level_out /* [out] [ref] */,
 						    union drsuapi_DsNameCtr *_ctr /* [out] [ref,switch_is(*level_out)] */)
 {
 	struct tevent_req *req;
@@ -1932,9 +1932,9 @@ NTSTATUS rpccli_drsuapi_DsCrackNames_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsCrackNames(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
 				     struct policy_handle *bind_handle /* [in] [ref] */,
-				     int32_t level /* [in]  */,
+				     uint32_t level /* [in]  */,
 				     union drsuapi_DsNameRequest *req /* [in] [ref,switch_is(level)] */,
-				     int32_t *level_out /* [out] [ref] */,
+				     uint32_t *level_out /* [out] [ref] */,
 				     union drsuapi_DsNameCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
 				     WERROR *werror)
 {
@@ -1985,9 +1985,9 @@ struct tevent_req *rpccli_drsuapi_DsWriteAccountSpn_send(TALLOC_CTX *mem_ctx,
 							 struct tevent_context *ev,
 							 struct rpc_pipe_client *cli,
 							 struct policy_handle *_bind_handle /* [in] [ref] */,
-							 int32_t _level /* [in]  */,
+							 uint32_t _level /* [in]  */,
 							 union drsuapi_DsWriteAccountSpnRequest *_req /* [in] [ref,switch_is(level)] */,
-							 int32_t *_level_out /* [out] [ref] */,
+							 uint32_t *_level_out /* [out] [ref] */,
 							 union drsuapi_DsWriteAccountSpnResult *_res /* [out] [ref,switch_is(*level_out)] */)
 {
 	struct tevent_req *req;
@@ -2095,9 +2095,9 @@ NTSTATUS rpccli_drsuapi_DsWriteAccountSpn_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsWriteAccountSpn(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
 					  struct policy_handle *bind_handle /* [in] [ref] */,
-					  int32_t level /* [in]  */,
+					  uint32_t level /* [in]  */,
 					  union drsuapi_DsWriteAccountSpnRequest *req /* [in] [ref,switch_is(level)] */,
-					  int32_t *level_out /* [out] [ref] */,
+					  uint32_t *level_out /* [out] [ref] */,
 					  union drsuapi_DsWriteAccountSpnResult *res /* [out] [ref,switch_is(*level_out)] */,
 					  WERROR *werror)
 {
@@ -2148,9 +2148,9 @@ struct tevent_req *rpccli_drsuapi_DsRemoveDSServer_send(TALLOC_CTX *mem_ctx,
 							struct tevent_context *ev,
 							struct rpc_pipe_client *cli,
 							struct policy_handle *_bind_handle /* [in] [ref] */,
-							int32_t _level /* [in]  */,
+							uint32_t _level /* [in]  */,
 							union drsuapi_DsRemoveDSServerRequest *_req /* [in] [ref,switch_is(level)] */,
-							int32_t *_level_out /* [out] [ref] */,
+							uint32_t *_level_out /* [out] [ref] */,
 							union drsuapi_DsRemoveDSServerResult *_res /* [out] [ref,switch_is(*level_out)] */)
 {
 	struct tevent_req *req;
@@ -2258,9 +2258,9 @@ NTSTATUS rpccli_drsuapi_DsRemoveDSServer_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsRemoveDSServer(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
 					 struct policy_handle *bind_handle /* [in] [ref] */,
-					 int32_t level /* [in]  */,
+					 uint32_t level /* [in]  */,
 					 union drsuapi_DsRemoveDSServerRequest *req /* [in] [ref,switch_is(level)] */,
-					 int32_t *level_out /* [out] [ref] */,
+					 uint32_t *level_out /* [out] [ref] */,
 					 union drsuapi_DsRemoveDSServerResult *res /* [out] [ref,switch_is(*level_out)] */,
 					 WERROR *werror)
 {
@@ -3217,9 +3217,9 @@ struct tevent_req *rpccli_drsuapi_DsGetMemberships2_send(TALLOC_CTX *mem_ctx,
 							 struct tevent_context *ev,
 							 struct rpc_pipe_client *cli,
 							 struct policy_handle *_bind_handle /* [in] [ref] */,
-							 int32_t _level /* [in]  */,
+							 uint32_t _level /* [in]  */,
 							 union drsuapi_DsGetMemberships2Request *_req /* [in] [ref,switch_is(level)] */,
-							 int32_t *_level_out /* [out] [ref] */,
+							 uint32_t *_level_out /* [out] [ref] */,
 							 union drsuapi_DsGetMemberships2Ctr *_ctr /* [out] [ref,switch_is(*level_out)] */)
 {
 	struct tevent_req *req;
@@ -3327,9 +3327,9 @@ NTSTATUS rpccli_drsuapi_DsGetMemberships2_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsGetMemberships2(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
 					  struct policy_handle *bind_handle /* [in] [ref] */,
-					  int32_t level /* [in]  */,
+					  uint32_t level /* [in]  */,
 					  union drsuapi_DsGetMemberships2Request *req /* [in] [ref,switch_is(level)] */,
-					  int32_t *level_out /* [out] [ref] */,
+					  uint32_t *level_out /* [out] [ref] */,
 					  union drsuapi_DsGetMemberships2Ctr *ctr /* [out] [ref,switch_is(*level_out)] */,
 					  WERROR *werror)
 {
@@ -3650,9 +3650,9 @@ struct tevent_req *rpccli_drsuapi_QuerySitesByCost_send(TALLOC_CTX *mem_ctx,
 							struct tevent_context *ev,
 							struct rpc_pipe_client *cli,
 							struct policy_handle *_bind_handle /* [in] [ref] */,
-							int32_t _level /* [in]  */,
+							uint32_t _level /* [in]  */,
 							union drsuapi_QuerySitesByCostRequest *_req /* [in] [ref,switch_is(level)] */,
-							int32_t *_level_out /* [out] [ref] */,
+							uint32_t *_level_out /* [out] [ref] */,
 							union drsuapi_QuerySitesByCostCtr *_ctr /* [out] [ref,switch_is(*level_out)] */)
 {
 	struct tevent_req *req;
@@ -3760,9 +3760,9 @@ NTSTATUS rpccli_drsuapi_QuerySitesByCost_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_QuerySitesByCost(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
 					 struct policy_handle *bind_handle /* [in] [ref] */,
-					 int32_t level /* [in]  */,
+					 uint32_t level /* [in]  */,
 					 union drsuapi_QuerySitesByCostRequest *req /* [in] [ref,switch_is(level)] */,
-					 int32_t *level_out /* [out] [ref] */,
+					 uint32_t *level_out /* [out] [ref] */,
 					 union drsuapi_QuerySitesByCostCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
 					 WERROR *werror)
 {
diff --git a/librpc/gen_ndr/cli_drsuapi.h b/librpc/gen_ndr/cli_drsuapi.h
index c2ab1be61a..9c30ff056b 100644
--- a/librpc/gen_ndr/cli_drsuapi.h
+++ b/librpc/gen_ndr/cli_drsuapi.h
@@ -46,9 +46,9 @@ struct tevent_req *rpccli_drsuapi_DsGetNCChanges_send(TALLOC_CTX *mem_ctx,
 						      struct tevent_context *ev,
 						      struct rpc_pipe_client *cli,
 						      struct policy_handle *_bind_handle /* [in] [ref] */,
-						      int32_t _level /* [in]  */,
+						      uint32_t _level /* [in]  */,
 						      union drsuapi_DsGetNCChangesRequest *_req /* [in] [ref,switch_is(level)] */,
-						      int32_t *_level_out /* [out] [ref] */,
+						      uint32_t *_level_out /* [out] [ref] */,
 						      union drsuapi_DsGetNCChangesCtr *_ctr /* [out] [ref,switch_is(*level_out)] */);
 NTSTATUS rpccli_drsuapi_DsGetNCChanges_recv(struct tevent_req *req,
 					    TALLOC_CTX *mem_ctx,
@@ -56,16 +56,16 @@ NTSTATUS rpccli_drsuapi_DsGetNCChanges_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsGetNCChanges(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
 				       struct policy_handle *bind_handle /* [in] [ref] */,
-				       int32_t level /* [in]  */,
+				       uint32_t level /* [in]  */,
 				       union drsuapi_DsGetNCChangesRequest *req /* [in] [ref,switch_is(level)] */,
-				       int32_t *level_out /* [out] [ref] */,
+				       uint32_t *level_out /* [out] [ref] */,
 				       union drsuapi_DsGetNCChangesCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
 				       WERROR *werror);
 struct tevent_req *rpccli_drsuapi_DsReplicaUpdateRefs_send(TALLOC_CTX *mem_ctx,
 							   struct tevent_context *ev,
 							   struct rpc_pipe_client *cli,
 							   struct policy_handle *_bind_handle /* [in] [ref] */,
-							   int32_t _level /* [in]  */,
+							   uint32_t _level /* [in]  */,
 							   union drsuapi_DsReplicaUpdateRefsRequest _req /* [in] [switch_is(level)] */);
 NTSTATUS rpccli_drsuapi_DsReplicaUpdateRefs_recv(struct tevent_req *req,
 						 TALLOC_CTX *mem_ctx,
@@ -73,14 +73,14 @@ NTSTATUS rpccli_drsuapi_DsReplicaUpdateRefs_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsReplicaUpdateRefs(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
 					    struct policy_handle *bind_handle /* [in] [ref] */,
-					    int32_t level /* [in]  */,
+					    uint32_t level /* [in]  */,
 					    union drsuapi_DsReplicaUpdateRefsRequest req /* [in] [switch_is(level)] */,
 					    WERROR *werror);
 struct tevent_req *rpccli_drsuapi_DsReplicaAdd_send(TALLOC_CTX *mem_ctx,
 						    struct tevent_context *ev,
 						    struct rpc_pipe_client *cli,
 						    struct policy_handle *_bind_handle /* [in] [ref] */,
-						    int32_t _level /* [in]  */,
+						    uint32_t _level /* [in]  */,
 						    union drsuapi_DsReplicaAddRequest _req /* [in] [switch_is(level)] */);
 NTSTATUS rpccli_drsuapi_DsReplicaAdd_recv(struct tevent_req *req,
 					  TALLOC_CTX *mem_ctx,
@@ -88,14 +88,14 @@ NTSTATUS rpccli_drsuapi_DsReplicaAdd_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsReplicaAdd(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
 				     struct policy_handle *bind_handle /* [in] [ref] */,
-				     int32_t level /* [in]  */,
+				     uint32_t level /* [in]  */,
 				     union drsuapi_DsReplicaAddRequest req /* [in] [switch_is(level)] */,
 				     WERROR *werror);
 struct tevent_req *rpccli_drsuapi_DsReplicaDel_send(TALLOC_CTX *mem_ctx,
 						    struct tevent_context *ev,
 						    struct rpc_pipe_client *cli,
 						    struct policy_handle *_bind_handle /* [in] [ref] */,
-						    int32_t _level /* [in]  */,
+						    uint32_t _level /* [in]  */,
 						    union drsuapi_DsReplicaDelRequest _req /* [in] [switch_is(level)] */);
 NTSTATUS rpccli_drsuapi_DsReplicaDel_recv(struct tevent_req *req,
 					  TALLOC_CTX *mem_ctx,
@@ -103,14 +103,14 @@ NTSTATUS rpccli_drsuapi_DsReplicaDel_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsReplicaDel(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
 				     struct policy_handle *bind_handle /* [in] [ref] */,
-				     int32_t level /* [in]  */,
+				     uint32_t level /* [in]  */,
 				     union drsuapi_DsReplicaDelRequest req /* [in] [switch_is(level)] */,
 				     WERROR *werror);
 struct tevent_req *rpccli_drsuapi_DsReplicaMod_send(TALLOC_CTX *mem_ctx,
 						    struct tevent_context *ev,
 						    struct rpc_pipe_client *cli,
 						    struct policy_handle *_bind_handle /* [in] [ref] */,
-						    int32_t _level /* [in]  */,
+						    uint32_t _level /* [in]  */,
 						    union drsuapi_DsReplicaModRequest _req /* [in] [switch_is(level)] */);
 NTSTATUS rpccli_drsuapi_DsReplicaMod_recv(struct tevent_req *req,
 					  TALLOC_CTX *mem_ctx,
@@ -118,7 +118,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaMod_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsReplicaMod(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
 				     struct policy_handle *bind_handle /* [in] [ref] */,
-				     int32_t level /* [in]  */,
+				     uint32_t level /* [in]  */,
 				     union drsuapi_DsReplicaModRequest req /* [in] [switch_is(level)] */,
 				     WERROR *werror);
 struct tevent_req *rpccli_DRSUAPI_VERIFY_NAMES_send(TALLOC_CTX *mem_ctx,
@@ -134,9 +134,9 @@ struct tevent_req *rpccli_drsuapi_DsGetMemberships_send(TALLOC_CTX *mem_ctx,
 							struct tevent_context *ev,
 							struct rpc_pipe_client *cli,
 							struct policy_handle *_bind_handle /* [in] [ref] */,
-							int32_t _level /* [in]  */,
+							uint32_t _level /* [in]  */,
 							union drsuapi_DsGetMembershipsRequest *_req /* [in] [ref,switch_is(level)] */,
-							int32_t *_level_out /* [out] [ref] */,
+							uint32_t *_level_out /* [out] [ref] */,
 							union drsuapi_DsGetMembershipsCtr *_ctr /* [out] [ref,switch_is(*level_out)] */);
 NTSTATUS rpccli_drsuapi_DsGetMemberships_recv(struct tevent_req *req,
 					      TALLOC_CTX *mem_ctx,
@@ -144,9 +144,9 @@ NTSTATUS rpccli_drsuapi_DsGetMemberships_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsGetMemberships(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
 					 struct policy_handle *bind_handle /* [in] [ref] */,
-					 int32_t level /* [in]  */,
+					 uint32_t level /* [in]  */,
 					 union drsuapi_DsGetMembershipsRequest *req /* [in] [ref,switch_is(level)] */,
-					 int32_t *level_out /* [out] [ref] */,
+					 uint32_t *level_out /* [out] [ref] */,
 					 union drsuapi_DsGetMembershipsCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
 					 WERROR *werror);
 struct tevent_req *rpccli_DRSUAPI_INTER_DOMAIN_MOVE_send(TALLOC_CTX *mem_ctx,
@@ -181,9 +181,9 @@ struct tevent_req *rpccli_drsuapi_DsCrackNames_send(TALLOC_CTX *mem_ctx,
 						    struct tevent_context *ev,
 						    struct rpc_pipe_client *cli,
 						    struct policy_handle *_bind_handle /* [in] [ref] */,
-						    int32_t _level /* [in]  */,
+						    uint32_t _level /* [in]  */,
 						    union drsuapi_DsNameRequest *_req /* [in] [ref,switch_is(level)] */,
-						    int32_t *_level_out /* [out] [ref] */,
+						    uint32_t *_level_out /* [out] [ref] */,
 						    union drsuapi_DsNameCtr *_ctr /* [out] [ref,switch_is(*level_out)] */);
 NTSTATUS rpccli_drsuapi_DsCrackNames_recv(struct tevent_req *req,
 					  TALLOC_CTX *mem_ctx,
@@ -191,18 +191,18 @@ NTSTATUS rpccli_drsuapi_DsCrackNames_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsCrackNames(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
 				     struct policy_handle *bind_handle /* [in] [ref] */,
-				     int32_t level /* [in]  */,
+				     uint32_t level /* [in]  */,
 				     union drsuapi_DsNameRequest *req /* [in] [ref,switch_is(level)] */,
-				     int32_t *level_out /* [out] [ref] */,
+				     uint32_t *level_out /* [out] [ref] */,
 				     union drsuapi_DsNameCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
 				     WERROR *werror);
 struct tevent_req *rpccli_drsuapi_DsWriteAccountSpn_send(TALLOC_CTX *mem_ctx,
 							 struct tevent_context *ev,
 							 struct rpc_pipe_client *cli,
 							 struct policy_handle *_bind_handle /* [in] [ref] */,
-							 int32_t _level /* [in]  */,
+							 uint32_t _level /* [in]  */,
 							 union drsuapi_DsWriteAccountSpnRequest *_req /* [in] [ref,switch_is(level)] */,
-							 int32_t *_level_out /* [out] [ref] */,
+							 uint32_t *_level_out /* [out] [ref] */,
 							 union drsuapi_DsWriteAccountSpnResult *_res /* [out] [ref,switch_is(*level_out)] */);
 NTSTATUS rpccli_drsuapi_DsWriteAccountSpn_recv(struct tevent_req *req,
 					       TALLOC_CTX *mem_ctx,
@@ -210,18 +210,18 @@ NTSTATUS rpccli_drsuapi_DsWriteAccountSpn_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsWriteAccountSpn(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
 					  struct policy_handle *bind_handle /* [in] [ref] */,
-					  int32_t level /* [in]  */,
+					  uint32_t level /* [in]  */,
 					  union drsuapi_DsWriteAccountSpnRequest *req /* [in] [ref,switch_is(level)] */,
-					  int32_t *level_out /* [out] [ref] */,
+					  uint32_t *level_out /* [out] [ref] */,
 					  union drsuapi_DsWriteAccountSpnResult *res /* [out] [ref,switch_is(*level_out)] */,
 					  WERROR *werror);
 struct tevent_req *rpccli_drsuapi_DsRemoveDSServer_send(TALLOC_CTX *mem_ctx,
 							struct tevent_context *ev,
 							struct rpc_pipe_client *cli,
 							struct policy_handle *_bind_handle /* [in] [ref] */,
-							int32_t _level /* [in]  */,
+							uint32_t _level /* [in]  */,
 							union drsuapi_DsRemoveDSServerRequest *_req /* [in] [ref,switch_is(level)] */,
-							int32_t *_level_out /* [out] [ref] */,
+							uint32_t *_level_out /* [out] [ref] */,
 							union drsuapi_DsRemoveDSServerResult *_res /* [out] [ref,switch_is(*level_out)] */);
 NTSTATUS rpccli_drsuapi_DsRemoveDSServer_recv(struct tevent_req *req,
 					      TALLOC_CTX *mem_ctx,
@@ -229,9 +229,9 @@ NTSTATUS rpccli_drsuapi_DsRemoveDSServer_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsRemoveDSServer(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
 					 struct policy_handle *bind_handle /* [in] [ref] */,
-					 int32_t level /* [in]  */,
+					 uint32_t level /* [in]  */,
 					 union drsuapi_DsRemoveDSServerRequest *req /* [in] [ref,switch_is(level)] */,
-					 int32_t *level_out /* [out] [ref] */,
+					 uint32_t *level_out /* [out] [ref] */,
 					 union drsuapi_DsRemoveDSServerResult *res /* [out] [ref,switch_is(*level_out)] */,
 					 WERROR *werror);
 struct tevent_req *rpccli_DRSUAPI_REMOVE_DS_DOMAIN_send(TALLOC_CTX *mem_ctx,
@@ -328,9 +328,9 @@ struct tevent_req *rpccli_drsuapi_DsGetMemberships2_send(TALLOC_CTX *mem_ctx,
 							 struct tevent_context *ev,
 							 struct rpc_pipe_client *cli,
 							 struct policy_handle *_bind_handle /* [in] [ref] */,
-							 int32_t _level /* [in]  */,
+							 uint32_t _level /* [in]  */,
 							 union drsuapi_DsGetMemberships2Request *_req /* [in] [ref,switch_is(level)] */,
-							 int32_t *_level_out /* [out] [ref] */,
+							 uint32_t *_level_out /* [out] [ref] */,
 							 union drsuapi_DsGetMemberships2Ctr *_ctr /* [out] [ref,switch_is(*level_out)] */);
 NTSTATUS rpccli_drsuapi_DsGetMemberships2_recv(struct tevent_req *req,
 					       TALLOC_CTX *mem_ctx,
@@ -338,9 +338,9 @@ NTSTATUS rpccli_drsuapi_DsGetMemberships2_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_DsGetMemberships2(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
 					  struct policy_handle *bind_handle /* [in] [ref] */,
-					  int32_t level /* [in]  */,
+					  uint32_t level /* [in]  */,
 					  union drsuapi_DsGetMemberships2Request *req /* [in] [ref,switch_is(level)] */,
-					  int32_t *level_out /* [out] [ref] */,
+					  uint32_t *level_out /* [out] [ref] */,
 					  union drsuapi_DsGetMemberships2Ctr *ctr /* [out] [ref,switch_is(*level_out)] */,
 					  WERROR *werror);
 struct tevent_req *rpccli_DRSUAPI_REPLICA_VERIFY_OBJECTS_send(TALLOC_CTX *mem_ctx,
@@ -365,9 +365,9 @@ struct tevent_req *rpccli_drsuapi_QuerySitesByCost_send(TALLOC_CTX *mem_ctx,
 							struct tevent_context *ev,
 							struct rpc_pipe_client *cli,
 							struct policy_handle *_bind_handle /* [in] [ref] */,
-							int32_t _level /* [in]  */,
+							uint32_t _level /* [in]  */,
 							union drsuapi_QuerySitesByCostRequest *_req /* [in] [ref,switch_is(level)] */,
-							int32_t *_level_out /* [out] [ref] */,
+							uint32_t *_level_out /* [out] [ref] */,
 							union drsuapi_QuerySitesByCostCtr *_ctr /* [out] [ref,switch_is(*level_out)] */);
 NTSTATUS rpccli_drsuapi_QuerySitesByCost_recv(struct tevent_req *req,
 					      TALLOC_CTX *mem_ctx,
@@ -375,9 +375,9 @@ NTSTATUS rpccli_drsuapi_QuerySitesByCost_recv(struct tevent_req *req,
 NTSTATUS rpccli_drsuapi_QuerySitesByCost(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
 					 struct policy_handle *bind_handle /* [in] [ref] */,
-					 int32_t level /* [in]  */,
+					 uint32_t level /* [in]  */,
 					 union drsuapi_QuerySitesByCostRequest *req /* [in] [ref,switch_is(level)] */,
-					 int32_t *level_out /* [out] [ref] */,
+					 uint32_t *level_out /* [out] [ref] */,
 					 union drsuapi_QuerySitesByCostCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
 					 WERROR *werror);
 #endif /* __CLI_DRSUAPI__ */
diff --git a/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h
index 5cce4ef0d8..12d44a6e8c 100644
--- a/librpc/gen_ndr/drsuapi.h
+++ b/librpc/gen_ndr/drsuapi.h
@@ -144,32 +144,6 @@ struct drsuapi_DsReplicaObjectIdentifier {
 	const char *dn;/* [charset(UTF16),size_is(__ndr_size_dn+1)] */
 }/* [gensize,public] */;
 
-/* bitmap drsuapi_DsReplicaSyncOptions */
-#define DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION ( 0x00000001 )
-#define DRSUAPI_DS_REPLICA_SYNC_WRITEABLE ( 0x00000002 )
-#define DRSUAPI_DS_REPLICA_SYNC_PERIODIC ( 0x00000004 )
-#define DRSUAPI_DS_REPLICA_SYNC_INTERSITE_MESSAGING ( 0x00000008 )
-#define DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES ( 0x00000010 )
-#define DRSUAPI_DS_REPLICA_SYNC_FULL ( 0x00000020 )
-#define DRSUAPI_DS_REPLICA_SYNC_URGENT ( 0x00000040 )
-#define DRSUAPI_DS_REPLICA_SYNC_NO_DISCARD ( 0x00000080 )
-#define DRSUAPI_DS_REPLICA_SYNC_FORCE ( 0x00000100 )
-#define DRSUAPI_DS_REPLICA_SYNC_ADD_REFERENCE ( 0x00000200 )
-#define DRSUAPI_DS_REPLICA_SYNC_NEVER_COMPLETED ( 0x00000400 )
-#define DRSUAPI_DS_REPLICA_SYNC_TWO_WAY ( 0x00000800 )
-#define DRSUAPI_DS_REPLICA_SYNC_NEVER_NOTIFY ( 0x00001000 )
-#define DRSUAPI_DS_REPLICA_SYNC_INITIAL ( 0x00002000 )
-#define DRSUAPI_DS_REPLICA_SYNC_USE_COMPRESSION ( 0x00004000 )
-#define DRSUAPI_DS_REPLICA_SYNC_ABANDONED ( 0x00008000 )
-#define DRSUAPI_DS_REPLICA_SYNC_INITIAL_IN_PROGRESS ( 0x00010000 )
-#define DRSUAPI_DS_REPLICA_SYNC_PARTIAL_ATTRIBUTE_SET ( 0x00020000 )
-#define DRSUAPI_DS_REPLICA_SYNC_REQUEUE ( 0x00040000 )
-#define DRSUAPI_DS_REPLICA_SYNC_NOTIFICATION ( 0x00080000 )
-#define DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_REPLICA ( 0x00100000 )
-#define DRSUAPI_DS_REPLICA_SYNC_CRITICAL ( 0x00200000 )
-#define DRSUAPI_DS_REPLICA_SYNC_FULL_IN_PROGRESS ( 0x00400000 )
-#define DRSUAPI_DS_REPLICA_SYNC_PREEMPTED ( 0x00800000 )
-
 struct drsuapi_DsReplicaSyncRequest1 {
 	struct drsuapi_DsReplicaObjectIdentifier *naming_context;/* [ref] */
 	struct GUID source_dsa_guid;
@@ -514,7 +488,7 @@ union drsuapi_DsGetNCChangesRequest {
 	struct drsuapi_DsGetNCChangesRequest5 req5;/* [case(5)] */
 	struct drsuapi_DsGetNCChangesRequest8 req8;/* [case(8)] */
 	struct drsuapi_DsGetNCChangesRequest10 req10;/* [case(10)] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsReplicaCursor2 {
 	struct GUID source_dsa_invocation_id;
@@ -705,7 +679,7 @@ struct drsuapi_DsGetNCChangesCtr2 {
 };
 
 struct drsuapi_DsGetNCChangesCtr7 {
-	int32_t level;/* [range(0,6)] */
+	uint32_t level;/* [range(0,6)] */
 	enum drsuapi_DsGetNCChangesCompressionType type;/* [range(2,3)] */
 	union drsuapi_DsGetNCChangesCompressedCtr ctr;/* [switch_is(level|(type<<16))] */
 };
@@ -715,7 +689,7 @@ union drsuapi_DsGetNCChangesCtr {
 	struct drsuapi_DsGetNCChangesCtr2 ctr2;/* [case(2)] */
 	struct drsuapi_DsGetNCChangesCtr6 ctr6;/* [case(6)] */
 	struct drsuapi_DsGetNCChangesCtr7 ctr7;/* [case(7)] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsReplicaUpdateRefsRequest1 {
 	struct drsuapi_DsReplicaObjectIdentifier *naming_context;/* [ref] */
@@ -726,7 +700,7 @@ struct drsuapi_DsReplicaUpdateRefsRequest1 {
 
 union drsuapi_DsReplicaUpdateRefsRequest {
 	struct drsuapi_DsReplicaUpdateRefsRequest1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsReplicaAddRequest1 {
 	struct drsuapi_DsReplicaObjectIdentifier *naming_context;/* [ref] */
@@ -747,7 +721,7 @@ struct drsuapi_DsReplicaAddRequest2 {
 union drsuapi_DsReplicaAddRequest {
 	struct drsuapi_DsReplicaAddRequest1 req1;/* [case] */
 	struct drsuapi_DsReplicaAddRequest2 req2;/* [case(2)] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsReplicaDelRequest1 {
 	struct drsuapi_DsReplicaObjectIdentifier *naming_context;/* [ref] */
@@ -757,7 +731,7 @@ struct drsuapi_DsReplicaDelRequest1 {
 
 union drsuapi_DsReplicaDelRequest {
 	struct drsuapi_DsReplicaDelRequest1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsReplicaModRequest1 {
 	struct drsuapi_DsReplicaObjectIdentifier *naming_context;/* [ref] */
@@ -771,7 +745,7 @@ struct drsuapi_DsReplicaModRequest1 {
 
 union drsuapi_DsReplicaModRequest {
 	struct drsuapi_DsReplicaModRequest1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 enum drsuapi_DsMembershipType
 #ifndef USE_UINT_ENUMS
@@ -807,7 +781,7 @@ struct drsuapi_DsGetMembershipsCtr1 {
 
 union drsuapi_DsGetMembershipsCtr {
 	struct drsuapi_DsGetMembershipsCtr1 ctr1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsGetMembershipsRequest1 {
 	uint32_t count;/* [range(1,10000)] */
@@ -819,7 +793,7 @@ struct drsuapi_DsGetMembershipsRequest1 {
 
 union drsuapi_DsGetMembershipsRequest {
 	struct drsuapi_DsGetMembershipsRequest1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsGetNT4ChangeLogRequest1 {
 	uint32_t unknown1;
@@ -941,7 +915,7 @@ struct drsuapi_DsNameRequest1 {
 
 union drsuapi_DsNameRequest {
 	struct drsuapi_DsNameRequest1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsNameInfo1 {
 	enum drsuapi_DsNameStatus status;
@@ -956,7 +930,7 @@ struct drsuapi_DsNameCtr1 {
 
 union drsuapi_DsNameCtr {
 	struct drsuapi_DsNameCtr1 *ctr1;/* [unique,case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 enum drsuapi_DsSpnOperation
 #ifndef USE_UINT_ENUMS
@@ -983,7 +957,7 @@ struct drsuapi_DsWriteAccountSpnRequest1 {
 
 union drsuapi_DsWriteAccountSpnRequest {
 	struct drsuapi_DsWriteAccountSpnRequest1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsWriteAccountSpnResult1 {
 	WERROR status;
@@ -991,7 +965,7 @@ struct drsuapi_DsWriteAccountSpnResult1 {
 
 union drsuapi_DsWriteAccountSpnResult {
 	struct drsuapi_DsWriteAccountSpnResult1 res1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsRemoveDSServerRequest1 {
 	const char *server_dn;/* [unique,charset(UTF16)] */
@@ -1001,7 +975,7 @@ struct drsuapi_DsRemoveDSServerRequest1 {
 
 union drsuapi_DsRemoveDSServerRequest {
 	struct drsuapi_DsRemoveDSServerRequest1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsRemoveDSServerResult1 {
 	uint32_t last_dc_in_domain;
@@ -1009,7 +983,7 @@ struct drsuapi_DsRemoveDSServerResult1 {
 
 union drsuapi_DsRemoveDSServerResult {
 	struct drsuapi_DsRemoveDSServerResult1 res1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsGetDCInfoRequest1 {
 	const char *domain_name;/* [unique,charset(UTF16)] */
@@ -1521,7 +1495,7 @@ struct drsuapi_DsGetMemberships2Ctr1 {
 
 union drsuapi_DsGetMemberships2Ctr {
 	struct drsuapi_DsGetMembershipsCtr1 ctr1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsGetMemberships2Request1 {
 	uint32_t num_req;/* [range(1,10000)] */
@@ -1530,7 +1504,7 @@ struct drsuapi_DsGetMemberships2Request1 {
 
 union drsuapi_DsGetMemberships2Request {
 	struct drsuapi_DsGetMemberships2Request1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_DsSiteCostInfo {
 	WERROR error_code;
@@ -1540,12 +1514,12 @@ struct drsuapi_DsSiteCostInfo {
 struct drsuapi_QuerySitesByCostCtr1 {
 	uint32_t num_info;/* [range(0,10000)] */
 	struct drsuapi_DsSiteCostInfo *info;/* [unique,size_is(num_info)] */
-	uint32_t unknown;
+	uint32_t flags_reserved;/* [value(0)] */
 };
 
 union drsuapi_QuerySitesByCostCtr {
 	struct drsuapi_QuerySitesByCostCtr1 ctr1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 struct drsuapi_QuerySitesByCostRequest1 {
 	const char *site_from;/* [unique,charset(UTF16)] */
@@ -1556,7 +1530,7 @@ struct drsuapi_QuerySitesByCostRequest1 {
 
 union drsuapi_QuerySitesByCostRequest {
 	struct drsuapi_QuerySitesByCostRequest1 req1;/* [case] */
-}/* [switch_type(int32)] */;
+}/* [switch_type(uint32)] */;
 
 
 struct drsuapi_DsBind {
@@ -1604,12 +1578,12 @@ struct drsuapi_DsReplicaSync {
 struct drsuapi_DsGetNCChanges {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsGetNCChangesRequest *req;/* [ref,switch_is(level)] */
 	} in;
 
 	struct {
-		int32_t *level_out;/* [ref] */
+		uint32_t *level_out;/* [ref] */
 		union drsuapi_DsGetNCChangesCtr *ctr;/* [ref,switch_is(*level_out)] */
 		WERROR result;
 	} out;
@@ -1620,7 +1594,7 @@ struct drsuapi_DsGetNCChanges {
 struct drsuapi_DsReplicaUpdateRefs {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsReplicaUpdateRefsRequest req;/* [switch_is(level)] */
 	} in;
 
@@ -1634,7 +1608,7 @@ struct drsuapi_DsReplicaUpdateRefs {
 struct drsuapi_DsReplicaAdd {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsReplicaAddRequest req;/* [switch_is(level)] */
 	} in;
 
@@ -1648,7 +1622,7 @@ struct drsuapi_DsReplicaAdd {
 struct drsuapi_DsReplicaDel {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsReplicaDelRequest req;/* [switch_is(level)] */
 	} in;
 
@@ -1662,7 +1636,7 @@ struct drsuapi_DsReplicaDel {
 struct drsuapi_DsReplicaMod {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsReplicaModRequest req;/* [switch_is(level)] */
 	} in;
 
@@ -1684,12 +1658,12 @@ struct DRSUAPI_VERIFY_NAMES {
 struct drsuapi_DsGetMemberships {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsGetMembershipsRequest *req;/* [ref,switch_is(level)] */
 	} in;
 
 	struct {
-		int32_t *level_out;/* [ref] */
+		uint32_t *level_out;/* [ref] */
 		union drsuapi_DsGetMembershipsCtr *ctr;/* [ref,switch_is(*level_out)] */
 		WERROR result;
 	} out;
@@ -1724,12 +1698,12 @@ struct drsuapi_DsGetNT4ChangeLog {
 struct drsuapi_DsCrackNames {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsNameRequest *req;/* [ref,switch_is(level)] */
 	} in;
 
 	struct {
-		int32_t *level_out;/* [ref] */
+		uint32_t *level_out;/* [ref] */
 		union drsuapi_DsNameCtr *ctr;/* [ref,switch_is(*level_out)] */
 		WERROR result;
 	} out;
@@ -1740,12 +1714,12 @@ struct drsuapi_DsCrackNames {
 struct drsuapi_DsWriteAccountSpn {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsWriteAccountSpnRequest *req;/* [ref,switch_is(level)] */
 	} in;
 
 	struct {
-		int32_t *level_out;/* [ref] */
+		uint32_t *level_out;/* [ref] */
 		union drsuapi_DsWriteAccountSpnResult *res;/* [ref,switch_is(*level_out)] */
 		WERROR result;
 	} out;
@@ -1756,12 +1730,12 @@ struct drsuapi_DsWriteAccountSpn {
 struct drsuapi_DsRemoveDSServer {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsRemoveDSServerRequest *req;/* [ref,switch_is(level)] */
 	} in;
 
 	struct {
-		int32_t *level_out;/* [ref] */
+		uint32_t *level_out;/* [ref] */
 		union drsuapi_DsRemoveDSServerResult *res;/* [ref,switch_is(*level_out)] */
 		WERROR result;
 	} out;
@@ -1850,12 +1824,12 @@ struct DRSUAPI_ADD_SID_HISTORY {
 struct drsuapi_DsGetMemberships2 {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_DsGetMemberships2Request *req;/* [ref,switch_is(level)] */
 	} in;
 
 	struct {
-		int32_t *level_out;/* [ref] */
+		uint32_t *level_out;/* [ref] */
 		union drsuapi_DsGetMemberships2Ctr *ctr;/* [ref,switch_is(*level_out)] */
 		WERROR result;
 	} out;
@@ -1882,12 +1856,12 @@ struct DRSUAPI_GET_OBJECT_EXISTENCE {
 struct drsuapi_QuerySitesByCost {
 	struct {
 		struct policy_handle *bind_handle;/* [ref] */
-		int32_t level;
+		uint32_t level;
 		union drsuapi_QuerySitesByCostRequest *req;/* [ref,switch_is(level)] */
 	} in;
 
 	struct {
-		int32_t *level_out;/* [ref] */
+		uint32_t *level_out;/* [ref] */
 		union drsuapi_QuerySitesByCostCtr *ctr;/* [ref,switch_is(*level_out)] */
 		WERROR result;
 	} out;
diff --git a/librpc/gen_ndr/ndr_drsuapi.c b/librpc/gen_ndr/ndr_drsuapi.c
index 6d45e2d977..6d3285da37 100644
--- a/librpc/gen_ndr/ndr_drsuapi.c
+++ b/librpc/gen_ndr/ndr_drsuapi.c
@@ -567,51 +567,6 @@ _PUBLIC_ size_t ndr_size_drsuapi_DsReplicaObjectIdentifier(const struct drsuapi_
 	return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier, ic);
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaSyncOptions(struct ndr_push *ndr, int ndr_flags, uint32_t r)
-{
-	NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsReplicaSyncOptions(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
-{
-	uint32_t v;
-	NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
-	*r = v;
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_drsuapi_DsReplicaSyncOptions(struct ndr_print *ndr, const char *name, uint32_t r)
-{
-	ndr_print_uint32(ndr, name, r);
-	ndr->depth++;
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION", DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_WRITEABLE", DRSUAPI_DS_REPLICA_SYNC_WRITEABLE, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_PERIODIC", DRSUAPI_DS_REPLICA_SYNC_PERIODIC, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_INTERSITE_MESSAGING", DRSUAPI_DS_REPLICA_SYNC_INTERSITE_MESSAGING, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES", DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_FULL", DRSUAPI_DS_REPLICA_SYNC_FULL, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_URGENT", DRSUAPI_DS_REPLICA_SYNC_URGENT, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_NO_DISCARD", DRSUAPI_DS_REPLICA_SYNC_NO_DISCARD, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_FORCE", DRSUAPI_DS_REPLICA_SYNC_FORCE, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_ADD_REFERENCE", DRSUAPI_DS_REPLICA_SYNC_ADD_REFERENCE, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_NEVER_COMPLETED", DRSUAPI_DS_REPLICA_SYNC_NEVER_COMPLETED, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_TWO_WAY", DRSUAPI_DS_REPLICA_SYNC_TWO_WAY, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_NEVER_NOTIFY", DRSUAPI_DS_REPLICA_SYNC_NEVER_NOTIFY, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_INITIAL", DRSUAPI_DS_REPLICA_SYNC_INITIAL, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_USE_COMPRESSION", DRSUAPI_DS_REPLICA_SYNC_USE_COMPRESSION, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_ABANDONED", DRSUAPI_DS_REPLICA_SYNC_ABANDONED, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_INITIAL_IN_PROGRESS", DRSUAPI_DS_REPLICA_SYNC_INITIAL_IN_PROGRESS, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_PARTIAL_ATTRIBUTE_SET", DRSUAPI_DS_REPLICA_SYNC_PARTIAL_ATTRIBUTE_SET, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_REQUEUE", DRSUAPI_DS_REPLICA_SYNC_REQUEUE, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_NOTIFICATION", DRSUAPI_DS_REPLICA_SYNC_NOTIFICATION, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_REPLICA", DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_REPLICA, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_CRITICAL", DRSUAPI_DS_REPLICA_SYNC_CRITICAL, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_FULL_IN_PROGRESS", DRSUAPI_DS_REPLICA_SYNC_FULL_IN_PROGRESS, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "DRSUAPI_DS_REPLICA_SYNC_PREEMPTED", DRSUAPI_DS_REPLICA_SYNC_PREEMPTED, r);
-	ndr->depth--;
-}
-
 static enum ndr_err_code ndr_push_drsuapi_DsReplicaSyncRequest1(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaSyncRequest1 *r)
 {
 	if (ndr_flags & NDR_SCALARS) {
@@ -1805,7 +1760,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesRequest(struct ndr_push
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 8));
 		switch (level) {
 			case 5: {
@@ -1849,10 +1804,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesRequest(struct ndr_push
 static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsGetNCChangesRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -3632,7 +3587,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCtr7(struct ndr_push *nd
 {
 	if (ndr_flags & NDR_SCALARS) {
 		NDR_CHECK(ndr_push_align(ndr, 5));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->level));
 		NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesCompressionType(ndr, NDR_SCALARS, r->type));
 		NDR_CHECK(ndr_push_set_switch_value(ndr, &r->ctr, r->level | (r->type << 16)));
 		NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesCompressedCtr(ndr, NDR_SCALARS, &r->ctr));
@@ -3648,8 +3603,8 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesCtr7(struct ndr_pull *nd
 {
 	if (ndr_flags & NDR_SCALARS) {
 		NDR_CHECK(ndr_pull_align(ndr, 5));
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->level));
-		if (r->level < 0 || r->level > 6) {
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->level));
+		if (r->level > 6) {
 			return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
 		}
 		NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesCompressionType(ndr, NDR_SCALARS, &r->type));
@@ -3670,7 +3625,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChangesCtr7(struct ndr_print *ndr, const
 {
 	ndr_print_struct(ndr, name, "drsuapi_DsGetNCChangesCtr7");
 	ndr->depth++;
-	ndr_print_int32(ndr, "level", r->level);
+	ndr_print_uint32(ndr, "level", r->level);
 	ndr_print_drsuapi_DsGetNCChangesCompressionType(ndr, "type", r->type);
 	ndr_print_set_switch_value(ndr, &r->ctr, r->level | (r->type << 16));
 	ndr_print_drsuapi_DsGetNCChangesCompressedCtr(ndr, "ctr", &r->ctr);
@@ -3681,7 +3636,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCtr(struct ndr_push *ndr
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 8));
 		switch (level) {
 			case 1: {
@@ -3733,10 +3688,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCtr(struct ndr_push *ndr
 static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesCtr(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsGetNCChangesCtr *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -3900,7 +3855,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaUpdateRefsRequest(struct ndr_
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -3928,10 +3883,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaUpdateRefsRequest(struct ndr_
 static enum ndr_err_code ndr_pull_drsuapi_DsReplicaUpdateRefsRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsReplicaUpdateRefsRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -4203,7 +4158,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaAddRequest(struct ndr_push *n
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -4239,10 +4194,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaAddRequest(struct ndr_push *n
 static enum ndr_err_code ndr_pull_drsuapi_DsReplicaAddRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsReplicaAddRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -4386,7 +4341,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaDelRequest(struct ndr_push *n
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -4414,10 +4369,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaDelRequest(struct ndr_push *n
 static enum ndr_err_code ndr_pull_drsuapi_DsReplicaDelRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsReplicaDelRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -4561,7 +4516,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaModRequest(struct ndr_push *n
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -4589,10 +4544,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaModRequest(struct ndr_push *n
 static enum ndr_err_code ndr_pull_drsuapi_DsReplicaModRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsReplicaModRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -4910,7 +4865,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsCtr(struct ndr_push *n
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -4938,10 +4893,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsCtr(struct ndr_push *n
 static enum ndr_err_code ndr_pull_drsuapi_DsGetMembershipsCtr(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsGetMembershipsCtr *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -5126,7 +5081,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsRequest(struct ndr_pus
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -5154,10 +5109,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsRequest(struct ndr_pus
 static enum ndr_err_code ndr_pull_drsuapi_DsGetMembershipsRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsGetMembershipsRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -5811,7 +5766,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsNameRequest(struct ndr_push *ndr, in
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -5839,10 +5794,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsNameRequest(struct ndr_push *ndr, in
 static enum ndr_err_code ndr_pull_drsuapi_DsNameRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsNameRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -6074,7 +6029,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsNameCtr(struct ndr_push *ndr, int nd
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -6104,11 +6059,11 @@ static enum ndr_err_code ndr_push_drsuapi_DsNameCtr(struct ndr_push *ndr, int nd
 static enum ndr_err_code ndr_pull_drsuapi_DsNameCtr(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsNameCtr *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	TALLOC_CTX *_mem_save_ctr1_0;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -6326,7 +6281,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsWriteAccountSpnRequest(struct ndr_pu
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -6354,10 +6309,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsWriteAccountSpnRequest(struct ndr_pu
 static enum ndr_err_code ndr_pull_drsuapi_DsWriteAccountSpnRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsWriteAccountSpnRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -6435,7 +6390,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsWriteAccountSpnResult(struct ndr_pus
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 4));
 		switch (level) {
 			case 1: {
@@ -6462,10 +6417,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsWriteAccountSpnResult(struct ndr_pus
 static enum ndr_err_code ndr_pull_drsuapi_DsWriteAccountSpnResult(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsWriteAccountSpnResult *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -6608,7 +6563,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsRemoveDSServerRequest(struct ndr_pus
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -6636,10 +6591,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsRemoveDSServerRequest(struct ndr_pus
 static enum ndr_err_code ndr_pull_drsuapi_DsRemoveDSServerRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsRemoveDSServerRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -6717,7 +6672,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsRemoveDSServerResult(struct ndr_push
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 4));
 		switch (level) {
 			case 1: {
@@ -6744,10 +6699,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsRemoveDSServerResult(struct ndr_push
 static enum ndr_err_code ndr_pull_drsuapi_DsRemoveDSServerResult(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsRemoveDSServerResult *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -12567,7 +12522,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMemberships2Ctr(struct ndr_push *
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -12595,10 +12550,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMemberships2Ctr(struct ndr_push *
 static enum ndr_err_code ndr_pull_drsuapi_DsGetMemberships2Ctr(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsGetMemberships2Ctr *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -12753,7 +12708,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMemberships2Request(struct ndr_pu
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -12781,10 +12736,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMemberships2Request(struct ndr_pu
 static enum ndr_err_code ndr_pull_drsuapi_DsGetMemberships2Request(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsGetMemberships2Request *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -12868,7 +12823,7 @@ static enum ndr_err_code ndr_push_drsuapi_QuerySitesByCostCtr1(struct ndr_push *
 		NDR_CHECK(ndr_push_align(ndr, 5));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_info));
 		NDR_CHECK(ndr_push_unique_ptr(ndr, r->info));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
 		NDR_CHECK(ndr_push_trailer_align(ndr, 5));
 	}
 	if (ndr_flags & NDR_BUFFERS) {
@@ -12900,7 +12855,7 @@ static enum ndr_err_code ndr_pull_drsuapi_QuerySitesByCostCtr1(struct ndr_pull *
 		} else {
 			r->info = NULL;
 		}
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->flags_reserved));
 		NDR_CHECK(ndr_pull_trailer_align(ndr, 5));
 	}
 	if (ndr_flags & NDR_BUFFERS) {
@@ -12945,7 +12900,7 @@ _PUBLIC_ void ndr_print_drsuapi_QuerySitesByCostCtr1(struct ndr_print *ndr, cons
 		ndr->depth--;
 	}
 	ndr->depth--;
-	ndr_print_uint32(ndr, "unknown", r->unknown);
+	ndr_print_uint32(ndr, "flags_reserved", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?0:r->flags_reserved);
 	ndr->depth--;
 }
 
@@ -12953,7 +12908,7 @@ static enum ndr_err_code ndr_push_drsuapi_QuerySitesByCostCtr(struct ndr_push *n
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -12981,10 +12936,10 @@ static enum ndr_err_code ndr_push_drsuapi_QuerySitesByCostCtr(struct ndr_push *n
 static enum ndr_err_code ndr_pull_drsuapi_QuerySitesByCostCtr(struct ndr_pull *ndr, int ndr_flags, union drsuapi_QuerySitesByCostCtr *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -13184,7 +13139,7 @@ static enum ndr_err_code ndr_push_drsuapi_QuerySitesByCostRequest(struct ndr_pus
 {
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		NDR_CHECK(ndr_push_union_align(ndr, 5));
 		switch (level) {
 			case 1: {
@@ -13212,10 +13167,10 @@ static enum ndr_err_code ndr_push_drsuapi_QuerySitesByCostRequest(struct ndr_pus
 static enum ndr_err_code ndr_pull_drsuapi_QuerySitesByCostRequest(struct ndr_pull *ndr, int ndr_flags, union drsuapi_QuerySitesByCostRequest *r)
 {
 	int level;
-	int32_t _level;
+	uint32_t _level;
 	level = ndr_pull_get_switch_value(ndr, r);
 	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &_level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level));
 		if (_level != level) {
 			return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r at %s", _level, __location__);
 		}
@@ -13550,7 +13505,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChanges(struct ndr_push *ndr, i
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		if (r->in.req == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -13561,7 +13516,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChanges(struct ndr_push *ndr, i
 		if (r->out.level_out == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level_out));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.level_out));
 		if (r->out.ctr == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -13588,7 +13543,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChanges(struct ndr_pull *ndr, i
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.req);
 		}
@@ -13608,7 +13563,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChanges(struct ndr_pull *ndr, i
 		}
 		_mem_save_level_out_0 = NDR_PULL_GET_MEM_CTX(ndr);
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.level_out, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level_out));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.level_out));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_out_0, LIBNDR_FLAG_REF_ALLOC);
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.ctr);
@@ -13637,7 +13592,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChanges(struct ndr_print *ndr, const char
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_ptr(ndr, "req", r->in.req);
 		ndr->depth++;
 		ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
@@ -13650,7 +13605,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChanges(struct ndr_print *ndr, const char
 		ndr->depth++;
 		ndr_print_ptr(ndr, "level_out", r->out.level_out);
 		ndr->depth++;
-		ndr_print_int32(ndr, "level_out", *r->out.level_out);
+		ndr_print_uint32(ndr, "level_out", *r->out.level_out);
 		ndr->depth--;
 		ndr_print_ptr(ndr, "ctr", r->out.ctr);
 		ndr->depth++;
@@ -13670,7 +13625,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaUpdateRefs(struct ndr_push *n
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		NDR_CHECK(ndr_push_set_switch_value(ndr, &r->in.req, r->in.level));
 		NDR_CHECK(ndr_push_drsuapi_DsReplicaUpdateRefsRequest(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
 	}
@@ -13691,7 +13646,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaUpdateRefs(struct ndr_pull *n
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->in.req, r->in.level));
 		NDR_CHECK(ndr_pull_drsuapi_DsReplicaUpdateRefsRequest(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
 	}
@@ -13715,7 +13670,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaUpdateRefs(struct ndr_print *ndr, const
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_set_switch_value(ndr, &r->in.req, r->in.level);
 		ndr_print_drsuapi_DsReplicaUpdateRefsRequest(ndr, "req", &r->in.req);
 		ndr->depth--;
@@ -13736,7 +13691,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaAdd(struct ndr_push *ndr, int
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		NDR_CHECK(ndr_push_set_switch_value(ndr, &r->in.req, r->in.level));
 		NDR_CHECK(ndr_push_drsuapi_DsReplicaAddRequest(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
 	}
@@ -13757,7 +13712,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaAdd(struct ndr_pull *ndr, int
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->in.req, r->in.level));
 		NDR_CHECK(ndr_pull_drsuapi_DsReplicaAddRequest(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
 	}
@@ -13781,7 +13736,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaAdd(struct ndr_print *ndr, const char *
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_set_switch_value(ndr, &r->in.req, r->in.level);
 		ndr_print_drsuapi_DsReplicaAddRequest(ndr, "req", &r->in.req);
 		ndr->depth--;
@@ -13802,7 +13757,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaDel(struct ndr_push *ndr, int
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		NDR_CHECK(ndr_push_set_switch_value(ndr, &r->in.req, r->in.level));
 		NDR_CHECK(ndr_push_drsuapi_DsReplicaDelRequest(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
 	}
@@ -13823,7 +13778,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaDel(struct ndr_pull *ndr, int
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->in.req, r->in.level));
 		NDR_CHECK(ndr_pull_drsuapi_DsReplicaDelRequest(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
 	}
@@ -13847,7 +13802,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaDel(struct ndr_print *ndr, const char *
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_set_switch_value(ndr, &r->in.req, r->in.level);
 		ndr_print_drsuapi_DsReplicaDelRequest(ndr, "req", &r->in.req);
 		ndr->depth--;
@@ -13868,7 +13823,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaMod(struct ndr_push *ndr, int
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		NDR_CHECK(ndr_push_set_switch_value(ndr, &r->in.req, r->in.level));
 		NDR_CHECK(ndr_push_drsuapi_DsReplicaModRequest(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
 	}
@@ -13889,7 +13844,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaMod(struct ndr_pull *ndr, int
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->in.req, r->in.level));
 		NDR_CHECK(ndr_pull_drsuapi_DsReplicaModRequest(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
 	}
@@ -13913,7 +13868,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaMod(struct ndr_print *ndr, const char *
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_set_switch_value(ndr, &r->in.req, r->in.level);
 		ndr_print_drsuapi_DsReplicaModRequest(ndr, "req", &r->in.req);
 		ndr->depth--;
@@ -13975,7 +13930,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMemberships(struct ndr_push *ndr,
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		if (r->in.req == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -13986,7 +13941,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMemberships(struct ndr_push *ndr,
 		if (r->out.level_out == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level_out));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.level_out));
 		if (r->out.ctr == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -14013,7 +13968,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetMemberships(struct ndr_pull *ndr,
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.req);
 		}
@@ -14033,7 +13988,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetMemberships(struct ndr_pull *ndr,
 		}
 		_mem_save_level_out_0 = NDR_PULL_GET_MEM_CTX(ndr);
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.level_out, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level_out));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.level_out));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_out_0, LIBNDR_FLAG_REF_ALLOC);
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.ctr);
@@ -14062,7 +14017,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetMemberships(struct ndr_print *ndr, const ch
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_ptr(ndr, "req", r->in.req);
 		ndr->depth++;
 		ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
@@ -14075,7 +14030,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetMemberships(struct ndr_print *ndr, const ch
 		ndr->depth++;
 		ndr_print_ptr(ndr, "level_out", r->out.level_out);
 		ndr->depth++;
-		ndr_print_int32(ndr, "level_out", *r->out.level_out);
+		ndr_print_uint32(ndr, "level_out", *r->out.level_out);
 		ndr->depth--;
 		ndr_print_ptr(ndr, "ctr", r->out.ctr);
 		ndr->depth++;
@@ -14256,7 +14211,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsCrackNames(struct ndr_push *ndr, int
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		if (r->in.req == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -14267,7 +14222,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsCrackNames(struct ndr_push *ndr, int
 		if (r->out.level_out == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level_out));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.level_out));
 		if (r->out.ctr == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -14294,7 +14249,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsCrackNames(struct ndr_pull *ndr, int
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.req);
 		}
@@ -14314,7 +14269,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsCrackNames(struct ndr_pull *ndr, int
 		}
 		_mem_save_level_out_0 = NDR_PULL_GET_MEM_CTX(ndr);
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.level_out, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level_out));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.level_out));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_out_0, LIBNDR_FLAG_REF_ALLOC);
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.ctr);
@@ -14343,7 +14298,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsCrackNames(struct ndr_print *ndr, const char *
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_ptr(ndr, "req", r->in.req);
 		ndr->depth++;
 		ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
@@ -14356,7 +14311,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsCrackNames(struct ndr_print *ndr, const char *
 		ndr->depth++;
 		ndr_print_ptr(ndr, "level_out", r->out.level_out);
 		ndr->depth++;
-		ndr_print_int32(ndr, "level_out", *r->out.level_out);
+		ndr_print_uint32(ndr, "level_out", *r->out.level_out);
 		ndr->depth--;
 		ndr_print_ptr(ndr, "ctr", r->out.ctr);
 		ndr->depth++;
@@ -14376,7 +14331,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsWriteAccountSpn(struct ndr_push *ndr
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		if (r->in.req == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -14387,7 +14342,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsWriteAccountSpn(struct ndr_push *ndr
 		if (r->out.level_out == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level_out));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.level_out));
 		if (r->out.res == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -14414,7 +14369,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsWriteAccountSpn(struct ndr_pull *ndr
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.req);
 		}
@@ -14434,7 +14389,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsWriteAccountSpn(struct ndr_pull *ndr
 		}
 		_mem_save_level_out_0 = NDR_PULL_GET_MEM_CTX(ndr);
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.level_out, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level_out));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.level_out));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_out_0, LIBNDR_FLAG_REF_ALLOC);
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.res);
@@ -14463,7 +14418,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsWriteAccountSpn(struct ndr_print *ndr, const c
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_ptr(ndr, "req", r->in.req);
 		ndr->depth++;
 		ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
@@ -14476,7 +14431,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsWriteAccountSpn(struct ndr_print *ndr, const c
 		ndr->depth++;
 		ndr_print_ptr(ndr, "level_out", r->out.level_out);
 		ndr->depth++;
-		ndr_print_int32(ndr, "level_out", *r->out.level_out);
+		ndr_print_uint32(ndr, "level_out", *r->out.level_out);
 		ndr->depth--;
 		ndr_print_ptr(ndr, "res", r->out.res);
 		ndr->depth++;
@@ -14496,7 +14451,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsRemoveDSServer(struct ndr_push *ndr,
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		if (r->in.req == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -14507,7 +14462,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsRemoveDSServer(struct ndr_push *ndr,
 		if (r->out.level_out == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level_out));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.level_out));
 		if (r->out.res == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -14534,7 +14489,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsRemoveDSServer(struct ndr_pull *ndr,
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.req);
 		}
@@ -14554,7 +14509,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsRemoveDSServer(struct ndr_pull *ndr,
 		}
 		_mem_save_level_out_0 = NDR_PULL_GET_MEM_CTX(ndr);
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.level_out, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level_out));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.level_out));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_out_0, LIBNDR_FLAG_REF_ALLOC);
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.res);
@@ -14583,7 +14538,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsRemoveDSServer(struct ndr_print *ndr, const ch
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_ptr(ndr, "req", r->in.req);
 		ndr->depth++;
 		ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
@@ -14596,7 +14551,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsRemoveDSServer(struct ndr_print *ndr, const ch
 		ndr->depth++;
 		ndr_print_ptr(ndr, "level_out", r->out.level_out);
 		ndr->depth++;
-		ndr_print_int32(ndr, "level_out", *r->out.level_out);
+		ndr_print_uint32(ndr, "level_out", *r->out.level_out);
 		ndr->depth--;
 		ndr_print_ptr(ndr, "res", r->out.res);
 		ndr->depth++;
@@ -15137,7 +15092,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMemberships2(struct ndr_push *ndr
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		if (r->in.req == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -15148,7 +15103,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMemberships2(struct ndr_push *ndr
 		if (r->out.level_out == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level_out));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.level_out));
 		if (r->out.ctr == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -15175,7 +15130,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetMemberships2(struct ndr_pull *ndr
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.req);
 		}
@@ -15195,7 +15150,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetMemberships2(struct ndr_pull *ndr
 		}
 		_mem_save_level_out_0 = NDR_PULL_GET_MEM_CTX(ndr);
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.level_out, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level_out));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.level_out));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_out_0, LIBNDR_FLAG_REF_ALLOC);
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.ctr);
@@ -15224,7 +15179,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetMemberships2(struct ndr_print *ndr, const c
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_ptr(ndr, "req", r->in.req);
 		ndr->depth++;
 		ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
@@ -15237,7 +15192,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetMemberships2(struct ndr_print *ndr, const c
 		ndr->depth++;
 		ndr_print_ptr(ndr, "level_out", r->out.level_out);
 		ndr->depth++;
-		ndr_print_int32(ndr, "level_out", *r->out.level_out);
+		ndr_print_uint32(ndr, "level_out", *r->out.level_out);
 		ndr->depth--;
 		ndr_print_ptr(ndr, "ctr", r->out.ctr);
 		ndr->depth++;
@@ -15339,7 +15294,7 @@ static enum ndr_err_code ndr_push_drsuapi_QuerySitesByCost(struct ndr_push *ndr,
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
 		if (r->in.req == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -15350,7 +15305,7 @@ static enum ndr_err_code ndr_push_drsuapi_QuerySitesByCost(struct ndr_push *ndr,
 		if (r->out.level_out == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
-		NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level_out));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.level_out));
 		if (r->out.ctr == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -15377,7 +15332,7 @@ static enum ndr_err_code ndr_pull_drsuapi_QuerySitesByCost(struct ndr_pull *ndr,
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.req);
 		}
@@ -15397,7 +15352,7 @@ static enum ndr_err_code ndr_pull_drsuapi_QuerySitesByCost(struct ndr_pull *ndr,
 		}
 		_mem_save_level_out_0 = NDR_PULL_GET_MEM_CTX(ndr);
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.level_out, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level_out));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.level_out));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_out_0, LIBNDR_FLAG_REF_ALLOC);
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.ctr);
@@ -15426,7 +15381,7 @@ _PUBLIC_ void ndr_print_drsuapi_QuerySitesByCost(struct ndr_print *ndr, const ch
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
 		ndr->depth--;
-		ndr_print_int32(ndr, "level", r->in.level);
+		ndr_print_uint32(ndr, "level", r->in.level);
 		ndr_print_ptr(ndr, "req", r->in.req);
 		ndr->depth++;
 		ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
@@ -15439,7 +15394,7 @@ _PUBLIC_ void ndr_print_drsuapi_QuerySitesByCost(struct ndr_print *ndr, const ch
 		ndr->depth++;
 		ndr_print_ptr(ndr, "level_out", r->out.level_out);
 		ndr->depth++;
-		ndr_print_int32(ndr, "level_out", *r->out.level_out);
+		ndr_print_uint32(ndr, "level_out", *r->out.level_out);
 		ndr->depth--;
 		ndr_print_ptr(ndr, "ctr", r->out.ctr);
 		ndr->depth++;
diff --git a/librpc/gen_ndr/ndr_drsuapi.h b/librpc/gen_ndr/ndr_drsuapi.h
index 424963fc0e..99941967bd 100644
--- a/librpc/gen_ndr/ndr_drsuapi.h
+++ b/librpc/gen_ndr/ndr_drsuapi.h
@@ -78,9 +78,6 @@ enum ndr_err_code ndr_push_drsuapi_DsReplicaObjectIdentifier(struct ndr_push *nd
 enum ndr_err_code ndr_pull_drsuapi_DsReplicaObjectIdentifier(struct ndr_pull *ndr, int ndr_flags, struct drsuapi_DsReplicaObjectIdentifier *r);
 void ndr_print_drsuapi_DsReplicaObjectIdentifier(struct ndr_print *ndr, const char *name, const struct drsuapi_DsReplicaObjectIdentifier *r);
 size_t ndr_size_drsuapi_DsReplicaObjectIdentifier(const struct drsuapi_DsReplicaObjectIdentifier *r, struct smb_iconv_convenience *ic, int flags);
-enum ndr_err_code ndr_push_drsuapi_DsReplicaSyncOptions(struct ndr_push *ndr, int ndr_flags, uint32_t r);
-enum ndr_err_code ndr_pull_drsuapi_DsReplicaSyncOptions(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
-void ndr_print_drsuapi_DsReplicaSyncOptions(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_drsuapi_DsReplicaSyncRequest1(struct ndr_print *ndr, const char *name, const struct drsuapi_DsReplicaSyncRequest1 *r);
 void ndr_print_drsuapi_DsReplicaSyncRequest(struct ndr_print *ndr, const char *name, const union drsuapi_DsReplicaSyncRequest *r);
 enum ndr_err_code ndr_push_drsuapi_DsReplicaHighWaterMark(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaHighWaterMark *r);