libnet dssync: rename flag single to single_object_replication

So that it is more obvious what this controls.

Michael
(This used to be commit 2360f0a19f0fb89798b814a02cfca335a4a35b6d)

diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index 8f13cc8e24b15a1f454e8b67a93f5ab1528f465d..f1a98f67d308adf7700d973e03e6aa0febbb5400 100644 (file)
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -401,7 +401,9 @@ static NTSTATUS libnet_dssync_build_request(TALLOC_CTX *mem_ctx,
        nc->guid = GUID_zero();
        nc->sid = null_sid;
 
-       if (!ctx->single && !ctx->force_full_replication && utdv) {
+       if (!ctx->single_object_replication &&
+           !ctx->force_full_replication && utdv)
+       {
                cursors = TALLOC_ZERO_P(mem_ctx,
                                         struct drsuapi_DsReplicaCursorCtrEx);
                if (!cursors) {
@@ -433,7 +435,7 @@ static NTSTATUS libnet_dssync_build_request(TALLOC_CTX *mem_ctx,
                }
        }
 
-       if (ctx->single) {
+       if (ctx->single_object_replication) {
                extended_op = DRSUAPI_EXOP_REPL_OBJ;
        } else {
                extended_op = DRSUAPI_EXOP_NONE;
@@ -491,7 +493,7 @@ static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX *mem_ctx,
        int y;
        bool last_query;
 
-       if (!ctx->single) {
+       if (!ctx->single_object_replication) {
                new_utdv = TALLOC_ZERO_P(mem_ctx, struct replUpToDateVectorBlob);
                if (!new_utdv) {
                        status = NT_STATUS_NO_MEMORY;
@@ -560,7 +562,9 @@ static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX *mem_ctx,
                                req->req5.highwatermark = ctr1->new_highwatermark;
                        } else {
                                last_query = true;
-                               if (ctr1->uptodateness_vector && !ctx->single) {
+                               if (ctr1->uptodateness_vector &&
+                                   !ctx->single_object_replication)
+                               {
                                        new_utdv->version = 1;
                                        new_utdv->ctr.ctr1.count =
                                                ctr1->uptodateness_vector->count;
@@ -580,7 +584,9 @@ static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX *mem_ctx,
                                req->req8.highwatermark = ctr6->new_highwatermark;
                        } else {
                                last_query = true;
-                               if (ctr6->uptodateness_vector && !ctx->single) {
+                               if (ctr6->uptodateness_vector &&
+                                   !ctx->single_object_replication)
+                               {
                                        new_utdv->version = 2;
                                        new_utdv->ctr.ctr2.count =
                                                ctr6->uptodateness_vector->count;
@@ -642,7 +648,7 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
                goto out;
        }
 
-       if (ctx->single && ctx->object_dns) {
+       if (ctx->single_object_replication && ctx->object_dns) {
                dns = ctx->object_dns;
                dn_count = ctx->object_count;
        } else {

diff --git a/source3/libnet/libnet_dssync.h b/source3/libnet/libnet_dssync.h
index 064763d5893a03ec28e1d39697fd9091586e9a2a..c9804fb953f16ac4da684ecf8fd230e4340b7396 100644 (file)
--- a/source3/libnet/libnet_dssync.h
+++ b/source3/libnet/libnet_dssync.h
@@ -35,7 +35,7 @@ struct dssync_context {
        const char *dns_domain_name;
        struct rpc_pipe_client *cli;
        const char *nc_dn;
-       bool single;
+       bool single_object_replication;
        bool force_full_replication;
        uint32_t object_count;
        const char **object_dns;

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 1f0b586d9e5dd5543d49053ac6ff31c1b874faf4..3731edaaf1db51a606b1c99df4f33a07dcbcd921 100644 (file)
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -304,7 +304,7 @@ static NTSTATUS rpc_vampire_keytab_ds_internals(struct net_context *c,
        if (argc >= 2) {
                ctx->object_dns = &argv[1];
                ctx->object_count = argc - 1;
-               ctx->single = true;
+               ctx->single_object_replication = true;
        }
 
        ctx->cli                = pipe_hnd;