From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 22 Mar 2016 07:19:45 +0000 (+0200)
Subject: doveadm-server: Fixed initializing username for mail commands.
X-Git-Tag: 2.2.23~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=102279b2a21c5c8ac08bba05f3344aef8d976d0a;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-server: Fixed initializing username for mail commands.
---

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index b8bd2040c9..ac78acd432 100644
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -104,7 +104,7 @@ doveadm_mail_cmd_server_parse(const struct doveadm_mail_cmd *cmd,
 	mctx = doveadm_mail_cmd_init(cmd, set);
 	mctx->full_args = argv+1;
 	mctx->proxying = TRUE;
-
+	mctx->cur_username = cctx->username;
 	mctx->service_flags |=
 		MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT |
 		MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
@@ -149,6 +149,13 @@ doveadm_mail_cmd_server_parse(const struct doveadm_mail_cmd *cmd,
 	}
 	mctx->args = argv+optind;
 
+	if (mctx->cur_username != NULL) {
+		if (strchr(mctx->cur_username, '*') != NULL ||
+		    strchr(mctx->cur_username, '?') != NULL) {
+			add_username_header = TRUE;
+		}
+	}
+
 	if (doveadm_print_is_initialized() && add_username_header) {
 		doveadm_print_header("username", "Username",
 				     DOVEADM_PRINT_HEADER_FLAG_STICKY |