net rpc vampire: rename --repl-nodiff to --force-full-repl.

This more clear.

Michael

diff --git a/source/utils/net.c b/source/utils/net.c
index c1b68eceb0ce63ef8be124b12d10579684eecb43..8a5893266f20ee7ee70fa8b5cbb3cad2e15fce3f 100644 (file)
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -653,7 +653,7 @@ static struct functable net_func[] = {
                {"destination", 0, POPT_ARG_STRING,   &c->opt_destination},
                {"tallocreport", 0, POPT_ARG_NONE,    &c->do_talloc_report},
                /* Options for 'net rpc vampire (keytab)' */
-               {"repl-nodiff", 0, POPT_ARG_NONE, &c->opt_repl_nodiff},
+               {"force-full-repl", 0, POPT_ARG_NONE, &c->opt_force_full_repl},
 
                POPT_COMMON_SAMBA
                { 0, 0, 0, 0}

diff --git a/source/utils/net.h b/source/utils/net.h
index 34e34a758a1303bd0938523a8bd8e15241f3c6fa..5dd5a3501dc0789aa4f43734284c9621a025ed5d 100644 (file)
--- a/source/utils/net.h
+++ b/source/utils/net.h
@@ -57,7 +57,7 @@ struct net_context {
        const char *opt_destination;
        int opt_testmode;
        bool opt_kerberos;
-       int opt_repl_nodiff;
+       int opt_force_full_repl;
 
        int opt_have_ip;
        struct sockaddr_storage opt_dest_ip;

diff --git a/source/utils/net_rpc_samsync.c b/source/utils/net_rpc_samsync.c
index 85b524c0a49dd40890b36b5d02fdddd2a1b88f2f..1f0b586d9e5dd5543d49053ac6ff31c1b874faf4 100644 (file)
--- a/source/utils/net_rpc_samsync.c
+++ b/source/utils/net_rpc_samsync.c
@@ -296,7 +296,7 @@ static NTSTATUS rpc_vampire_keytab_ds_internals(struct net_context *c,
                return status;
        }
 
-       ctx->force_full_replication = c->opt_repl_nodiff ? true : false;
+       ctx->force_full_replication = c->opt_force_full_repl ? true : false;
 
        if (argc >= 1) {
                ctx->output_filename = argv[0];