summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-30 17:46:13 +0200
committerMichael Adam <obnox@samba.org>2008-08-01 16:07:58 +0200
commit5330164ec4f40d7b9731a2d60643432c226ffc03 (patch)
tree6c051b376056bd1fce87eb95dd365bd7113ce14b
parent072bd871946134b3c5e57809b4831ed6fe5586b2 (diff)
downloadsamba-5330164ec4f40d7b9731a2d60643432c226ffc03.tar.gz
samba-5330164ec4f40d7b9731a2d60643432c226ffc03.tar.bz2
samba-5330164ec4f40d7b9731a2d60643432c226ffc03.zip
net rpc vampire: rename --repl-nodiff to --force-full-repl.
This more clear. Michael (This used to be commit 0ddde9aae88e6244276e1c143056a4bfc7c7fcca)
-rw-r--r--source3/utils/net.c2
-rw-r--r--source3/utils/net.h2
-rw-r--r--source3/utils/net_rpc_samsync.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/net.c b/source3/utils/net.c
index c1b68eceb0..8a5893266f 100644
--- a/source3/utils/net.c
+++ b/source3/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/source3/utils/net.h b/source3/utils/net.h
index 34e34a758a..5dd5a3501d 100644
--- a/source3/utils/net.h
+++ b/source3/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/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 85b524c0a4..1f0b586d9e 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/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];