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 c0af1c27bc08281efa64a74ebcb9f9a4c1c05977..ac71d701584d4d10c1e075b03a4872017e132c40 100644 (file)
--- 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 c6fed2372c284edc3ecc91fbdb747858054707bc..23cac3bd4723112881baa46ccb1b887704548d95 100644 (file)
--- 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 d0ad91dc18a0eb9c6a54e887cfabda78e7a5f52b..f36f94efb2859402cbcd63efc1f4fd8d2e7f62bf 100644 (file)
--- 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 325b8ea724b737166b4cd96e86d2f5f9ebc6e9ce..9c41d436fc2e3980fd1b43143387734f2b59b817 100644 (file)
--- 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 ff769ba34d7622c5a90baaefd762d003e60b7bfa..6dda531bb92feeb2359a1d169cdc936de363b246 100644 (file)
--- 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 */