login-common: Added result code for password-expired authentication failure.

diff --git a/src/imap-login/client-authenticate.c b/src/imap-login/client-authenticate.c
index 8971b12fcc40a223b1a4373b63f6a3f21ccdc66a..44938be2ac3aa784fb4888a8d33ee5bfb98a7aaa 100644 (file)
--- a/src/imap-login/client-authenticate.c
+++ b/src/imap-login/client-authenticate.c
@@ -97,6 +97,7 @@ void imap_client_auth_result(struct client *client,
                client_send_reply_code(client, IMAP_CMD_REPLY_NO,
                                       IMAP_RESP_CODE_PRIVACYREQUIRED, text);
                break;
+       case CLIENT_AUTH_RESULT_PASS_EXPIRED:
        case CLIENT_AUTH_RESULT_AUTHFAILED:
                client_send_reply_code(client, IMAP_CMD_REPLY_NO,
                                       IMAP_RESP_CODE_AUTHFAILED, text);

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index 0c3373f6aac2aaa83d1cd5d6a5910ef9702ee56a..182e3017ab986fa9ee8ab2616c899520631a4c2e 100644 (file)
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -523,8 +523,10 @@ client_auth_handle_reply(struct client *client,
                        reason = t_strdup_printf(AUTH_TEMP_FAILED_MSG" [%s:%s]",
                                      my_hostname, timestamp);
                        break;
-               case CLIENT_AUTH_FAIL_CODE_USER_DISABLED:
                case CLIENT_AUTH_FAIL_CODE_PASS_EXPIRED:
+                       result = CLIENT_AUTH_RESULT_PASS_EXPIRED;
+                       break;
+               case CLIENT_AUTH_FAIL_CODE_USER_DISABLED:
                default:
                        if (reason != NULL)
                                result = CLIENT_AUTH_RESULT_AUTHFAILED_REASON;

diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index 27a64fb6d323a305609c57705a702c8a21f74725..d6cdaee7f54fddce583d5c2d1f5a8211bf6bf459 100644 (file)
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -60,6 +60,7 @@ enum client_auth_result {
        CLIENT_AUTH_RESULT_AUTHFAILED_REASON,
        CLIENT_AUTH_RESULT_AUTHZFAILED,
        CLIENT_AUTH_RESULT_TEMPFAIL,
+       CLIENT_AUTH_RESULT_PASS_EXPIRED,
        CLIENT_AUTH_RESULT_SSL_REQUIRED
 };
 

diff --git a/src/pop3-login/client-authenticate.c b/src/pop3-login/client-authenticate.c
index d499ef1784de11e6085229f7263c036e8bfeb37f..0e048924645bb5314666976a2b9c822a07de13b3 100644 (file)
--- a/src/pop3-login/client-authenticate.c
+++ b/src/pop3-login/client-authenticate.c
@@ -63,6 +63,7 @@ void pop3_client_auth_result(struct client *client,
        case CLIENT_AUTH_RESULT_AUTHFAILED:
        case CLIENT_AUTH_RESULT_AUTHFAILED_REASON:
        case CLIENT_AUTH_RESULT_AUTHZFAILED:
+       case CLIENT_AUTH_RESULT_PASS_EXPIRED:
        case CLIENT_AUTH_RESULT_SSL_REQUIRED:
                client_send_reply(client, POP3_CMD_REPLY_AUTH_ERROR, text);
                break;