From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 22 Feb 2016 11:59:14 +0000 (+0200)
Subject: doveadm-mail: Fixed common parameters to use correct names as in DOVEADM_CMD_MAIL_COMMON
X-Git-Tag: 2.2.22.rc1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13607902e5899698826a777f165d0afa8f766ac1;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-mail: Fixed common parameters to use correct names as in DOVEADM_CMD_MAIL_COMMON
---

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index dc9ca6e463..f6a89851e8 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -902,9 +902,9 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(const struct doveadm_cmd_ver2* cmd,
 		if (!argv[i].value_set)
 			continue;
 
-		if (strcmp(argv[i].name, "all_users") == 0) {
+		if (strcmp(argv[i].name, "all-users") == 0) {
 			ctx->iterate_all_users = argv[i].value.v_bool;
-		} else if (strcmp(argv[i].name, "socket_path") == 0) {
+		} else if (strcmp(argv[i].name, "socket-path") == 0) {
 			doveadm_settings->doveadm_socket_path = argv[i].value.v_string;
 			if (doveadm_settings->doveadm_worker_count == 0)
 				doveadm_settings->doveadm_worker_count = 1;
@@ -916,7 +916,7 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(const struct doveadm_cmd_ver2* cmd,
 				wildcard_user = ctx->cur_username;
 				ctx->cur_username = NULL;
 			}
-		} else if (strcmp(argv[i].name, "user_list") == 0) {
+		} else if (strcmp(argv[i].name, "user-file") == 0) {
 			ctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
 			wildcard_user = "*";
 			ctx->users_list_input = argv[i].value.v_istream;