From: Timo Sirainen <tss@iki.fi>
Date: Tue, 24 May 2011 17:06:24 +0000 (+0300)
Subject: doveadm proxy: s/kill/kick/ and related internal code changes.
X-Git-Tag: 2.0.14~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1118842c3d80285e32d2cd53bda3e95e5be217;p=thirdparty%2Fdovecot%2Fcore.git

doveadm proxy: s/kill/kick/ and related internal code changes.
Mainly for consistency, because "doveadm kick" already existed.
---

diff --git a/src/director/director.c b/src/director/director.c
index face05fa79..2834740c44 100644
--- a/src/director/director.c
+++ b/src/director/director.c
@@ -488,7 +488,7 @@ void director_move_user(struct director *dir, struct director_host *src,
 		user->to_move = timeout_add(DIRECTOR_USER_MOVE_TIMEOUT_MSECS,
 					    director_user_move_timeout, user);
 		user->kill_state = USER_KILL_STATE_KILLING;
-		cmd = t_strdup_printf("proxy\t*\tKILL-DIRECTOR-HASH\t%u",
+		cmd = t_strdup_printf("proxy\t*\tKICK-DIRECTOR-HASH\t%u",
 				      username_hash);
 		ipc_client_cmd(dir->ipc_proxy, cmd,
 			       director_kill_user_callback, ctx);
diff --git a/src/doveadm/doveadm-proxy.c b/src/doveadm/doveadm-proxy.c
index 35bfa65f99..080c0809bb 100644
--- a/src/doveadm/doveadm-proxy.c
+++ b/src/doveadm/doveadm-proxy.c
@@ -80,35 +80,35 @@ static void cmd_proxy_list(int argc, char *argv[])
 	ipc_client_deinit(&ctx->ipc);
 }
 
-static void cmd_proxy_kill_callback(enum ipc_client_cmd_state state,
+static void cmd_proxy_kick_callback(enum ipc_client_cmd_state state,
 				    const char *data, void *context ATTR_UNUSED)
 {
 	switch (state) {
 	case IPC_CLIENT_CMD_STATE_REPLY:
 		return;
 	case IPC_CLIENT_CMD_STATE_OK:
-		printf("%s connections killed\n", data);
+		printf("%s connections kicked\n", data);
 		break;
 	case IPC_CLIENT_CMD_STATE_ERROR:
-		i_error("KILL failed: %s", data);
+		i_error("KICK failed: %s", data);
 		break;
 	}
 	io_loop_stop(current_ioloop);
 }
 
-static void cmd_proxy_kill(int argc, char *argv[])
+static void cmd_proxy_kick(int argc, char *argv[])
 {
 	struct proxy_context *ctx;
 
-	ctx = cmd_proxy_init(argc, argv, "a:", cmd_proxy_kill);
+	ctx = cmd_proxy_init(argc, argv, "a:", cmd_proxy_kick);
 
 	if (argv[optind] == NULL) {
-		proxy_cmd_help(cmd_proxy_kill);
+		proxy_cmd_help(cmd_proxy_kick);
 		return;
 	}
 
-	ipc_client_cmd(ctx->ipc, t_strdup_printf("proxy\t*\tKILL\t%s", argv[optind]),
-		       cmd_proxy_kill_callback, NULL);
+	ipc_client_cmd(ctx->ipc, t_strdup_printf("proxy\t*\tKICK\t%s", argv[optind]),
+		       cmd_proxy_kick_callback, NULL);
 	io_loop_run(current_ioloop);
 	ipc_client_deinit(&ctx->ipc);
 }
@@ -116,7 +116,7 @@ static void cmd_proxy_kill(int argc, char *argv[])
 struct doveadm_cmd doveadm_cmd_proxy[] = {
 	{ cmd_proxy_list, "proxy list",
 	  "[-a <ipc socket path>]" },
-	{ cmd_proxy_kill, "proxy kill",
+	{ cmd_proxy_kick, "proxy kick",
 	  "[-a <ipc socket path>] <user>" }
 };
 
diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index e36d46ddb4..6e05bfc676 100644
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -577,7 +577,7 @@ void login_proxy_kill_idle(void)
 }
 
 static void
-login_proxy_cmd_kill(struct ipc_cmd *cmd, const char *const *args)
+login_proxy_cmd_kick(struct ipc_cmd *cmd, const char *const *args)
 {
 	struct login_proxy *proxy, *next;
 	unsigned int count = 0;
@@ -599,7 +599,7 @@ login_proxy_cmd_kill(struct ipc_cmd *cmd, const char *const *args)
 		next = proxy->next;
 
 		if (strcmp(proxy->client->virtual_user, args[0]) == 0) {
-			client_destroy(proxy->client, "Connection killed");
+			client_destroy(proxy->client, "Connection kicked");
 			count++;
 		}
 	}
@@ -620,7 +620,7 @@ static unsigned int director_username_hash(const char *username)
 }
 
 static void
-login_proxy_cmd_kill_director_hash(struct ipc_cmd *cmd, const char *const *args)
+login_proxy_cmd_kick_director_hash(struct ipc_cmd *cmd, const char *const *args)
 {
 	struct login_proxy *proxy, *next;
 	unsigned int hash, count = 0;
@@ -642,7 +642,7 @@ login_proxy_cmd_kill_director_hash(struct ipc_cmd *cmd, const char *const *args)
 		next = proxy->next;
 
 		if (director_username_hash(proxy->client->virtual_user) == hash) {
-			client_destroy(proxy->client, "Connection killed");
+			client_destroy(proxy->client, "Connection kicked");
 			count++;
 		}
 	}
@@ -683,10 +683,10 @@ static void login_proxy_ipc_cmd(struct ipc_cmd *cmd, const char *line)
 	const char *name = args[0];
 
 	args++;
-	if (strcmp(name, "KILL") == 0)
-		login_proxy_cmd_kill(cmd, args);
-	else if (strcmp(name, "KILL-DIRECTOR-HASH") == 0)
-		login_proxy_cmd_kill_director_hash(cmd, args);
+	if (strcmp(name, "KICK") == 0)
+		login_proxy_cmd_kick(cmd, args);
+	else if (strcmp(name, "KICK-DIRECTOR-HASH") == 0)
+		login_proxy_cmd_kick_director_hash(cmd, args);
 	else if (strcmp(name, "LIST") == 0)
 		login_proxy_cmd_list(cmd, args);
 	else