From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Thu, 3 Oct 2024 13:20:43 +0000 (+0000)
Subject: auth: ldap_parse_scope() - Move to lib-ldap
X-Git-Tag: 2.4.0~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d482f4f8021ff2ae7cd5705da939eed103cc73af;p=thirdparty%2Fdovecot%2Fcore.git

auth: ldap_parse_scope() - Move to lib-ldap
---

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index d6310d6b8e..9a1019b451 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -40,6 +40,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-auth-client \
 	-I$(top_srcdir)/src/lib-test \
 	-I$(top_srcdir)/src/lib-json \
+	-I$(top_srcdir)/src/lib-ldap \
 	-I$(top_srcdir)/src/lib-dict \
 	-I$(top_srcdir)/src/lib-dns \
 	-I$(top_srcdir)/src/lib-http \
diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 0bfeeab041..2b1d7e4c48 100644
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -6,10 +6,9 @@
 #include "db-ldap-settings.h"
 
 /* <settings checks> */
+#include "ldap-settings-parse.h"
 
-#include "ldap.h"
 static bool ldap_setting_check(void *_set, pool_t pool, const char **error_r);
-
 /* </settings checks> */
 
 #undef DEF
@@ -146,19 +145,6 @@ static int ldap_parse_deref(const char *str, int *ref_r)
 	return 0;
 }
 
-static int ldap_parse_scope(const char *str, int *scope_r)
-{
-	if (strcasecmp(str, "base") == 0)
-		*scope_r = LDAP_SCOPE_BASE;
-	else if (strcasecmp(str, "onelevel") == 0)
-		*scope_r = LDAP_SCOPE_ONELEVEL;
-	else if (strcasecmp(str, "subtree") == 0)
-		*scope_r = LDAP_SCOPE_SUBTREE;
-	else
-		return -1;
-	return 0;
-}
-
 static bool ldap_setting_check(void *_set, pool_t pool ATTR_UNUSED,
 			       const char **error_r)
 {
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index ef5819327f..f6323b9120 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-test \
 	-I$(top_srcdir)/src/lib-dns \
+	-I$(top_srcdir)/src/lib-ldap \
 	-I$(top_srcdir)/src/lib-mail \
 	-I$(top_srcdir)/src/lib-http \
 	-I$(top_srcdir)/src/lib-settings \
diff --git a/src/lib-ldap/Makefile.am b/src/lib-ldap/Makefile.am
index 4cc62a8903..d2b688cd95 100644
--- a/src/lib-ldap/Makefile.am
+++ b/src/lib-ldap/Makefile.am
@@ -31,7 +31,8 @@ headers = \
 
 noinst_HEADERS = \
 	ldap-connection-pool.h \
-	ldap-private.h
+	ldap-private.h \
+	ldap-settings-parse.h
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
diff --git a/src/lib-ldap/ldap-settings-parse.h b/src/lib-ldap/ldap-settings-parse.h
new file mode 100644
index 0000000000..5f0a65a174
--- /dev/null
+++ b/src/lib-ldap/ldap-settings-parse.h
@@ -0,0 +1,19 @@
+#ifndef LDAP_SETTINGS_PARSE_H
+#define LDAP_SETTINGS_PARSE_H
+
+#include <ldap.h>
+
+static inline int ldap_parse_scope(const char *str, int *scope_r)
+{
+	if (strcasecmp(str, "base") == 0)
+		*scope_r = LDAP_SCOPE_BASE;
+	else if (strcasecmp(str, "onelevel") == 0)
+		*scope_r = LDAP_SCOPE_ONELEVEL;
+	else if (strcasecmp(str, "subtree") == 0)
+		*scope_r = LDAP_SCOPE_SUBTREE;
+	else
+		return -1;
+	return 0;
+}
+
+#endif