From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 22 Mar 2023 16:20:24 +0000 (+0100)
Subject: auth: sasl-server - Add sasl_server_mech prefix to plain_verify_callback()
X-Git-Tag: 2.4.2~286
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64e3452ab0877818514cd2d2ed8f0e2bbd445b8a;p=thirdparty%2Fdovecot%2Fcore.git

auth: sasl-server - Add sasl_server_mech prefix to plain_verify_callback()
---

diff --git a/src/auth/sasl-server-mech-external.c b/src/auth/sasl-server-mech-external.c
index c0af1c27bc..ac71d70158 100644
--- a/src/auth/sasl-server-mech-external.c
+++ b/src/auth/sasl-server-mech-external.c
@@ -35,8 +35,8 @@ mech_external_auth_continue(struct auth_request *request,
 		       "login user: %s", error);
 		auth_request_fail(request);
 	} else {
-		auth_request_verify_plain(request, "",
-					  plain_verify_callback);
+		auth_request_verify_plain(
+			request, "", sasl_server_mech_plain_verify_callback);
 	}
 }
 
diff --git a/src/auth/sasl-server-mech-login.c b/src/auth/sasl-server-mech-login.c
index c6fed2372c..23cac3bd47 100644
--- a/src/auth/sasl-server-mech-login.c
+++ b/src/auth/sasl-server-mech-login.c
@@ -32,7 +32,8 @@ mech_login_auth_continue(struct auth_request *request,
 						    strlen(prompt2));
 	} else {
 		char *pass = p_strndup(unsafe_data_stack_pool, data, data_size);
-		auth_request_verify_plain(request, pass, plain_verify_callback);
+		auth_request_verify_plain(
+			request, pass, sasl_server_mech_plain_verify_callback);
 		safe_memset(pass, 0, strlen(pass));
 	}
 }
diff --git a/src/auth/sasl-server-mech-plain-common.c b/src/auth/sasl-server-mech-plain-common.c
index d0ad91dc18..f36f94efb2 100644
--- a/src/auth/sasl-server-mech-plain-common.c
+++ b/src/auth/sasl-server-mech-plain-common.c
@@ -5,8 +5,8 @@
 #include "sasl-server-protected.h"
 #include "sasl-server-mech-plain-common.h"
 
-void plain_verify_callback(enum passdb_result result,
-			   struct auth_request *request)
+void sasl_server_mech_plain_verify_callback(enum passdb_result result,
+					    struct auth_request *request)
 {
 	switch (result) {
 	case PASSDB_RESULT_OK:
diff --git a/src/auth/sasl-server-mech-plain-common.h b/src/auth/sasl-server-mech-plain-common.h
index 325b8ea724..9c41d436fc 100644
--- a/src/auth/sasl-server-mech-plain-common.h
+++ b/src/auth/sasl-server-mech-plain-common.h
@@ -1,7 +1,7 @@
 #ifndef SASL_SERVER_MECH_PLAIN_COMMON_H
 #define SASL_SERVER_MECH_PLAIN_COMMON_H
 
-void plain_verify_callback(enum passdb_result result,
-			   struct auth_request *request);
+void sasl_server_mech_plain_verify_callback(enum passdb_result result,
+					    struct auth_request *request);
 
 #endif
diff --git a/src/auth/sasl-server-mech-plain.c b/src/auth/sasl-server-mech-plain.c
index ff769ba34d..6dda531bb9 100644
--- a/src/auth/sasl-server-mech-plain.c
+++ b/src/auth/sasl-server-mech-plain.c
@@ -55,8 +55,8 @@ mech_plain_auth_continue(struct auth_request *request,
 		       "login user: %s", error);
 		auth_request_fail(request);
 	} else {
-		auth_request_verify_plain(request, pass,
-					  plain_verify_callback);
+		auth_request_verify_plain(
+			request, pass, sasl_server_mech_plain_verify_callback);
 	}
 
 	/* make sure it's cleared */