auth: sasl-server - Add sasl_server_request_verify_plain()

Wraps auth_request_verify_plain().

diff --git a/src/auth/sasl-server-mech-external.c b/src/auth/sasl-server-mech-external.c
index 3b32774be9d720c09f6ec611d5fb224de4df1828..1d481a83bf6b6daba9dc6c437894130052110a5f 100644 (file)
--- a/src/auth/sasl-server-mech-external.c
+++ b/src/auth/sasl-server-mech-external.c
@@ -35,7 +35,7 @@ mech_external_auth_continue(struct auth_request *request,
                       "login user: %s", error);
                sasl_server_request_failure(request);
        } else {
-               auth_request_verify_plain(
+               sasl_server_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 d7d3f0106dd4922ce5420126829f144538f36119..bfb095e3b8ee6d4e57d380851e7cf934b038937d 100644 (file)
--- a/src/auth/sasl-server-mech-login.c
+++ b/src/auth/sasl-server-mech-login.c
@@ -31,7 +31,7 @@ mech_login_auth_continue(struct auth_request *request,
                sasl_server_request_output(request, prompt2, strlen(prompt2));
        } else {
                char *pass = p_strndup(unsafe_data_stack_pool, data, data_size);
-               auth_request_verify_plain(
+               sasl_server_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.c b/src/auth/sasl-server-mech-plain.c
index 79b0ad08e3c2b8dc2b33a12183b870f81e951859..53c1a8299b293681471e65d891c98802e1f510e0 100644 (file)
--- a/src/auth/sasl-server-mech-plain.c
+++ b/src/auth/sasl-server-mech-plain.c
@@ -55,7 +55,7 @@ mech_plain_auth_continue(struct auth_request *request,
                       "login user: %s", error);
                sasl_server_request_failure(request);
        } else {
-               auth_request_verify_plain(
+               sasl_server_request_verify_plain(
                        request, pass, sasl_server_mech_plain_verify_callback);
        }
 

diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index 4bfbf5dbe7925356d992fc36d2bab9f5cc036300..ed9060b48b26036257b55ee5ac1afeedf8eaf664 100644 (file)
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -76,4 +76,8 @@ void sasl_server_request_failure_with_reply(struct auth_request *request,
 void sasl_server_request_failure(struct auth_request *request);
 void sasl_server_request_internal_failure(struct auth_request *request);
 
+void sasl_server_request_verify_plain(
+       struct auth_request *request, const char *password,
+       sasl_server_verify_plain_callback_t *callback);
+
 #endif

diff --git a/src/auth/sasl-server-request.c b/src/auth/sasl-server-request.c
index 222cc85690d5812625185c8878a186983e8e564a..29dc3fc392e520320655484a51c79d2bc241b420 100644 (file)
--- a/src/auth/sasl-server-request.c
+++ b/src/auth/sasl-server-request.c
@@ -63,3 +63,10 @@ void sasl_server_request_internal_failure(struct auth_request *request)
                                           SASL_SERVER_OUTPUT_INTERNAL_FAILURE,
                                           "", 0);
 }
+
+void sasl_server_request_verify_plain(
+       struct auth_request *request, const char *password,
+       sasl_server_verify_plain_callback_t *callback)
+{
+       auth_sasl_request_verify_plain(request, password, callback);
+}

diff --git a/src/auth/sasl-server.h b/src/auth/sasl-server.h
index 423ca2ea6a41deb19d1c3e1d58055144f235701c..9ad7b83940d55346c53aa56387c5e608779915fb 100644 (file)
--- a/src/auth/sasl-server.h
+++ b/src/auth/sasl-server.h
@@ -29,6 +29,8 @@ enum sasl_server_output_status {
        SASL_SERVER_OUTPUT_SUCCESS = 1,
 };
 
+typedef verify_plain_callback_t sasl_server_verify_plain_callback_t;
+
 struct sasl_server_output {
        enum sasl_server_output_status status;