From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 18 Mar 2023 14:12:14 +0000 (+0100)
Subject: auth: auth-sasl - Add auth_sasl_ prefix to newly copied mechanism code
X-Git-Tag: 2.4.2~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2bbe6284c3057f705bb0bb06d68c40562b4fa4c;p=thirdparty%2Fdovecot%2Fcore.git

auth: auth-sasl - Add auth_sasl_ prefix to newly copied mechanism code

Now the naming conflict is gone and it is added to the build of the auth service.
---

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index dc06918f22..ae952a036a 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -90,6 +90,7 @@ auth_common_sources = \
 	auth-request-fields.c \
 	auth-request-handler.c \
 	auth-request-var-expand.c \
+	auth-sasl.c \
 	auth-settings.c \
 	auth-fields.c \
 	auth-token.c \
@@ -148,6 +149,7 @@ headers = \
 	auth-request-handler.h \
 	auth-request-handler-private.h \
 	auth-request-var-expand.h \
+	auth-sasl.h \
 	auth-settings.h \
 	auth-fields.h \
 	auth-token.h \
diff --git a/src/auth/auth-sasl.c b/src/auth/auth-sasl.c
index 923bad4c9d..9ae6935210 100644
--- a/src/auth/auth-sasl.c
+++ b/src/auth/auth-sasl.c
@@ -9,33 +9,35 @@
  * Mechanisms
  */
 
-struct mech_module_list {
-	struct mech_module_list *next;
+struct auth_sasl_mech_module_list {
+	struct auth_sasl_mech_module_list *next;
 
-	struct mech_module module;
+	struct auth_sasl_mech_module module;
 };
 
-static struct mech_module_list *mech_modules;
+static struct auth_sasl_mech_module_list *auth_sasl_mech_modules;
 
-void mech_register_module(const struct mech_module *module)
+void auth_sasl_mech_register_module(
+	const struct auth_sasl_mech_module *module)
 {
-	struct mech_module_list *list;
+	struct auth_sasl_mech_module_list *list;
 
 	i_assert(strcmp(module->mech_name,
 			t_str_ucase(module->mech_name)) == 0);
 
-	list = i_new(struct mech_module_list, 1);
+	list = i_new(struct auth_sasl_mech_module_list, 1);
 	list->module = *module;
 
-	list->next = mech_modules;
-	mech_modules = list;
+	list->next = auth_sasl_mech_modules;
+	auth_sasl_mech_modules = list;
 }
 
-void mech_unregister_module(const struct mech_module *module)
+void auth_sasl_mech_unregister_module(
+	const struct auth_sasl_mech_module *module)
 {
-	struct mech_module_list **pos, *list;
+	struct auth_sasl_mech_module_list **pos, *list;
 
-	for (pos = &mech_modules; *pos != NULL; pos = &(*pos)->next) {
+	for (pos = &auth_sasl_mech_modules; *pos != NULL; pos = &(*pos)->next) {
 		if (strcmp((*pos)->module.mech_name, module->mech_name) == 0) {
 			list = *pos;
 			*pos = (*pos)->next;
@@ -45,12 +47,13 @@ void mech_unregister_module(const struct mech_module *module)
 	}
 }
 
-const struct mech_module *mech_module_find(const char *name)
+const struct auth_sasl_mech_module *
+auth_sasl_mech_module_find(const char *name)
 {
-	struct mech_module_list *list;
+	struct auth_sasl_mech_module_list *list;
 	name = t_str_ucase(name);
 
-	for (list = mech_modules; list != NULL; list = list->next) {
+	for (list = auth_sasl_mech_modules; list != NULL; list = list->next) {
 		if (strcmp(list->module.mech_name, name) == 0)
 			return &list->module;
 	}
diff --git a/src/auth/auth-sasl.h b/src/auth/auth-sasl.h
index 5c8135da7b..692832a999 100644
--- a/src/auth/auth-sasl.h
+++ b/src/auth/auth-sasl.h
@@ -1,7 +1,7 @@
 #ifndef AUTH_SASL_H
 #define AUTH_SASL_H
 
-struct mech_module {
+struct auth_sasl_mech_module {
 	const char *mech_name;
 };
 
@@ -9,8 +9,11 @@ struct mech_module {
  * Mechanisms
  */
 
-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 auth_sasl_mech_register_module(
+	const struct auth_sasl_mech_module *module);
+void auth_sasl_mech_unregister_module(
+	const struct auth_sasl_mech_module *module);
+const struct auth_sasl_mech_module *
+auth_sasl_mech_module_find(const char *name);
 
 #endif