dovecot-2.2: dsync: Fixes to location parameter handling.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/831351968d3a
changeset: 16202:831351968d3a
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Apr 05 12:25:29 2013 +0300
description:
dsync: Fixes to location parameter handling.

diffstat:

 src/doveadm/dsync/doveadm-dsync.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 4f62a9a86a97 -r 831351968d3a src/doveadm/dsync/doveadm-dsync.c
--- a/src/doveadm/dsync/doveadm-dsync.c	Fri Apr 05 00:24:39 2013 +0300
+++ b/src/doveadm/dsync/doveadm-dsync.c	Fri Apr 05 12:25:29 2013 +0300
@@ -687,7 +687,7 @@
 			    const char **error_r)
 {
 	struct dsync_cmd_context *ctx = (struct dsync_cmd_context *)_ctx;
-	const char *local_location = NULL, *const *remote_cmd_args = NULL;
+	const char *const *remote_cmd_args = NULL;
 	const struct mail_user_settings *user_set;
 	const struct mail_storage_settings *mail_set;
 	const char *username = "";
@@ -710,7 +710,6 @@
 			_ctx->exit_code = DOVEADM_EX_NOTFOUND;
 			return -1;
 		}
-		local_location = ctx->local_location;
 	} else {
 		/* if we're executing remotely, give -u parameter if we also
 		   did a userdb lookup. */
@@ -721,13 +720,13 @@
 			/* it's a mail_location */
 			if (_ctx->args[1] != NULL)
 				doveadm_mail_help_name(_ctx->cmd->name);
+			ctx->local_location = _ctx->args[0];
 			ctx->local_location_from_arg = TRUE;
-			local_location = _ctx->args[0];
 		}
 	}
 
 	if (remote_cmd_args == NULL && ctx->local_location != NULL) {
-		if (parse_location(ctx, mail_set, local_location,
+		if (parse_location(ctx, mail_set, ctx->local_location,
 				   &remote_cmd_args, error_r) < 0)
 			return -1;
 	}