auth: sasl-server - Add sasl_server_request_success()

Wraps auth_request_success().

diff --git a/src/auth/auth-sasl-mech-apop.c b/src/auth/auth-sasl-mech-apop.c
index ad74b90582aa6a657eaa6b9cf1bf5d61d3b06e63..c1dc95febcf71cdede5e84dcd11d23ef196fceed 100644 (file)
--- a/src/auth/auth-sasl-mech-apop.c
+++ b/src/auth/auth-sasl-mech-apop.c
@@ -53,7 +53,7 @@ apop_credentials_callback(enum passdb_result result,
        switch (result) {
        case PASSDB_RESULT_OK:
                if (verify_credentials(request, credentials, size))
-                       auth_request_success(auth_request, "", 0);
+                       sasl_server_request_success(auth_request, "", 0);
                else
                        auth_request_fail(auth_request);
                break;

diff --git a/src/auth/auth-sasl-mech-dovecot-token.c b/src/auth/auth-sasl-mech-dovecot-token.c
index 2614921f380ddf595ab6ad903aad0e12f0cf9d13..358200d882246a1ae54bf241678f716026df7b29 100644 (file)
--- a/src/auth/auth-sasl-mech-dovecot-token.c
+++ b/src/auth/auth-sasl-mech-dovecot-token.c
@@ -57,7 +57,7 @@ mech_dovecot_token_auth_continue(struct auth_request *request,
                    str_equals_timing_almost_safe(auth_token, valid_token)) {
                        request->passdb_success = TRUE;
                        auth_request_set_field(request, "userdb_client_service", service, "");
-                       auth_request_success(request, NULL, 0);
+                       sasl_server_request_success(request, NULL, 0);
                } else {
                        auth_request_fail(request);
                }

diff --git a/src/auth/sasl-server-mech-anonymous.c b/src/auth/sasl-server-mech-anonymous.c
index e49ac3f2379862b8f07bf1aafc3be51264372a7a..87ee07e3f7dfc58776523e634dc42fc62d98ae7b 100644 (file)
--- a/src/auth/sasl-server-mech-anonymous.c
+++ b/src/auth/sasl-server-mech-anonymous.c
@@ -18,7 +18,7 @@ mech_anonymous_auth_continue(struct auth_request *request,
                                         request->set->anonymous_username);
 
        request->passdb_success = TRUE;
-       auth_request_success(request, "", 0);
+       sasl_server_request_success(request, "", 0);
 }
 
 static struct auth_request *mech_anonymous_auth_new(void)

diff --git a/src/auth/sasl-server-mech-cram-md5.c b/src/auth/sasl-server-mech-cram-md5.c
index 49682fa763839ad2c62b4770ee811156c89350df..2d40123fcab711b17d8bb6949eeedf28dcf7d969 100644 (file)
--- a/src/auth/sasl-server-mech-cram-md5.c
+++ b/src/auth/sasl-server-mech-cram-md5.c
@@ -76,7 +76,7 @@ verify_credentials(struct auth_request *auth_request,
                return;
        }
 
-       auth_request_success(auth_request, "", 0);
+       sasl_server_request_success(auth_request, "", 0);
 }
 
 static bool

diff --git a/src/auth/sasl-server-mech-digest-md5.c b/src/auth/sasl-server-mech-digest-md5.c
index f075f82ed8012b19e895c34e6df1c012feabe1a3..66c2af4e92c8b47730ec5d63f4137617d2f0d1ff 100644 (file)
--- a/src/auth/sasl-server-mech-digest-md5.c
+++ b/src/auth/sasl-server-mech-digest-md5.c
@@ -226,8 +226,8 @@ verify_credentials(struct auth_request *auth_request,
                }
        }
 
-       auth_request_success(auth_request, request->rspauth,
-                            strlen(request->rspauth));
+       sasl_server_request_success(auth_request, request->rspauth,
+                                   strlen(request->rspauth));
 }
 
 static bool parse_next(char **data, char **key, char **value)

diff --git a/src/auth/sasl-server-mech-gssapi.c b/src/auth/sasl-server-mech-gssapi.c
index 3c74fc2ef7b2d5b54a755d171dcf339ee3d0e4bf..7d022243aade02499b878eadb03795295c39368d 100644 (file)
--- a/src/auth/sasl-server-mech-gssapi.c
+++ b/src/auth/sasl-server-mech-gssapi.c
@@ -524,7 +524,7 @@ gssapi_credentials_callback(enum passdb_result result,
        }
 
        if (mech_gssapi_userok(request, auth_request->fields.user) == 0)
-               auth_request_success(auth_request, NULL, 0);
+               sasl_server_request_success(auth_request, NULL, 0);
        else
                auth_request_fail(auth_request);
 }

diff --git a/src/auth/sasl-server-mech-oauth2.c b/src/auth/sasl-server-mech-oauth2.c
index 6a3c762170052c630f370a71b578748a4278edfd..bbdcfe492cde1ac57778a83c1989b7b603f21d71 100644 (file)
--- a/src/auth/sasl-server-mech-oauth2.c
+++ b/src/auth/sasl-server-mech-oauth2.c
@@ -100,7 +100,7 @@ void sasl_server_oauth2_request_succeed(struct auth_request *request)
                container_of(request, struct oauth2_auth_request, request);
 
        i_assert(oauth2_req->verifying_token);
-       auth_request_success(request, "", 0);
+       sasl_server_request_success(request, "", 0);
 }
 
 void sasl_server_oauth2_request_fail(

diff --git a/src/auth/sasl-server-mech-otp.c b/src/auth/sasl-server-mech-otp.c
index 49d2bcca39d5b78edd8b09ad224a5454369354b3..81f839d61c64f4b0b8ee31ffcdd6e38b5077ca50 100644 (file)
--- a/src/auth/sasl-server-mech-otp.c
+++ b/src/auth/sasl-server-mech-otp.c
@@ -174,7 +174,7 @@ otp_set_credentials_callback(bool success, struct auth_request *auth_request)
                             auth_request);
 
        if (success)
-               auth_request_success(auth_request, "", 0);
+               sasl_server_request_success(auth_request, "", 0);
        else {
                auth_request_internal_failure(auth_request);
                otp_unlock(request);

diff --git a/src/auth/sasl-server-mech-plain-common.c b/src/auth/sasl-server-mech-plain-common.c
index f36f94efb2859402cbcd63efc1f4fd8d2e7f62bf..9d2a9bbf2f9828395f25a153ad6b8c4744c1c2b7 100644 (file)
--- a/src/auth/sasl-server-mech-plain-common.c
+++ b/src/auth/sasl-server-mech-plain-common.c
@@ -10,7 +10,7 @@ void sasl_server_mech_plain_verify_callback(enum passdb_result result,
 {
        switch (result) {
        case PASSDB_RESULT_OK:
-               auth_request_success(request, "", 0);
+               sasl_server_request_success(request, "", 0);
                break;
        case PASSDB_RESULT_INTERNAL_FAILURE:
                auth_request_internal_failure(request);

diff --git a/src/auth/sasl-server-mech-scram.c b/src/auth/sasl-server-mech-scram.c
index 10c2fd956c72fe4fae72a39e6fbdce0323aa42cb..da05460f5bf2f1a50f3f2cb00fd582d03d8329ef 100644 (file)
--- a/src/auth/sasl-server-mech-scram.c
+++ b/src/auth/sasl-server-mech-scram.c
@@ -162,7 +162,7 @@ void mech_scram_auth_continue(struct auth_request *auth_request,
                return;
        }
 
-       auth_request_success(auth_request, output, output_len);
+       sasl_server_request_success(auth_request, output, output_len);
 }
 
 struct auth_request *

diff --git a/src/auth/sasl-server-mech-winbind.c b/src/auth/sasl-server-mech-winbind.c
index 9d554a93e558e16477927e7eb9f71c98bf4526d5..7a35af7754dcfba850859dc61cbf61a5c24309cf 100644 (file)
--- a/src/auth/sasl-server-mech-winbind.c
+++ b/src/auth/sasl-server-mech-winbind.c
@@ -266,10 +266,11 @@ do_auth_continue(struct winbind_auth_request *request,
                        buffer_t *buf;
 
                        buf = t_base64_decode_str(token[1]);
-                       auth_request_success(&request->auth_request,
-                                            buf->data, buf->used);
+                       sasl_server_request_success(&request->auth_request,
+                                                   buf->data, buf->used);
                } else {
-                       auth_request_success(&request->auth_request, "", 0);
+                       sasl_server_request_success(&request->auth_request,
+                                                   "", 0);
                }
                return HR_OK;
        } else if (strcmp(token[0], "BH") == 0) {

diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index 616534dae4a1f3baf28ec6c4cbf56ecae91c1af8..2bd3d3ebeb77739971454a6a7a03a350c71e8001 100644 (file)
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -69,5 +69,7 @@ void mech_oauth2_initialize(void);
 
 void sasl_server_request_output(struct auth_request *request,
                                const void *data, size_t data_size);
+void sasl_server_request_success(struct auth_request *request,
+                                const void *data, size_t data_size);
 
 #endif

diff --git a/src/auth/sasl-server-request.c b/src/auth/sasl-server-request.c
index 7d22729f720313a09ffbe39659b441ce65823d0d..6e5efc5ee693f628533df175d252ac652072bc24 100644 (file)
--- a/src/auth/sasl-server-request.c
+++ b/src/auth/sasl-server-request.c
@@ -19,3 +19,14 @@ void sasl_server_request_output(struct auth_request *request,
        };
        auth_sasl_request_output(request, &output);
 }
+
+void sasl_server_request_success(struct auth_request *request,
+                                const void *data, size_t data_size)
+{
+       const struct sasl_server_output output = {
+               .status = SASL_SERVER_OUTPUT_SUCCESS,
+               .data = data,
+               .data_size = data_size,
+       };
+       auth_sasl_request_output(request, &output);
+}