auth: Fix 'Password mismatch' casing consistency

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 502db2d4b2b247b9de61e59e81e2bdfb941929ba..40f8c72d56137004b093e9b5782664bf1187dc01 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -2452,7 +2452,7 @@ auth_request_append_password(struct auth_request *request, string_t *str)
 void auth_request_log_password_mismatch(struct auth_request *request,
                                        const char *subsystem)
 {
-       auth_request_log_login_failure(request, subsystem, "Password mismatch");
+       auth_request_log_login_failure(request, subsystem, AUTH_LOG_MSG_PASSWORD_MISMATCH);
 }
 
 void auth_request_log_unknown_user(struct auth_request *request,

diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index 41acbc731eb70c3a7cace80d32db614ff6aa45e3..4dc2bb666e26613b10983d4c1b666175f077bc95 100644 (file)
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -7,6 +7,7 @@
 #include "userdb.h"
 #include "passdb.h"
 #include "auth-request-var-expand.h"
+#include "password-scheme.h"
 
 #define AUTH_REQUEST_USER_KEY_IGNORE " "
 

diff --git a/src/auth/mech-cram-md5.c b/src/auth/mech-cram-md5.c
index c27022fc282efb9869c17c2e43219b9cb5462178..03f433614b9b1ef795f2a9a7269596f080a3970e 100644 (file)
--- a/src/auth/mech-cram-md5.c
+++ b/src/auth/mech-cram-md5.c
@@ -69,7 +69,7 @@ static bool verify_credentials(struct cram_auth_request *request,
 
        if (!mem_equals_timing_safe(response_hex, request->response, sizeof(digest)*2)) {
                auth_request_log_info(&request->auth_request, AUTH_SUBSYS_MECH,
-                                     "password mismatch");
+                                     AUTH_LOG_MSG_PASSWORD_MISMATCH);
                return FALSE;
        }
 

diff --git a/src/auth/mech-digest-md5.c b/src/auth/mech-digest-md5.c
index c9a6183b57dcd3ebcccf315f0559483a69790979..97a62740b6e39fe5dd91edbd2f37ef44afad247c 100644 (file)
--- a/src/auth/mech-digest-md5.c
+++ b/src/auth/mech-digest-md5.c
@@ -211,7 +211,7 @@ static bool verify_credentials(struct digest_auth_request *request,
                        if (!mem_equals_timing_safe(response_hex, request->response, 32)) {
                                auth_request_log_info(&request->auth_request,
                                                      AUTH_SUBSYS_MECH,
-                                                     "password mismatch");
+                                                     AUTH_LOG_MSG_PASSWORD_MISMATCH);
                                return FALSE;
                        }
                } else {

diff --git a/src/auth/mech-scram-sha1.c b/src/auth/mech-scram-sha1.c
index 374f19ddf1d33a1225630a2ae25e87b42b3c145b..ddf23e2effea436a9d0d06fb91c3c7fc6e4b5bd0 100644 (file)
--- a/src/auth/mech-scram-sha1.c
+++ b/src/auth/mech-scram-sha1.c
@@ -367,7 +367,7 @@ static void mech_scram_sha1_auth_continue(struct auth_request *auth_request,
                                             &error)) {
                        if (!verify_credentials(request)) {
                                auth_request_log_info(auth_request, AUTH_SUBSYS_MECH,
-                                                     "password mismatch");
+                                                     AUTH_LOG_MSG_PASSWORD_MISMATCH);
                        } else {
                                server_final_message =
                                        get_scram_server_final(request);

diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 9555ccdefb2775c15854c5e0da3a883613ad922a..939847f741a1cf8ea6a423856b7e735af9279d12 100644 (file)
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -156,7 +156,7 @@ ldap_auth_bind_callback(struct ldap_connection *conn,
                else if (ret == LDAP_INVALID_CREDENTIALS) {
                        auth_request_log_login_failure(auth_request,
                                                       AUTH_SUBSYS_DB,
-                                                      "Password mismatch (for LDAP bind)");
+                                                      "AUTH_LOG_MSG_PASSWORD_MISMATCH (for LDAP bind)");
                        passdb_result = PASSDB_RESULT_PASSWORD_MISMATCH;
                } else if (ret == LDAP_NO_SUCH_OBJECT) {
                        passdb_result = PASSDB_RESULT_USER_UNKNOWN;

diff --git a/src/auth/passdb-pam.c b/src/auth/passdb-pam.c
index 45c67d45b867ce52e9d55d403e59966747b46178..fe402082f2290449b53df7c2309a2f65f103cefe 100644 (file)
--- a/src/auth/passdb-pam.c
+++ b/src/auth/passdb-pam.c
@@ -171,7 +171,7 @@ static int try_pam_auth(struct auth_request *request, pam_handle_t *pamh,
                        str = t_strdup_printf("%s (%s missing?)", str, path);
                        auth_request_log_error(request, AUTH_SUBSYS_DB, "%s", str);
                } else if (status == PAM_AUTH_ERR) {
-                       str = t_strconcat(str, " (password mismatch?)", NULL);
+                       str = t_strconcat(str, " ("AUTH_LOG_MSG_PASSWORD_MISMATCH"?)", NULL);
                        if (request->set->debug_passwords) {
                                str = t_strconcat(str, " (given password: ",
                                                  request->mech_password,

diff --git a/src/auth/password-scheme.c b/src/auth/password-scheme.c
index 7519d2b36e14b50ad292216d2122ac172641431d..7877d5cf4a01efad6ab7b76fa099def251d6f0ff 100644 (file)
--- a/src/auth/password-scheme.c
+++ b/src/auth/password-scheme.c
@@ -92,7 +92,7 @@ int password_verify(const char *plaintext,
        }
 
        if (ret == 0)
-               *error_r = "Password mismatch";
+               *error_r = AUTH_LOG_MSG_PASSWORD_MISMATCH;
        return ret;
 }
 

diff --git a/src/auth/password-scheme.h b/src/auth/password-scheme.h
index 0b35beb43284f58a49ba5716c2459e9d7304d7e9..8ba2639766a656a6780b391d6d627db4dd5f671c 100644 (file)
--- a/src/auth/password-scheme.h
+++ b/src/auth/password-scheme.h
@@ -1,6 +1,8 @@
 #ifndef PASSWORD_SCHEME_H
 #define PASSWORD_SCHEME_H
 
+#define AUTH_LOG_MSG_PASSWORD_MISMATCH "Password mismatch"
+
 enum password_encoding {
        PW_ENCODING_NONE,
        PW_ENCODING_BASE64,