auth: ldap_parse_scope() - Move to lib-ldap

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index d6310d6b8ef6467c8756be04b3e23988c724539e..9a1019b451de99b1c3b769815deca5a02e432261 100644 (file)
--- 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 0bfeeab0415a8ca75d8ca7a9816521d8d7aefc94..2b1d7e4c4806fda623c4274b786dfe0873ebc073 100644 (file)
--- 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 ef5819327f2b14073ae339f77a237387deb8d80e..f6323b9120aac76ce95d9f6be74ec7c6de77bd81 100644 (file)
--- 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 4cc62a8903f0100908371cff87ae4a7a05394b8b..d2b688cd9500295939008b31177bb83eef3dd26d 100644 (file)
--- 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 (file)
index 0000000..5f0a65a
--- /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