From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 2 Nov 2016 00:39:49 +0000 (+0100)
Subject: login-common: Added result code for password-expired authentication failure.
X-Git-Tag: 2.3.0.rc1~2709
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=529944a3554da75c2e6231a25fe489d815519b22;p=thirdparty%2Fdovecot%2Fcore.git

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 8971b12fcc..44938be2ac 100644
--- 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 0c3373f6aa..182e3017ab 100644
--- 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 27a64fb6d3..d6cdaee7f5 100644
--- 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 d499ef1784..0e04892464 100644
--- 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;