dovecot-2.2: doveadm: Changed -U to -F

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/13c933ed6371
changeset: 18531:13c933ed6371
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 06 16:01:45 2015 +0300
description:
doveadm: Changed -U to -F
Otherwise -U collides with doveadm sync -U parameter. -F isn't currently
used by anything.

diffstat:

 src/doveadm/client-connection.c |  4 ++--
 src/doveadm/doveadm-mail.c      |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 14eae320322c -r 13c933ed6371 src/doveadm/client-connection.c
--- a/src/doveadm/client-connection.c	Wed May 06 15:45:43 2015 +0300
+++ b/src/doveadm/client-connection.c	Wed May 06 16:01:45 2015 +0300
@@ -93,11 +93,11 @@
 		ctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_DEBUG;
 
 	optind = 1;
-	getopt_args = t_strconcat("AS:u:U:", ctx->getopt_args, NULL);
+	getopt_args = t_strconcat("AF:S:u:", ctx->getopt_args, NULL);
 	while ((c = getopt(argc, argv, getopt_args)) > 0) {
 		switch (c) {
 		case 'A':
-		case 'U':
+		case 'F':
 			add_username_header = TRUE;
 			break;
 		case 'S':
diff -r 14eae320322c -r 13c933ed6371 src/doveadm/doveadm-mail.c
--- a/src/doveadm/doveadm-mail.c	Wed May 06 15:45:43 2015 +0300
+++ b/src/doveadm/doveadm-mail.c	Wed May 06 16:01:45 2015 +0300
@@ -567,7 +567,7 @@
 	if (doveadm_debug)
 		ctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_DEBUG;
 
-	getopt_args = "AS:u:U:";
+	getopt_args = "AF:S:u:";
 	/* keep context's getopt_args first in case it contains '+' */
 	if (ctx->getopt_args != NULL)
 		getopt_args = t_strconcat(ctx->getopt_args, getopt_args, NULL);
@@ -593,7 +593,7 @@
 				ctx->cur_username = NULL;
 			}
 			break;
-		case 'U':
+		case 'F':
 			ctx->service_flags |=
 				MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
 			wildcard_user = "*";