Changeset 745 for trunk/server/source3/libnet/libnet_dssync.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/libnet/libnet_dssync.c (modified) (19 diffs)

trunk/server/source3/libnet/libnet_dssync.c

@@ -22 +22 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_dssync.h"
+#include "rpc_client/cli_pipe.h"
 #include "../libcli/drsuapi/drsuapi.h"
-#include "../librpc/gen_ndr/cli_drsuapi.h"
+#include "../librpc/gen_ndr/ndr_drsuapi_c.h"
 
 /****************************************************************
@@ -31 +32 @@
 static int libnet_dssync_free_context(struct dssync_context *ctx)
 {
+        WERROR result;
+        struct dcerpc_binding_handle *b;
+
         if (!ctx) {
                 return 0;
@@ -36 +40 @@
 
         if (is_valid_policy_hnd(&ctx->bind_handle) && ctx->cli) {
-                rpccli_drsuapi_DsUnbind(ctx->cli, ctx, &ctx->bind_handle, NULL);
+                b = ctx->cli->binding_handle;
+                dcerpc_drsuapi_DsUnbind(b, ctx, &ctx->bind_handle, &result);
         }
 
@@ -125 +130 @@
         struct drsuapi_DsBindInfoCtr bind_info;
         struct drsuapi_DsBindInfo28 info28;
+        struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
         ZERO_STRUCT(info28);
@@ -165 +171 @@
         bind_info.info.info28 = info28;
 
-        status = rpccli_drsuapi_DsBind(ctx->cli, mem_ctx,
+        status = dcerpc_drsuapi_DsBind(b, mem_ctx,
                                        &bind_guid,
                                        &bind_info,
@@ -219 +225 @@
         NTSTATUS status;
         WERROR werr;
-        int32_t level = 1;
+        uint32_t level = 1;
         union drsuapi_DsNameRequest req;
-        int32_t level_out;
+        uint32_t level_out;
         struct drsuapi_DsNameString names[1];
         union drsuapi_DsNameCtr ctr;
+        struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
         names[0].str = talloc_asprintf(mem_ctx, "%s\\", ctx->domain_name);
@@ -236 +243 @@
         req.req1.format_desired = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
 
-        status = rpccli_drsuapi_DsCrackNames(ctx->cli, mem_ctx,
+        status = dcerpc_drsuapi_DsCrackNames(b, mem_ctx,
                                              &ctx->bind_handle,
                                              level,
@@ -246 +253 @@
                 ctx->error_message = talloc_asprintf(ctx,
                         "Failed to lookup DN for domain name: %s",
+                        get_friendly_nt_error_msg(status));
+                return status;
+        }
+
+        if (!W_ERROR_IS_OK(werr)) {
+                ctx->error_message = talloc_asprintf(ctx,
+                        "Failed to lookup DN for domain name: %s",
                         get_friendly_werror_msg(werr));
-                return status;
-        }
-
-        if (!W_ERROR_IS_OK(werr)) {
                 return werror_to_ntstatus(werr);
         }
@@ -301 +311 @@
                                             const char *dn,
                                             struct replUpToDateVectorBlob *utdv,
-                                            int32_t *plevel,
+                                            uint32_t *plevel,
                                             union drsuapi_DsGetNCChangesRequest *preq)
 {
         NTSTATUS status;
         uint32_t count;
-        int32_t level;
+        uint32_t level;
         union drsuapi_DsGetNCChangesRequest req;
         struct dom_sid null_sid;
@@ -313 +323 @@
         struct drsuapi_DsReplicaCursorCtrEx *cursors = NULL;
 
-        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;
 
         ZERO_STRUCT(null_sid);
@@ -416 +426 @@
 static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX *mem_ctx,
                                            struct dssync_context *ctx,
-                                           int32_t level,
+                                           uint32_t level,
                                            union drsuapi_DsGetNCChangesRequest *req,
                                            struct replUpToDateVectorBlob **pnew_utdv)
@@ -426 +436 @@
         struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL;
         struct replUpToDateVectorBlob *new_utdv = NULL;
-        int32_t level_out = 0;
-        int32_t out_level = 0;
+        uint32_t level_out = 0;
+        uint32_t out_level = 0;
         int y;
         bool last_query;
+        struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
         if (!ctx->single_object_replication) {
@@ -442 +453 @@
                 struct drsuapi_DsReplicaObjectListItemEx *first_object = NULL;
                 struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr = NULL;
+                uint32_t linked_attributes_count = 0;
+                struct drsuapi_DsReplicaLinkedAttribute *linked_attributes = NULL;
 
                 if (level == 8) {
@@ -453 +466 @@
                 }
 
-                status = rpccli_drsuapi_DsGetNCChanges(ctx->cli, mem_ctx,
+                status = dcerpc_drsuapi_DsGetNCChanges(b, mem_ctx,
                                                        &ctx->bind_handle,
                                                        level,
@@ -463 +476 @@
                         ctx->error_message = talloc_asprintf(ctx,
                                 "Failed to get NC Changes: %s",
-                                get_friendly_werror_msg(werr));
+                                get_friendly_nt_error_msg(status));
                         goto out;
                 }
@@ -469 +482 @@
                 if (!W_ERROR_IS_OK(werr)) {
                         status = werror_to_ntstatus(werr);
+                        ctx->error_message = talloc_asprintf(ctx,
+                                "Failed to get NC Changes: %s",
+                                get_friendly_werror_msg(werr));
                         goto out;
                 }
@@ -525 +541 @@
                         mapping_ctr = &ctr6->mapping_ctr;
 
+                        linked_attributes = ctr6->linked_attributes;
+                        linked_attributes_count = ctr6->linked_attributes_count;
+
                         if (ctr6->more_data) {
                                 req->req8.highwatermark = ctr6->new_highwatermark;
@@ -564 +583 @@
                         }
                 }
+
+                if (linked_attributes_count == 0) {
+                        continue;
+                }
+
+                if (ctx->ops->process_links) {
+                        status = ctx->ops->process_links(ctx, mem_ctx,
+                                                         linked_attributes_count,
+                                                         linked_attributes,
+                                                         mapping_ctr);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                ctx->error_message = talloc_asprintf(ctx,
+                                        "Failed to call processing function: %s",
+                                        nt_errstr(status));
+                                goto out;
+                        }
+                }
         }
 
@@ -577 +613 @@
         NTSTATUS status;
 
-        int32_t level = 0;
+        uint32_t level = 0;
         union drsuapi_DsGetNCChangesRequest req;
         struct replUpToDateVectorBlob *old_utdv = NULL;