From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 20 Jan 2017 14:03:12 +0000 (+0200)
Subject: director: Ignore doveadm user move if host is already the same.
X-Git-Tag: 2.3.0.rc1~2280
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82641f7aa58d560cc89ec5eb16f03571d6dedcff;p=thirdparty%2Fdovecot%2Fcore.git

director: Ignore doveadm user move if host is already the same.
---

diff --git a/src/director/doveadm-connection.c b/src/director/doveadm-connection.c
index 8c03eafd16..b99ad185fe 100644
--- a/src/director/doveadm-connection.c
+++ b/src/director/doveadm-connection.c
@@ -673,8 +673,10 @@ doveadm_cmd_user_move(struct doveadm_connection *conn, const char *const *args)
 		return 1;
 	}
 
-	director_move_user(conn->dir, conn->dir->self_host, NULL,
-			   username_hash, host);
+	if (user == NULL || user->host != host) {
+		director_move_user(conn->dir, conn->dir->self_host, NULL,
+				   username_hash, host);
+	}
 	o_stream_nsend(conn->output, "OK\n", 3);
 	return 1;
 }