auth: sasl-server - Add sasl_server_request_lookup_credentials()

Wraps auth_request_lookup_credentials().

diff --git a/src/auth/auth-sasl-mech-apop.c b/src/auth/auth-sasl-mech-apop.c
index 75b37720789e40283e5a9a0221719350d5fc4093..1acf6df276c3cc03ffe6ee3e79f26b2367b27f86 100644 (file)
--- a/src/auth/auth-sasl-mech-apop.c
+++ b/src/auth/auth-sasl-mech-apop.c
@@ -142,8 +142,8 @@ mech_apop_auth_initial(struct auth_request *auth_request,
                return;
        }
 
-       auth_request_lookup_credentials(auth_request, "PLAIN",
-                                       apop_credentials_callback);
+       sasl_server_request_lookup_credentials(auth_request, "PLAIN",
+                                              apop_credentials_callback);
 }
 
 static struct auth_request *mech_apop_auth_new(void)

diff --git a/src/auth/sasl-server-mech-cram-md5.c b/src/auth/sasl-server-mech-cram-md5.c
index 7f54695ea10280f9a5a120d5f21528bd67fe6725..e98a8e08059a00eb13168a59dcbdeed4b51cd625 100644 (file)
--- a/src/auth/sasl-server-mech-cram-md5.c
+++ b/src/auth/sasl-server-mech-cram-md5.c
@@ -147,8 +147,8 @@ mech_cram_md5_auth_continue(struct auth_request *auth_request,
                return;
        }
 
-       auth_request_lookup_credentials(auth_request, "CRAM-MD5",
-                                       credentials_callback);
+       sasl_server_request_lookup_credentials(auth_request, "CRAM-MD5",
+                                              credentials_callback);
 }
 
 static void

diff --git a/src/auth/sasl-server-mech-digest-md5.c b/src/auth/sasl-server-mech-digest-md5.c
index 038c93063dc00193345b831b97b6be6d145b54ba..2058e7fa54bd7b98c73824e744a7b700d3214d50 100644 (file)
--- a/src/auth/sasl-server-mech-digest-md5.c
+++ b/src/auth/sasl-server-mech-digest-md5.c
@@ -582,8 +582,8 @@ mech_digest_md5_auth_continue(struct auth_request *auth_request,
                return;
        }
 
-       auth_request_lookup_credentials(auth_request, "DIGEST-MD5",
-                                       credentials_callback);
+       sasl_server_request_lookup_credentials(auth_request, "DIGEST-MD5",
+                                              credentials_callback);
 }
 
 static void

diff --git a/src/auth/sasl-server-mech-gssapi.c b/src/auth/sasl-server-mech-gssapi.c
index ddd63c30e5ddbc4eb3d069c2e29afea03d04d4bf..f6e2daccd11e78553db487f513fd41072a830682 100644 (file)
--- a/src/auth/sasl-server-mech-gssapi.c
+++ b/src/auth/sasl-server-mech-gssapi.c
@@ -602,8 +602,8 @@ mech_gssapi_unwrap(struct gssapi_auth_request *request, gss_buffer_desc inbuf)
        /* Continue in callback once auth_request is populated with passdb
           information. */
        auth_request->passdb_success = TRUE; /* default to success */
-       auth_request_lookup_credentials(auth_request, "",
-                                       gssapi_credentials_callback);
+       sasl_server_request_lookup_credentials(auth_request, "",
+                                              gssapi_credentials_callback);
        (void)gss_release_buffer(&minor_status, &outbuf);
        return 0;
 }

diff --git a/src/auth/sasl-server-mech-otp.c b/src/auth/sasl-server-mech-otp.c
index 7804f0171104f42fe8c45fcc305116892858d463..a8b331df21ac4bd334df5a158dd00f1e8fda76a8 100644 (file)
--- a/src/auth/sasl-server-mech-otp.c
+++ b/src/auth/sasl-server-mech-otp.c
@@ -162,8 +162,8 @@ mech_otp_auth_phase1(struct otp_auth_request *request,
                return;
        }
 
-       auth_request_lookup_credentials(auth_request, "OTP",
-                                       otp_credentials_callback);
+       sasl_server_request_lookup_credentials(auth_request, "OTP",
+                                              otp_credentials_callback);
 }
 
 static void

diff --git a/src/auth/sasl-server-mech-scram.c b/src/auth/sasl-server-mech-scram.c
index e1f31c14357af818025411aa551049d25f7ddcbf..15236e89fd1d18b104f0834c90b6479cc328080d 100644 (file)
--- a/src/auth/sasl-server-mech-scram.c
+++ b/src/auth/sasl-server-mech-scram.c
@@ -113,8 +113,9 @@ mech_scram_credentials_lookup(struct auth_scram_server *asserver,
        struct auth_request *auth_request = &request->auth_request;
 
        request->key_data = key_data;
-       auth_request_lookup_credentials(auth_request, request->password_scheme,
-                                       credentials_callback);
+       sasl_server_request_lookup_credentials(auth_request,
+                                              request->password_scheme,
+                                              credentials_callback);
        return 0;
 }
 

diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index ed9060b48b26036257b55ee5ac1afeedf8eaf664..500c6dc3f06cbe9ac5f21e6fafc073995b6d994f 100644 (file)
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -79,5 +79,8 @@ 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);
+void sasl_server_request_lookup_credentials(
+       struct auth_request *request, const char *scheme,
+       sasl_server_lookup_credentials_callback_t *callback);
 
 #endif

diff --git a/src/auth/sasl-server-request.c b/src/auth/sasl-server-request.c
index 29dc3fc392e520320655484a51c79d2bc241b420..846e1d2a22a061ee64a7e22d9908a56cb6a8f53c 100644 (file)
--- a/src/auth/sasl-server-request.c
+++ b/src/auth/sasl-server-request.c
@@ -70,3 +70,10 @@ void sasl_server_request_verify_plain(
 {
        auth_sasl_request_verify_plain(request, password, callback);
 }
+
+void sasl_server_request_lookup_credentials(
+       struct auth_request *request, const char *scheme,
+       sasl_server_lookup_credentials_callback_t *callback)
+{
+       auth_sasl_request_lookup_credentials(request, scheme, callback);
+}

diff --git a/src/auth/sasl-server.h b/src/auth/sasl-server.h
index 9ad7b83940d55346c53aa56387c5e608779915fb..ee4e388c797952f21a0dcde34513a88b5e51c53d 100644 (file)
--- a/src/auth/sasl-server.h
+++ b/src/auth/sasl-server.h
@@ -30,6 +30,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;
 
 struct sasl_server_output {
        enum sasl_server_output_status status;