auth: sasl-server - Add sasl_server_request_set_credentials()

Wraps auth_request_set_credentials().

diff --git a/src/auth/sasl-server-mech-otp.c b/src/auth/sasl-server-mech-otp.c
index a8b331df21ac4bd334df5a158dd00f1e8fda76a8..2e179c3c28733abeff951c2d3ed9fd82179a5166 100644 (file)
--- a/src/auth/sasl-server-mech-otp.c
+++ b/src/auth/sasl-server-mech-otp.c
@@ -210,9 +210,9 @@ mech_otp_verify(struct otp_auth_request *request, const char *data, bool hex)
 
        memcpy(state->hash, hash, sizeof(state->hash));
 
-       auth_request_set_credentials(auth_request, "OTP",
-                                    otp_print_dbentry(state),
-                                    otp_set_credentials_callback);
+       sasl_server_request_set_credentials(auth_request, "OTP",
+                                           otp_print_dbentry(state),
+                                           otp_set_credentials_callback);
 }
 
 static void
@@ -243,9 +243,9 @@ mech_otp_verify_init(struct otp_auth_request *request, const char *data,
                return;
        }
 
-       auth_request_set_credentials(auth_request, "OTP",
-                                    otp_print_dbentry(&new_state),
-                                    otp_set_credentials_callback);
+       sasl_server_request_set_credentials(auth_request, "OTP",
+                                           otp_print_dbentry(&new_state),
+                                           otp_set_credentials_callback);
 }
 
 static void

diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index 500c6dc3f06cbe9ac5f21e6fafc073995b6d994f..0ea486de33b6ff81d2bfd26b4c1ae40900a52735 100644 (file)
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -82,5 +82,8 @@ void sasl_server_request_verify_plain(
 void sasl_server_request_lookup_credentials(
        struct auth_request *request, const char *scheme,
        sasl_server_lookup_credentials_callback_t *callback);
+void sasl_server_request_set_credentials(
+       struct auth_request *request, const char *scheme, const char *data,
+       sasl_server_set_credentials_callback_t *callback);
 
 #endif

diff --git a/src/auth/sasl-server-request.c b/src/auth/sasl-server-request.c
index 846e1d2a22a061ee64a7e22d9908a56cb6a8f53c..c982c72e82010732f6b93331f21d4a997f1e8f56 100644 (file)
--- a/src/auth/sasl-server-request.c
+++ b/src/auth/sasl-server-request.c
@@ -77,3 +77,10 @@ void sasl_server_request_lookup_credentials(
 {
        auth_sasl_request_lookup_credentials(request, scheme, callback);
 }
+
+void sasl_server_request_set_credentials(
+       struct auth_request *request, const char *scheme, const char *data,
+       sasl_server_set_credentials_callback_t *callback)
+{
+       auth_sasl_request_set_credentials(request, scheme, data, callback);
+}

diff --git a/src/auth/sasl-server.h b/src/auth/sasl-server.h
index ee4e388c797952f21a0dcde34513a88b5e51c53d..0c153fe4a485e9549504fe661703fe6ab7ccd8f8 100644 (file)
--- a/src/auth/sasl-server.h
+++ b/src/auth/sasl-server.h
@@ -31,6 +31,7 @@ enum sasl_server_output_status {
 
 typedef verify_plain_callback_t sasl_server_verify_plain_callback_t;
 typedef lookup_credentials_callback_t sasl_server_lookup_credentials_callback_t;
+typedef set_credentials_callback_t sasl_server_set_credentials_callback_t;
 
 struct sasl_server_output {
        enum sasl_server_output_status status;