From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 3 Dec 2021 15:54:37 +0000 (+0200)
Subject: login-common: Split off proxy disconnection prefix to LOGIN_PROXY_KILL_PREFIX
X-Git-Tag: 2.3.18~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da379cfc29ab586004985a7bdb35216fece4354d;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Split off proxy disconnection prefix to LOGIN_PROXY_KILL_PREFIX
---

diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index 983c5e2951..5a84832654 100644
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -27,9 +27,10 @@
 #define LOGIN_PROXY_DIE_IDLE_SECS 2
 #define LOGIN_PROXY_IPC_PATH "ipc-proxy"
 #define LOGIN_PROXY_IPC_NAME "proxy"
-#define KILLED_BY_ADMIN_REASON "Disconnected by proxy: Kicked by admin"
-#define KILLED_BY_DIRECTOR_REASON "Disconnected by proxy: Kicked via director"
-#define KILLED_BY_SHUTDOWN_REASON "Disconnected by proxy: Process shutting down"
+#define LOGIN_PROXY_KILL_PREFIX "Disconnected by proxy: "
+#define KILLED_BY_ADMIN_REASON "Kicked by admin"
+#define KILLED_BY_DIRECTOR_REASON "Kicked via director"
+#define KILLED_BY_SHUTDOWN_REASON "Process shutting down"
 /* Wait this long before retrying on reconnect */
 #define PROXY_CONNECT_RETRY_MSECS 1000
 /* Don't even try to reconnect if proxying will timeout in less than this. */
@@ -847,7 +848,8 @@ int login_proxy_starttls(struct login_proxy *proxy)
 
 static void proxy_kill_idle(struct login_proxy *proxy)
 {
-	login_proxy_free_full(&proxy, KILLED_BY_SHUTDOWN_REASON, 0);
+	login_proxy_free_full(&proxy,
+		LOGIN_PROXY_KILL_PREFIX KILLED_BY_SHUTDOWN_REASON, 0);
 }
 
 void login_proxy_kill_idle(void)
@@ -921,8 +923,9 @@ login_proxy_cmd_kick_full(struct ipc_cmd *cmd, const char *const *args,
 		next = proxy->next;
 
 		if (want_kick(proxy, args, key_idx)) {
-			login_proxy_free_full(&proxy, KILLED_BY_ADMIN_REASON,
-					      LOGIN_PROXY_FREE_FLAG_DELAYED);
+			login_proxy_free_full(&proxy,
+				LOGIN_PROXY_KILL_PREFIX KILLED_BY_ADMIN_REASON,
+				LOGIN_PROXY_FREE_FLAG_DELAYED);
 			count++;
 		}
 	} T_END;
@@ -930,7 +933,9 @@ login_proxy_cmd_kick_full(struct ipc_cmd *cmd, const char *const *args,
 		next = proxy->next;
 
 		if (want_kick(proxy, args, key_idx)) {
-			client_disconnect(proxy->client, KILLED_BY_ADMIN_REASON, FALSE);
+			client_disconnect(proxy->client,
+				LOGIN_PROXY_KILL_PREFIX KILLED_BY_ADMIN_REASON,
+				FALSE);
 			client_destroy(proxy->client, NULL);
 			count++;
 		}
@@ -1020,8 +1025,9 @@ login_proxy_cmd_kick_director_hash(struct ipc_cmd *cmd, const char *const *args)
 		if (director_username_hash(proxy->client, &proxy_hash) &&
 		    proxy_hash == hash &&
 		    !net_ip_compare(&proxy->ip, &except_ip)) {
-			login_proxy_free_full(&proxy, KILLED_BY_DIRECTOR_REASON,
-					      LOGIN_PROXY_FREE_FLAG_DELAYED);
+			login_proxy_free_full(&proxy,
+				LOGIN_PROXY_KILL_PREFIX KILLED_BY_DIRECTOR_REASON,
+				LOGIN_PROXY_FREE_FLAG_DELAYED);
 			count++;
 		}
 	}
@@ -1031,7 +1037,9 @@ login_proxy_cmd_kick_director_hash(struct ipc_cmd *cmd, const char *const *args)
 		if (director_username_hash(proxy->client, &proxy_hash) &&
 		    proxy_hash == hash &&
 		    !net_ip_compare(&proxy->ip, &except_ip)) {
-			client_disconnect(proxy->client, KILLED_BY_DIRECTOR_REASON, FALSE);
+			client_disconnect(proxy->client,
+				LOGIN_PROXY_KILL_PREFIX KILLED_BY_DIRECTOR_REASON,
+				FALSE);
 			client_destroy(proxy->client, NULL);
 			count++;
 		}
@@ -1129,7 +1137,8 @@ void login_proxy_deinit(void)
 
 	while (login_proxies != NULL) {
 		proxy = login_proxies;
-		login_proxy_free_full(&proxy, KILLED_BY_SHUTDOWN_REASON, 0);
+		login_proxy_free_full(&proxy,
+			LOGIN_PROXY_KILL_PREFIX KILLED_BY_SHUTDOWN_REASON, 0);
 	}
 	i_assert(detached_login_proxies_count == 0);