*-login: Replace "Aborted login" with "Disconnected: Aborted login by logging out"

diff --git a/src/imap-login/imap-login-client.c b/src/imap-login/imap-login-client.c
index b426a0c2a5bb9b5e9a21f63421b1578980a09f4c..29ade52e5095f57ae24db451ba058a07443108df 100644 (file)
--- a/src/imap-login/imap-login-client.c
+++ b/src/imap-login/imap-login-client.c
@@ -169,7 +169,7 @@ static int cmd_logout(struct imap_client *client,
        client_send_reply(&client->common, IMAP_CMD_REPLY_BYE, "Logging out");
        client_send_reply(&client->common, IMAP_CMD_REPLY_OK,
                          "Logout completed.");
-       client_destroy(&client->common, "Aborted login");
+       client_destroy(&client->common, CLIENT_UNAUTHENTICATED_LOGOUT_MSG);
        return 1;
 }
 

diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index 90232f47f675c8c8faafcfb5d4131afdd6feebdb..9071b3d353bb2ad1fabeae3591bd281f6f79b0ca 100644 (file)
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -37,6 +37,10 @@ struct module;
 #define AUTH_MASTER_WAITING_MSG \
        "Waiting for authentication master process to respond.."
 
+/* Client logged out without having successfully authenticated. */
+#define CLIENT_UNAUTHENTICATED_LOGOUT_MSG \
+       "Aborted login by logging out"
+
 struct master_service_connection;
 
 enum client_disconnect_reason {

diff --git a/src/pop3-login/client.c b/src/pop3-login/client.c
index 42647c38f84a0b2a87c39f9f2ea5717e940dfa51..d57d284b135e037dea055e83ca746e47b8895aae 100644 (file)
--- a/src/pop3-login/client.c
+++ b/src/pop3-login/client.c
@@ -33,7 +33,7 @@ static bool cmd_stls(struct pop3_client *client)
 static bool cmd_quit(struct pop3_client *client)
 {
        client_send_reply(&client->common, POP3_CMD_REPLY_OK, "Logging out");
-       client_destroy(&client->common, "Aborted login");
+       client_destroy(&client->common, CLIENT_UNAUTHENTICATED_LOGOUT_MSG);
        return TRUE;
 }