Changeset 745 for trunk/server/source3/rpcclient/cmd_drsuapi.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/rpcclient/cmd_drsuapi.c (modified) (17 diffs)

trunk/server/source3/rpcclient/cmd_drsuapi.c

@@ -21 +21 @@
 #include "includes.h"
 #include "rpcclient.h"
-#include "../librpc/gen_ndr/cli_drsuapi.h"
+#include "../librpc/gen_ndr/ndr_drsuapi_c.h"
 
 static WERROR cracknames(struct rpc_pipe_client *cli,
@@ -35 +35 @@
         WERROR werr;
         int i;
-        int32_t level = 1;
+        uint32_t level = 1;
         union drsuapi_DsNameRequest req;
-        int32_t level_out;
+        uint32_t level_out;
         struct drsuapi_DsNameString *names;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         names = TALLOC_ZERO_ARRAY(mem_ctx, struct drsuapi_DsNameString, argc);
@@ -55 +56 @@
         req.req1.format_desired = format_desired;
 
-        status = rpccli_drsuapi_DsCrackNames(cli, mem_ctx,
+        status = dcerpc_drsuapi_DsCrackNames(b, mem_ctx,
                                              bind_handle,
                                              level,
@@ -83 +84 @@
         struct GUID bind_guid;
         struct policy_handle bind_handle;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         union drsuapi_DsNameCtr ctr;
@@ -93 +95 @@
         GUID_from_string(DRSUAPI_DS_BIND_GUID, &bind_guid);
 
-        status = rpccli_drsuapi_DsBind(cli, mem_ctx,
+        status = dcerpc_drsuapi_DsBind(b, mem_ctx,
                                        &bind_guid,
                                        NULL,
@@ -101 +103 @@
         if (!NT_STATUS_IS_OK(status)) {
                 return ntstatus_to_werror(status);
+        }
+
+        if (!W_ERROR_IS_OK(werr)) {
+                return werr;
         }
 
@@ -126 +132 @@
  out:
         if (is_valid_policy_hnd(&bind_handle)) {
-                rpccli_drsuapi_DsUnbind(cli, mem_ctx, &bind_handle, &werr);
+                WERROR _werr;
+                dcerpc_drsuapi_DsUnbind(b, mem_ctx, &bind_handle, &_werr);
         }
 
@@ -235 +242 @@
         struct GUID bind_guid;
         struct policy_handle bind_handle;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         const char *domain = NULL;
@@ -254 +262 @@
         GUID_from_string(DRSUAPI_DS_BIND_GUID, &bind_guid);
 
-        status = rpccli_drsuapi_DsBind(cli, mem_ctx,
+        status = dcerpc_drsuapi_DsBind(b, mem_ctx,
                                        &bind_guid,
                                        NULL,
@@ -264 +272 @@
         }
 
+        if (!W_ERROR_IS_OK(werr)) {
+                return werr;
+        }
+
         req.req1.domain_name = domain;
         req.req1.level = level;
 
-        status = rpccli_drsuapi_DsGetDomainControllerInfo(cli, mem_ctx,
+        status = dcerpc_drsuapi_DsGetDomainControllerInfo(b, mem_ctx,
                                                           &bind_handle,
                                                           1,
@@ -286 +298 @@
  out:
         if (is_valid_policy_hnd(&bind_handle)) {
-                rpccli_drsuapi_DsUnbind(cli, mem_ctx, &bind_handle, &werr);
+                WERROR _werr;
+                dcerpc_drsuapi_DsUnbind(b, mem_ctx, &bind_handle, &_werr);
         }
 
@@ -300 +313 @@
 
         struct policy_handle bind_handle;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         struct GUID bind_guid;
@@ -309 +323 @@
         DATA_BLOB session_key;
 
-        int32_t level = 8;
+        uint32_t level = 8;
         bool single = false;
-        int32_t level_out = 0;
+        uint32_t level_out = 0;
         union drsuapi_DsGetNCChangesRequest req;
         union drsuapi_DsGetNCChangesCtr ctr;
@@ -319 +333 @@
         struct drsuapi_DsGetNCChangesCtr1 *ctr1 = NULL;
         struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL;
-        int32_t out_level = 0;
+        uint32_t out_level = 0;
         int y;
 
         uint32_t supported_extensions = 0;
-        uint32_t replica_flags  = DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE |
-                                  DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP |
-                                  DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS |
-                                  DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS |
-                                  DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED;
+        uint32_t replica_flags  = DRSUAPI_DRS_WRIT_REP |
+                                  DRSUAPI_DRS_INIT_SYNC |
+                                  DRSUAPI_DRS_PER_SYNC |
+                                  DRSUAPI_DRS_GET_ANC |
+                                  DRSUAPI_DRS_NEVER_SYNCED;
 
         if (argc > 3) {
@@ -389 +403 @@
         bind_info.info.info28 = info28;
 
-        status = rpccli_drsuapi_DsBind(cli, mem_ctx,
+        status = dcerpc_drsuapi_DsBind(b, mem_ctx,
                                        &bind_guid,
                                        &bind_info,
@@ -476 +490 @@
                 }
 
-                status = rpccli_drsuapi_DsGetNCChanges(cli, mem_ctx,
+                status = dcerpc_drsuapi_DsGetNCChanges(b, mem_ctx,
                                                        &bind_handle,
                                                        level,
@@ -484 +498 @@
                                                        &werr);
                 if (!NT_STATUS_IS_OK(status)) {
+                        werr = ntstatus_to_werror(status);
+                        printf("Failed to get NC Changes: %s",
+                                get_friendly_nt_error_msg(status));
+                        goto out;
+                }
+
+                if (!W_ERROR_IS_OK(werr)) {
                         printf("Failed to get NC Changes: %s",
                                 get_friendly_werror_msg(werr));
-                        goto out;
-                }
-
-                if (!W_ERROR_IS_OK(werr)) {
-                        status = werror_to_ntstatus(werr);
                         goto out;
                 }