s3:libnet: remove unused variables
[samba.git] / source3 / libnet / libnet_dssync.c
index b596da816a3a96c918490dfef64593c72d8204df..94f06285a89d45c9212ff136416772554458b216 100644 (file)
@@ -3,6 +3,7 @@
 
    Copyright (C) Stefan (metze) Metzmacher 2005
    Copyright (C) Guenther Deschner 2008
+   Copyright (C) Michael Adam 2008
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 #include "libnet/libnet_dssync.h"
+#include "rpc_client/cli_pipe.h"
+#include "../libcli/drsuapi/drsuapi.h"
+#include "../librpc/gen_ndr/ndr_drsuapi_c.h"
 
 /****************************************************************
 ****************************************************************/
 
 static int libnet_dssync_free_context(struct dssync_context *ctx)
 {
+       WERROR result;
+       struct dcerpc_binding_handle *b;
+
        if (!ctx) {
                return 0;
        }
 
        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);
        }
 
        return 0;
@@ -46,10 +54,11 @@ NTSTATUS libnet_dssync_init_context(TALLOC_CTX *mem_ctx,
 {
        struct dssync_context *ctx;
 
-       ctx = TALLOC_ZERO_P(mem_ctx, struct dssync_context);
+       ctx = talloc_zero(mem_ctx, struct dssync_context);
        NT_STATUS_HAVE_NO_MEMORY(ctx);
 
        talloc_set_destructor(ctx, libnet_dssync_free_context);
+       ctx->clean_old_entries = false;
 
        *ctx_p = ctx;
 
@@ -59,49 +68,6 @@ NTSTATUS libnet_dssync_init_context(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-static DATA_BLOB *decrypt_attr_val(TALLOC_CTX *mem_ctx,
-                                  DATA_BLOB *session_key,
-                                  uint32_t rid,
-                                  enum drsuapi_DsAttributeId id,
-                                  DATA_BLOB *raw_data)
-{
-       bool rcrypt = false;
-       DATA_BLOB out_data;
-
-       ZERO_STRUCT(out_data);
-
-       switch (id) {
-               case DRSUAPI_ATTRIBUTE_dBCSPwd:
-               case DRSUAPI_ATTRIBUTE_unicodePwd:
-               case DRSUAPI_ATTRIBUTE_ntPwdHistory:
-               case DRSUAPI_ATTRIBUTE_lmPwdHistory:
-                       rcrypt  = true;
-                       break;
-               case DRSUAPI_ATTRIBUTE_supplementalCredentials:
-               case DRSUAPI_ATTRIBUTE_priorValue:
-               case DRSUAPI_ATTRIBUTE_currentValue:
-               case DRSUAPI_ATTRIBUTE_trustAuthOutgoing:
-               case DRSUAPI_ATTRIBUTE_trustAuthIncoming:
-               case DRSUAPI_ATTRIBUTE_initialAuthOutgoing:
-               case DRSUAPI_ATTRIBUTE_initialAuthIncoming:
-                       break;
-               default:
-                       return raw_data;
-       }
-
-       out_data = decrypt_drsuapi_blob(mem_ctx, session_key, rcrypt,
-                                         rid, raw_data);
-
-       if (out_data.length) {
-               return (DATA_BLOB *)talloc_memdup(mem_ctx, &out_data, sizeof(DATA_BLOB));
-       }
-
-       return raw_data;
-}
-
-/****************************************************************
-****************************************************************/
-
 static void parse_obj_identifier(struct drsuapi_DsReplicaObjectIdentifier *id,
                                 uint32_t *rid)
 {
@@ -119,30 +85,6 @@ static void parse_obj_identifier(struct drsuapi_DsReplicaObjectIdentifier *id,
 /****************************************************************
 ****************************************************************/
 
-static void parse_obj_attribute(TALLOC_CTX *mem_ctx,
-                               DATA_BLOB *session_key,
-                               uint32_t rid,
-                               struct drsuapi_DsReplicaAttribute *attr)
-{
-       int i = 0;
-
-       for (i=0; i<attr->value_ctr.num_values; i++) {
-
-               DATA_BLOB *plain_data = NULL;
-
-               plain_data = decrypt_attr_val(mem_ctx,
-                                             session_key,
-                                             rid,
-                                             attr->attid,
-                                             attr->value_ctr.values[i].blob);
-
-               attr->value_ctr.values[i].blob = plain_data;
-       }
-}
-
-/****************************************************************
-****************************************************************/
-
 static void libnet_dssync_decrypt_attributes(TALLOC_CTX *mem_ctx,
                                             DATA_BLOB *session_key,
                                             struct drsuapi_DsReplicaObjectListItemEx *cur)
@@ -168,10 +110,10 @@ static void libnet_dssync_decrypt_attributes(TALLOC_CTX *mem_ctx,
                                continue;
                        }
 
-                       parse_obj_attribute(mem_ctx,
-                                           session_key,
-                                           rid,
-                                           attr);
+                       drsuapi_decrypt_attribute(mem_ctx,
+                                                 session_key,
+                                                 rid,
+                                                 attr);
                }
        }
 }
@@ -187,6 +129,7 @@ static NTSTATUS libnet_dssync_bind(TALLOC_CTX *mem_ctx,
        struct GUID bind_guid;
        struct drsuapi_DsBindInfoCtr bind_info;
        struct drsuapi_DsBindInfo28 info28;
+       struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
        ZERO_STRUCT(info28);
 
@@ -221,13 +164,13 @@ static NTSTATUS libnet_dssync_bind(TALLOC_CTX *mem_ctx,
        info28.supported_extensions     |= DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7;
        info28.supported_extensions     |= DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT;
        info28.site_guid                = GUID_zero();
-       info28.u1                       = 508;
+       info28.pid                      = 508;
        info28.repl_epoch               = 0;
 
        bind_info.length = 28;
        bind_info.info.info28 = info28;
 
-       status = rpccli_drsuapi_DsBind(ctx->cli, mem_ctx,
+       status = dcerpc_drsuapi_DsBind(b, mem_ctx,
                                       &bind_guid,
                                       &bind_info,
                                       &ctx->bind_handle,
@@ -241,6 +184,54 @@ static NTSTATUS libnet_dssync_bind(TALLOC_CTX *mem_ctx,
                return werror_to_ntstatus(werr);
        }
 
+       ZERO_STRUCT(ctx->remote_info28);
+       switch (bind_info.length) {
+       case 24: {
+               struct drsuapi_DsBindInfo24 *info24;
+               info24 = &bind_info.info.info24;
+               ctx->remote_info28.site_guid            = info24->site_guid;
+               ctx->remote_info28.supported_extensions = info24->supported_extensions;
+               ctx->remote_info28.pid                  = info24->pid;
+               ctx->remote_info28.repl_epoch           = 0;
+               break;
+       }
+       case 28: {
+               ctx->remote_info28 = bind_info.info.info28;
+               break;
+       }
+       case 32: {
+               struct drsuapi_DsBindInfo32 *info32;
+               info32 = &bind_info.info.info32;
+               ctx->remote_info28.site_guid            = info32->site_guid;
+               ctx->remote_info28.supported_extensions = info32->supported_extensions;
+               ctx->remote_info28.pid                  = info32->pid;
+               ctx->remote_info28.repl_epoch           = info32->repl_epoch;
+               break;
+       }
+       case 48: {
+               struct drsuapi_DsBindInfo48 *info48;
+               info48 = &bind_info.info.info48;
+               ctx->remote_info28.site_guid            = info48->site_guid;
+               ctx->remote_info28.supported_extensions = info48->supported_extensions;
+               ctx->remote_info28.pid                  = info48->pid;
+               ctx->remote_info28.repl_epoch           = info48->repl_epoch;
+               break;
+       }
+       case 52: {
+               struct drsuapi_DsBindInfo52 *info52;
+               info52 = &bind_info.info.info52;
+               ctx->remote_info28.site_guid            = info52->site_guid;
+               ctx->remote_info28.supported_extensions = info52->supported_extensions;
+               ctx->remote_info28.pid                  = info52->pid;
+               ctx->remote_info28.repl_epoch           = info52->repl_epoch;
+               break;
+       }
+       default:
+               DEBUG(1, ("Warning: invalid info length in bind info: %d\n",
+                         bind_info.length));
+               break;
+       }
+
        return status;
 }
 
@@ -252,11 +243,12 @@ static NTSTATUS libnet_dssync_lookup_nc(TALLOC_CTX *mem_ctx,
 {
        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);
        NT_STATUS_HAVE_NO_MEMORY(names[0].str);
@@ -266,10 +258,10 @@ static NTSTATUS libnet_dssync_lookup_nc(TALLOC_CTX *mem_ctx,
        req.req1.count          = 1;
        req.req1.names          = names;
        req.req1.format_flags   = DRSUAPI_DS_NAME_FLAG_NO_FLAGS;
-       req.req1.format_offered = DRSUAPI_DS_NAME_FORMAT_UKNOWN;
+       req.req1.format_offered = DRSUAPI_DS_NAME_FORMAT_UNKNOWN;
        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,
                                             &req,
@@ -277,13 +269,16 @@ static NTSTATUS libnet_dssync_lookup_nc(TALLOC_CTX *mem_ctx,
                                             &ctr,
                                             &werr);
        if (!NT_STATUS_IS_OK(status)) {
-               ctx->error_message = talloc_asprintf(mem_ctx,
+               ctx->error_message = talloc_asprintf(ctx,
                        "Failed to lookup DN for domain name: %s",
-                       get_friendly_werror_msg(werr));
+                       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 werror_to_ntstatus(werr);
        }
 
@@ -330,81 +325,208 @@ static NTSTATUS libnet_dssync_init(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
-                                     struct dssync_context *ctx)
+static NTSTATUS libnet_dssync_build_request(TALLOC_CTX *mem_ctx,
+                                           struct dssync_context *ctx,
+                                           const char *dn,
+                                           struct replUpToDateVectorBlob *utdv,
+                                           uint32_t *plevel,
+                                           union drsuapi_DsGetNCChangesRequest *preq)
 {
        NTSTATUS status;
-       WERROR werr;
-
-       int32_t level = 8;
-       int32_t level_out = 0;
+       uint32_t count;
+       uint32_t level;
        union drsuapi_DsGetNCChangesRequest req;
-       union drsuapi_DsGetNCChangesCtr ctr;
-       struct drsuapi_DsReplicaObjectIdentifier nc;
        struct dom_sid null_sid;
+       enum drsuapi_DsExtendedOperation extended_op;
+       struct drsuapi_DsReplicaObjectIdentifier *nc = NULL;
+       struct drsuapi_DsReplicaCursorCtrEx *cursors = NULL;
 
-       struct drsuapi_DsGetNCChangesCtr1 *ctr1 = NULL;
-       struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL;
-       int32_t out_level = 0;
-       int y;
+       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);
        ZERO_STRUCT(req);
 
-       nc.dn = ctx->nc_dn;
-       nc.guid = GUID_zero();
-       nc.sid = null_sid;
+       if (ctx->remote_info28.supported_extensions
+           & DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V8)
+       {
+               level = 8;
+       } else {
+               level = 5;
+       }
+
+       nc = talloc_zero(mem_ctx, struct drsuapi_DsReplicaObjectIdentifier);
+       if (!nc) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
+       nc->dn = dn;
+       nc->guid = GUID_zero();
+       nc->sid = null_sid;
+
+       if (!ctx->single_object_replication &&
+           !ctx->force_full_replication && utdv)
+       {
+               cursors = talloc_zero(mem_ctx,
+                                        struct drsuapi_DsReplicaCursorCtrEx);
+               if (!cursors) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto fail;
+               }
+
+               switch (utdv->version) {
+               case 1:
+                       cursors->count = utdv->ctr.ctr1.count;
+                       cursors->cursors = utdv->ctr.ctr1.cursors;
+                       break;
+               case 2:
+                       cursors->count = utdv->ctr.ctr2.count;
+                       cursors->cursors = talloc_array(cursors,
+                                               struct drsuapi_DsReplicaCursor,
+                                               cursors->count);
+                       if (!cursors->cursors) {
+                               status = NT_STATUS_NO_MEMORY;
+                               goto fail;
+                       }
+                       for (count = 0; count < cursors->count; count++) {
+                               cursors->cursors[count].source_dsa_invocation_id =
+                                       utdv->ctr.ctr2.cursors[count].source_dsa_invocation_id;
+                               cursors->cursors[count].highest_usn =
+                                       utdv->ctr.ctr2.cursors[count].highest_usn;
+                       }
+                       break;
+               }
+       }
+
+       if (ctx->single_object_replication) {
+               extended_op = DRSUAPI_EXOP_REPL_OBJ;
+       } else {
+               extended_op = DRSUAPI_EXOP_NONE;
+       }
+
+       if (level == 8) {
+               req.req8.naming_context         = nc;
+               req.req8.replica_flags          = replica_flags;
+               req.req8.max_object_count       = 402;
+               req.req8.max_ndr_size           = 402116;
+               req.req8.uptodateness_vector    = cursors;
+               req.req8.extended_op            = extended_op;
+       } else if (level == 5) {
+               req.req5.naming_context         = nc;
+               req.req5.replica_flags          = replica_flags;
+               req.req5.max_object_count       = 402;
+               req.req5.max_ndr_size           = 402116;
+               req.req5.uptodateness_vector    = cursors;
+               req.req5.extended_op            = extended_op;
+       } else {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+
+       if (plevel) {
+               *plevel = level;
+       }
+
+       if (preq) {
+               *preq = req;
+       }
+
+       return NT_STATUS_OK;
+
+fail:
+       TALLOC_FREE(nc);
+       TALLOC_FREE(cursors);
+       return status;
+}
+
+static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX *mem_ctx,
+                                          struct dssync_context *ctx,
+                                          uint32_t level,
+                                          union drsuapi_DsGetNCChangesRequest *req,
+                                          struct replUpToDateVectorBlob **pnew_utdv)
+{
+       NTSTATUS status;
+       WERROR werr;
+       union drsuapi_DsGetNCChangesCtr ctr;
+       struct drsuapi_DsGetNCChangesCtr1 *ctr1 = NULL;
+       struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL;
+       struct replUpToDateVectorBlob *new_utdv = NULL;
+       uint32_t level_out = 0;
+       uint32_t out_level = 0;
+       int y;
+       bool last_query;
+       struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
-       req.req8.naming_context         = &nc;
-       req.req8.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;
-       req.req8.max_object_count       = 402;
-       req.req8.max_ndr_size           = 402116;
+       if (!ctx->single_object_replication) {
+               new_utdv = talloc_zero(mem_ctx, struct replUpToDateVectorBlob);
+               if (!new_utdv) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto out;
+               }
+       }
 
-       for (y=0; ;y++) {
+       for (y=0, last_query = false; !last_query; y++) {
+               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) {
                        DEBUG(1,("start[%d] tmp_higest_usn: %llu , highest_usn: %llu\n",y,
-                               (long long)req.req8.highwatermark.tmp_highest_usn,
-                               (long long)req.req8.highwatermark.highest_usn));
+                               (long long)req->req8.highwatermark.tmp_highest_usn,
+                               (long long)req->req8.highwatermark.highest_usn));
+               } else if (level == 5) {
+                       DEBUG(1,("start[%d] tmp_higest_usn: %llu , highest_usn: %llu\n",y,
+                               (long long)req->req5.highwatermark.tmp_highest_usn,
+                               (long long)req->req5.highwatermark.highest_usn));
                }
 
-               status = rpccli_drsuapi_DsGetNCChanges(ctx->cli, mem_ctx,
+               status = dcerpc_drsuapi_DsGetNCChanges(b, mem_ctx,
                                                       &ctx->bind_handle,
                                                       level,
-                                                      &req,
+                                                      req,
                                                       &level_out,
                                                       &ctr,
                                                       &werr);
                if (!NT_STATUS_IS_OK(status)) {
-                       ctx->error_message = talloc_asprintf(mem_ctx,
+                       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;
                }
 
                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;
                }
 
                if (level_out == 1) {
                        out_level = 1;
                        ctr1 = &ctr.ctr1;
-               } else if (level_out == 2) {
+               } else if (level_out == 2 && ctr.ctr2.mszip1.ts) {
                        out_level = 1;
-                       ctr1 = ctr.ctr2.ctr.mszip1.ctr1;
-               }
-
-               status = cli_get_session_key(mem_ctx, ctx->cli, &ctx->session_key);
-               if (!NT_STATUS_IS_OK(status)) {
-                       ctx->error_message = talloc_asprintf(mem_ctx,
-                               "Failed to get Session Key: %s",
-                               nt_errstr(status));
-                       return status;
+                       ctr1 = &ctr.ctr2.mszip1.ts->ctr1;
+               } else if (level_out == 6) {
+                       out_level = 6;
+                       ctr6 = &ctr.ctr6;
+               } else if (level_out == 7
+                          && ctr.ctr7.level == 6
+                          && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP
+                          && ctr.ctr7.ctr.mszip6.ts) {
+                       out_level = 6;
+                       ctr6 = &ctr.ctr7.ctr.mszip6.ts->ctr6;
+               } else if (level_out == 7
+                          && ctr.ctr7.level == 6
+                          && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_XPRESS
+                          && ctr.ctr7.ctr.xpress6.ts) {
+                       out_level = 6;
+                       ctr6 = &ctr.ctr7.ctr.xpress6.ts->ctr6;
                }
 
                if (out_level == 1) {
@@ -412,68 +534,160 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
                                (long long)ctr1->new_highwatermark.tmp_highest_usn,
                                (long long)ctr1->new_highwatermark.highest_usn));
 
-                       libnet_dssync_decrypt_attributes(mem_ctx,
-                                                        &ctx->session_key,
-                                                        ctr1->first_object);
-
-                       if (ctx->processing_fn) {
-                               status = ctx->processing_fn(mem_ctx,
-                                                           ctr1->first_object,
-                                                           &ctr1->mapping_ctr,
-                                                           ctx);
-                               if (!NT_STATUS_IS_OK(status)) {
-                                       ctx->error_message = talloc_asprintf(mem_ctx,
-                                               "Failed to call processing function: %s",
-                                               nt_errstr(status));
-                                       goto out;
+                       first_object = ctr1->first_object;
+                       mapping_ctr = &ctr1->mapping_ctr;
+
+                       if (ctr1->more_data) {
+                               req->req5.highwatermark = ctr1->new_highwatermark;
+                       } else {
+                               last_query = true;
+                               if (ctr1->uptodateness_vector &&
+                                   !ctx->single_object_replication)
+                               {
+                                       new_utdv->version = 1;
+                                       new_utdv->ctr.ctr1.count =
+                                               ctr1->uptodateness_vector->count;
+                                       new_utdv->ctr.ctr1.cursors =
+                                               ctr1->uptodateness_vector->cursors;
                                }
                        }
+               } else if (out_level == 6) {
+                       DEBUG(1,("end[%d] tmp_highest_usn: %llu , highest_usn: %llu\n",y,
+                               (long long)ctr6->new_highwatermark.tmp_highest_usn,
+                               (long long)ctr6->new_highwatermark.highest_usn));
 
-                       if (ctr1->new_highwatermark.tmp_highest_usn > ctr1->new_highwatermark.highest_usn) {
-                               req.req5.highwatermark = ctr1->new_highwatermark;
-                               continue;
+                       first_object = ctr6->first_object;
+                       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;
+                       } else {
+                               last_query = true;
+                               if (ctr6->uptodateness_vector &&
+                                   !ctx->single_object_replication)
+                               {
+                                       new_utdv->version = 2;
+                                       new_utdv->ctr.ctr2.count =
+                                               ctr6->uptodateness_vector->count;
+                                       new_utdv->ctr.ctr2.cursors =
+                                               ctr6->uptodateness_vector->cursors;
+                               }
                        }
                }
 
-               if (level_out == 6) {
-                       out_level = 6;
-                       ctr6 = &ctr.ctr6;
-               } else if (level_out == 7
-                          && ctr.ctr7.level == 6
-                          && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP) {
-                       out_level = 6;
-                       ctr6 = ctr.ctr7.ctr.mszip6.ctr6;
+               status = cli_get_session_key(mem_ctx, ctx->cli, &ctx->session_key);
+               if (!NT_STATUS_IS_OK(status)) {
+                       ctx->error_message = talloc_asprintf(ctx,
+                               "Failed to get Session Key: %s",
+                               nt_errstr(status));
+                       goto out;
                }
 
-               if (out_level == 6) {
-                       DEBUG(1,("end[%d] tmp_highest_usn: %llu , highest_usn: %llu\n",y,
-                               (long long)ctr6->new_highwatermark.tmp_highest_usn,
-                               (long long)ctr6->new_highwatermark.highest_usn));
+               libnet_dssync_decrypt_attributes(mem_ctx,
+                                                &ctx->session_key,
+                                                first_object);
+
+               if (ctx->ops->process_objects) {
+                       status = ctx->ops->process_objects(ctx, mem_ctx,
+                                                          first_object,
+                                                          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;
+                       }
+               }
 
-                       libnet_dssync_decrypt_attributes(mem_ctx,
-                                                        &ctx->session_key,
-                                                        ctr6->first_object);
-
-                       if (ctx->processing_fn) {
-                               status = ctx->processing_fn(mem_ctx,
-                                                           ctr6->first_object,
-                                                           &ctr6->mapping_ctr,
-                                                           ctx);
-                               if (!NT_STATUS_IS_OK(status)) {
-                                       ctx->error_message = talloc_asprintf(mem_ctx,
-                                               "Failed to call processing function: %s",
-                                               nt_errstr(status));
-                                       goto out;
-                               }
+               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;
                        }
+               }
+       }
 
-                       if (ctr6->new_highwatermark.tmp_highest_usn > ctr6->new_highwatermark.highest_usn) {
-                               req.req8.highwatermark = ctr6->new_highwatermark;
-                               continue;
+       *pnew_utdv = new_utdv;
+
+out:
+       return status;
+}
+
+static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
+                                     struct dssync_context *ctx)
+{
+       NTSTATUS status;
+
+       uint32_t level = 0;
+       union drsuapi_DsGetNCChangesRequest req;
+       struct replUpToDateVectorBlob *old_utdv = NULL;
+       struct replUpToDateVectorBlob *pnew_utdv = NULL;
+       const char **dns;
+       uint32_t dn_count;
+       uint32_t count;
+
+       if (ctx->ops->startup) {
+               status = ctx->ops->startup(ctx, mem_ctx, &old_utdv);
+               if (!NT_STATUS_IS_OK(status)) {
+                       ctx->error_message = talloc_asprintf(ctx,
+                               "Failed to call startup operation: %s",
+                               nt_errstr(status));
+                       goto out;
+               }
+       }
+
+       if (ctx->single_object_replication && ctx->object_dns) {
+               dns = ctx->object_dns;
+               dn_count = ctx->object_count;
+       } else {
+               dns = &ctx->nc_dn;
+               dn_count = 1;
+       }
+
+       status = NT_STATUS_OK;
+
+       for (count=0; count < dn_count; count++) {
+               status = libnet_dssync_build_request(mem_ctx, ctx,
+                                                    dns[count],
+                                                    old_utdv, &level,
+                                                    &req);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto out;
+               }
+
+               status = libnet_dssync_getncchanges(mem_ctx, ctx, level, &req,
+                                                   &pnew_utdv);
+               if (!NT_STATUS_IS_OK(status)) {
+                       if (!ctx->error_message) {
+                               ctx->error_message = talloc_asprintf(ctx,
+                                       "Failed to call DsGetNCCHanges: %s",
+                                       nt_errstr(status));
                        }
+                       goto out;
                }
+       }
 
-               break;
+       if (ctx->ops->finish) {
+               status = ctx->ops->finish(ctx, mem_ctx, pnew_utdv);
+               if (!NT_STATUS_IS_OK(status)) {
+                       ctx->error_message = talloc_asprintf(ctx,
+                               "Failed to call finishing operation: %s",
+                               nt_errstr(status));
+                       goto out;
+               }
        }
 
  out:
@@ -487,17 +701,25 @@ NTSTATUS libnet_dssync(TALLOC_CTX *mem_ctx,
                       struct dssync_context *ctx)
 {
        NTSTATUS status;
+       TALLOC_CTX *tmp_ctx;
 
-       status = libnet_dssync_init(mem_ctx, ctx);
+       tmp_ctx = talloc_new(mem_ctx);
+       if (!tmp_ctx) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = libnet_dssync_init(tmp_ctx, ctx);
        if (!NT_STATUS_IS_OK(status)) {
                goto out;
        }
 
-       status = libnet_dssync_process(mem_ctx, ctx);
+       status = libnet_dssync_process(tmp_ctx, ctx);
        if (!NT_STATUS_IS_OK(status)) {
                goto out;
        }
 
  out:
+       TALLOC_FREE(tmp_ctx);
        return status;
 }
+