Changeset f32d557

Timestamp:

2006-03-24T15:53:29Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

d5dfc3d

Parents:

728a981

Message:

Switch from LDB to LDAP (LDB's authentication subsystem is not mature enough yet)

Files:

• Makefile (modified) (1 diff)
• configure (modified) (6 diffs)
• storage_ldap.c (added)
• storage_ldb.c (deleted)

Makefile

@@ -14 +14 @@
 subdirs = protocols
 
-objects += $(LDB_OBJ)
+objects += $(LDAP_OBJ)
 
 # Expansion of variables

configure

@@ -28 +28 @@
 strip=1
 ipv6=1
-ldb=auto
+ldap=auto
 ssl=auto
 
@@ -65 +65 @@
 --ipv6=0/1      IPv6 socket support                     $ipv6
 
---ldb=0/1/auto  LDB support                             $ldb
+--ldap=0/1/auto LDAP support                            $ldap
 
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
@@ -224 +224 @@
 }
 
-detect_ldb()
+detect_ldap()
 {
         if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG ldb; then
@@ -231 +231 @@
 CFLAGS+=`$PKG_CONFIG --cflags ldb`
 EOF
-                ldb=1
+                ldap=1
                 ret=1
         else
@@ -298 +298 @@
 fi
 
-if [ "$ldb" = "auto" ]; then
-        detect_ldb
-fi
-
-if [ "$ldb" = 0 ]; then
-        echo "LDB_OBJ=\# no ldb" >> Makefile.settings
-        echo "#undef LDB" >> config.h
-elif [ "$ldb" = 1 ]; then
-        echo "#define LDB 1" >> config.h
-        echo "LDB_OBJ=storage_ldb.o" >> Makefile.settings
+if [ "$ldap" = "auto" ]; then
+        detect_ldap
+fi
+
+if [ "$ldap" = 0 ]; then
+        echo "LDAP_OBJ=\# no ldap" >> Makefile.settings
+        echo "#undef LDAP" >> config.h
+elif [ "$ldap" = 1 ]; then
+        echo "#define LDAP 1" >> config.h
+        echo "LDAP_OBJ=storage_ldap.o" >> Makefile.settings
 fi
 
@@ -461 +461 @@
 fi
 
-if [ "$ldb" = "0" ]; then
-        echo "  LDB storage backend disabled."
-else
-        echo "  LDB storage backend enabled."
-fi
+if [ "$ldap" = "0" ]; then
+        echo "  LDAP storage backend disabled."
+else
+        echo "  LDAP storage backend enabled."
+fi