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 cf6a638e321034d2cb16f80bae686047c64acf3b..2614921f380ddf595ab6ad903aad0e12f0cf9d13 100644 (file)
--- 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 cb4c15e7634cdb9a6057001098d307ccb33592aa..e49ac3f2379862b8f07bf1aafc3be51264372a7a 100644 (file)
--- 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 10b5f8ba0b3097107879c696692b4bd9fba0ff0e..c0af1c27bc08281efa64a74ebcb9f9a4c1c05977 100644 (file)
--- 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 498741b0864b19293362f4bf42c9fe956e3e275d..6a3c762170052c630f370a71b578748a4278edfd 100644 (file)
--- 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 208c1074560c8f212df4f10920ca51d8cdbf0e33..1be7bc6f720265c3e77e9ebf0c31af0a840a8b42 100644 (file)
--- 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 29b324539a728dc8861a9fbb09cc34a4fbfdcd8f..ff769ba34d7622c5a90baaefd762d003e60b7bfa 100644 (file)
--- 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 7522e3fe36c663dc386a2aa6e190b620fc80d181..4ab018eb950c1e167100891e03b3e67dc936837f 100644 (file)
--- 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 3327e86fd11da2e5b9bf472952ca3285f2611b8a..ab375ada763ee34595128b0835ad54dfca518c92 100644 (file)
--- 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 8939eb0b17ef4cb979d9209421c662bf457939f6..d3d485f1a71122bb22e35164a7735df90a539ff8 100644 (file)
--- 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 c273bfff548594d4859fe1379b086c4704d5e082..16fec6b9daa0323272d694a739fdaa1d65b7c2ec 100644 (file)
--- 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 *