From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 21 Feb 2022 16:09:30 +0000 (+0100)
Subject: anvil: Move add_conn_guid to struct anvil_cmd_kick
X-Git-Tag: 2.4.0~4347
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6d3f15279919cf2ea15ffc0168762709d5ff7f0;p=thirdparty%2Fdovecot%2Fcore.git

anvil: Move add_conn_guid to struct anvil_cmd_kick
---

diff --git a/src/anvil/anvil-connection.c b/src/anvil/anvil-connection.c
index 31f6cc1cc7..5c810f5d17 100644
--- a/src/anvil/anvil-connection.c
+++ b/src/anvil/anvil-connection.c
@@ -69,6 +69,7 @@ struct anvil_cmd_kick_target {
 struct anvil_cmd_kick {
 	struct anvil_connection *conn;
 	struct connect_limit_iter *iter;
+	bool add_conn_guid;
 
 	pid_t prev_pid;
 	int cmd_refcount;
@@ -254,6 +255,7 @@ kick_user_iter(struct anvil_connection *conn, struct connect_limit_iter *iter,
 	kick = i_new(struct anvil_cmd_kick, 1);
 	kick->conn = conn;
 	kick->iter = iter;
+	kick->add_conn_guid = add_conn_guid;
 	kick->prev_pid = (pid_t)-1;
 	conn->refcount++;
 
@@ -286,7 +288,7 @@ kick_user_iter(struct anvil_connection *conn, struct connect_limit_iter *iter,
 				str_append(cmd, "KICK-USER\t");
 			str_append_tabescaped(cmd, result.username);
 			if (!guid_128_is_empty(result.conn_guid) &&
-			    add_conn_guid) {
+			    kick->add_conn_guid) {
 				str_append_c(cmd, '\t');
 				str_append_tabescaped(cmd,
 					guid_128_to_string(result.conn_guid));