From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 24 Oct 2016 17:20:09 +0000 (+0300)
Subject: director: USER-MOVE didn't handle non-hash username correctly.
X-Git-Tag: 2.2.26~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b78c76d503adb18735a0f28330d58db3fb3bc57d;p=thirdparty%2Fdovecot%2Fcore.git

director: USER-MOVE didn't handle non-hash username correctly.

The entire command line was being hashed instead of just the username.
---

diff --git a/src/director/doveadm-connection.c b/src/director/doveadm-connection.c
index 926f4ebce4..27012dc197 100644
--- a/src/director/doveadm-connection.c
+++ b/src/director/doveadm-connection.c
@@ -576,7 +576,7 @@ doveadm_cmd_user_move(struct doveadm_connection *conn, const char *line)
 	}
 
 	if (str_to_uint(args[0], &username_hash) < 0)
-		username_hash = user_directory_get_username_hash(conn->dir->users, line);
+		username_hash = user_directory_get_username_hash(conn->dir->users, args[0]);
 	user = user_directory_lookup(conn->dir->users, username_hash);
 	if (user != NULL && user->kill_state != USER_KILL_STATE_NONE) {
 		o_stream_nsend_str(conn->output, "TRYAGAIN\n");