From: Stephan Bosch Date: Mon, 6 Mar 2023 21:39:22 +0000 (+0100) Subject: auth: sasl-server - Add sasl_server_ prefix to mech_generic_auth_initial() X-Git-Tag: 2.4.2~287 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b61a4f0cc64585086b5f105d1a7e30e967fc068;p=thirdparty%2Fdovecot%2Fcore.git auth: sasl-server - Add sasl_server_ prefix to mech_generic_auth_initial() --- diff --git a/src/auth/auth-sasl-mech-dovecot-token.c b/src/auth/auth-sasl-mech-dovecot-token.c index cf6a638e32..2614921f38 100644 --- a/src/auth/auth-sasl-mech-dovecot-token.c +++ b/src/auth/auth-sasl-mech-dovecot-token.c @@ -86,7 +86,7 @@ const struct mech_module mech_dovecot_token = { .passdb_need = MECH_PASSDB_NEED_NOTHING, .auth_new = mech_dovecot_token_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_dovecot_token_auth_continue, .auth_free = sasl_server_mech_generic_auth_free, }; diff --git a/src/auth/sasl-server-mech-anonymous.c b/src/auth/sasl-server-mech-anonymous.c index cb4c15e763..e49ac3f237 100644 --- a/src/auth/sasl-server-mech-anonymous.c +++ b/src/auth/sasl-server-mech-anonymous.c @@ -39,7 +39,7 @@ const struct mech_module mech_anonymous = { .passdb_need = MECH_PASSDB_NEED_NOTHING, .auth_new = mech_anonymous_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_anonymous_auth_continue, .auth_free = sasl_server_mech_generic_auth_free, }; diff --git a/src/auth/sasl-server-mech-external.c b/src/auth/sasl-server-mech-external.c index 10b5f8ba0b..c0af1c27bc 100644 --- a/src/auth/sasl-server-mech-external.c +++ b/src/auth/sasl-server-mech-external.c @@ -58,7 +58,7 @@ const struct mech_module mech_external = { .passdb_need = MECH_PASSDB_NEED_VERIFY_PLAIN, .auth_new = mech_external_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_external_auth_continue, .auth_free = sasl_server_mech_generic_auth_free, }; diff --git a/src/auth/sasl-server-mech-oauth2.c b/src/auth/sasl-server-mech-oauth2.c index 498741b086..6a3c762170 100644 --- a/src/auth/sasl-server-mech-oauth2.c +++ b/src/auth/sasl-server-mech-oauth2.c @@ -313,7 +313,7 @@ const struct mech_module mech_oauthbearer = { .passdb_need = 0, .auth_new = mech_oauth2_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_oauthbearer_auth_continue, .auth_free = sasl_server_mech_generic_auth_free, }; @@ -325,7 +325,7 @@ const struct mech_module mech_xoauth2 = { .passdb_need = 0, .auth_new = mech_oauth2_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_xoauth2_auth_continue, .auth_free = sasl_server_mech_generic_auth_free, }; diff --git a/src/auth/sasl-server-mech-otp.c b/src/auth/sasl-server-mech-otp.c index 208c107456..1be7bc6f72 100644 --- a/src/auth/sasl-server-mech-otp.c +++ b/src/auth/sasl-server-mech-otp.c @@ -324,7 +324,7 @@ const struct mech_module mech_otp = { .passdb_need = MECH_PASSDB_NEED_SET_CREDENTIALS, .auth_new = mech_otp_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_otp_auth_continue, .auth_free = mech_otp_auth_free, }; diff --git a/src/auth/sasl-server-mech-plain.c b/src/auth/sasl-server-mech-plain.c index 29b324539a..ff769ba34d 100644 --- a/src/auth/sasl-server-mech-plain.c +++ b/src/auth/sasl-server-mech-plain.c @@ -82,7 +82,7 @@ const struct mech_module mech_plain = { .passdb_need = MECH_PASSDB_NEED_VERIFY_PLAIN, .auth_new = mech_plain_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_plain_auth_continue, .auth_free = sasl_server_mech_generic_auth_free, }; diff --git a/src/auth/sasl-server-mech-scram.c b/src/auth/sasl-server-mech-scram.c index 7522e3fe36..4ab018eb95 100644 --- a/src/auth/sasl-server-mech-scram.c +++ b/src/auth/sasl-server-mech-scram.c @@ -232,7 +232,7 @@ const struct mech_module mech_scram_sha1 = { .passdb_need = MECH_PASSDB_NEED_LOOKUP_CREDENTIALS, .auth_new = mech_scram_sha1_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_scram_auth_continue, .auth_free = mech_scram_auth_free, }; @@ -244,7 +244,7 @@ const struct mech_module mech_scram_sha1_plus = { .passdb_need = MECH_PASSDB_NEED_LOOKUP_CREDENTIALS, .auth_new = mech_scram_sha1_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_scram_auth_continue, .auth_free = mech_scram_auth_free, }; @@ -256,7 +256,7 @@ const struct mech_module mech_scram_sha256 = { .passdb_need = MECH_PASSDB_NEED_LOOKUP_CREDENTIALS, .auth_new = mech_scram_sha256_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_scram_auth_continue, .auth_free = mech_scram_auth_free, }; @@ -268,7 +268,7 @@ const struct mech_module mech_scram_sha256_plus = { .passdb_need = MECH_PASSDB_NEED_LOOKUP_CREDENTIALS, .auth_new = mech_scram_sha256_auth_new, - .auth_initial = mech_generic_auth_initial, + .auth_initial = sasl_server_mech_generic_auth_initial, .auth_continue = mech_scram_auth_continue, .auth_free = mech_scram_auth_free, }; diff --git a/src/auth/sasl-server-mech-winbind.c b/src/auth/sasl-server-mech-winbind.c index 3327e86fd1..ab375ada76 100644 --- a/src/auth/sasl-server-mech-winbind.c +++ b/src/auth/sasl-server-mech-winbind.c @@ -295,7 +295,7 @@ mech_winbind_auth_initial(struct auth_request *auth_request, winbind_helper_connect(auth_request->set, request->winbind, auth_request->event); - mech_generic_auth_initial(auth_request, data, data_size); + sasl_server_mech_generic_auth_initial(auth_request, data, data_size); } static void diff --git a/src/auth/sasl-server-mech.c b/src/auth/sasl-server-mech.c index 8939eb0b17..d3d485f1a7 100644 --- a/src/auth/sasl-server-mech.c +++ b/src/auth/sasl-server-mech.c @@ -4,8 +4,9 @@ #include "sasl-server-private.h" -void mech_generic_auth_initial(struct auth_request *request, - const unsigned char *data, size_t data_size) +void sasl_server_mech_generic_auth_initial(struct auth_request *request, + const unsigned char *data, + size_t data_size) { if (data == NULL) { auth_request_handler_reply_continue(request, uchar_empty_ptr, 0); diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h index c273bfff54..16fec6b9da 100644 --- a/src/auth/sasl-server-protected.h +++ b/src/auth/sasl-server-protected.h @@ -47,8 +47,9 @@ void mech_register_module(const struct mech_module *module); void mech_unregister_module(const struct mech_module *module); const struct mech_module *mech_module_find(const char *name); -void mech_generic_auth_initial(struct auth_request *request, - const unsigned char *data, size_t data_size); +void sasl_server_mech_generic_auth_initial(struct auth_request *request, + const unsigned char *data, + size_t data_size); void sasl_server_mech_generic_auth_free(struct auth_request *request); struct mechanisms_register *