dovecot-2.2: dsync: Removed unnecessary -n parameter from dsync-...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/1a47a0df6ad0
changeset: 15626:1a47a0df6ad0
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Jan 10 08:07:19 2013 +0200
description:
dsync: Removed unnecessary -n parameter from dsync-server.
The setting is sent within dsync protocol.

diffstat:

 src/doveadm/doveadm-settings.c    |  2 +-
 src/doveadm/dsync/doveadm-dsync.c |  7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r b21f3119a5ee -r 1a47a0df6ad0 src/doveadm/doveadm-settings.c
--- a/src/doveadm/doveadm-settings.c	Thu Jan 10 07:54:39 2013 +0200
+++ b/src/doveadm/doveadm-settings.c	Thu Jan 10 08:07:19 2013 +0200
@@ -80,7 +80,7 @@
 	.doveadm_password = "",
 	.doveadm_allowed_commands = "",
 	.dsync_alt_char = "_",
-	.dsync_remote_cmd = "ssh -l%{login} %{host} doveadm dsync-server -u%u -l%{lock_timeout} -n%{namespace}",
+	.dsync_remote_cmd = "ssh -l%{login} %{host} doveadm dsync-server -u%u -l%{lock_timeout}",
 
 	.plugin_envs = ARRAY_INIT
 };
diff -r b21f3119a5ee -r 1a47a0df6ad0 src/doveadm/dsync/doveadm-dsync.c
--- a/src/doveadm/dsync/doveadm-dsync.c	Thu Jan 10 07:54:39 2013 +0200
+++ b/src/doveadm/dsync/doveadm-dsync.c	Thu Jan 10 08:07:19 2013 +0200
@@ -147,7 +147,6 @@
 		{ '\0', NULL, "login" },
 		{ '\0', NULL, "host" },
 		{ '\0', NULL, "lock_timeout" },
-		{ '\0', NULL, "namespace" },
 		{ '\0', NULL, NULL }
 	};
 	struct var_expand_table *tab;
@@ -162,7 +161,6 @@
 	tab[1].value = login;
 	tab[2].value = host;
 	tab[3].value = dec2str(ctx->lock_timeout);
-	tab[4].value = ctx->namespace_prefix;
 
 	t_array_init(&cmd_args, 8);
 	str = t_str_new(128);
@@ -633,9 +631,6 @@
 	case 'r':
 		ctx->rawlog_path = optarg;
 		break;
-	case 'n':
-		ctx->namespace_prefix = optarg;
-		break;
 	default:
 		return FALSE;
 	}
@@ -647,7 +642,7 @@
 	struct dsync_cmd_context *ctx;
 
 	ctx = doveadm_mail_cmd_alloc(struct dsync_cmd_context);
-	ctx->ctx.getopt_args = "El:n:r:";
+	ctx->ctx.getopt_args = "El:r:";
 	ctx->ctx.v.parse_arg = cmd_mailbox_dsync_server_parse_arg;
 	ctx->ctx.v.run = cmd_dsync_server_run;
 	ctx->sync_type = DSYNC_BRAIN_SYNC_TYPE_CHANGED;