svn commit: samba r18870 - in branches/SAMBA_3_0/source: . groupdb

tridge at samba.org tridge at samba.org
Sun Sep 24 07:11:36 GMT 2006


Author: tridge
Date: 2006-09-24 07:11:34 +0000 (Sun, 24 Sep 2006)
New Revision: 18870

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18870

Log:

- enable the ldb ldap backend properly based on configure tests for
  ldap

- use ldb_global_init() instead of the backend specific
  ldb_tdb_init().

Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/configure.in
   branches/SAMBA_3_0/source/groupdb/mapping_ldb.c


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2006-09-24 03:15:58 UTC (rev 18869)
+++ branches/SAMBA_3_0/source/Makefile.in	2006-09-24 07:11:34 UTC (rev 18870)
@@ -789,8 +789,8 @@
           lib/ldb/modules/objectclass.o \
           lib/ldb/modules/paged_results.o lib/ldb/modules/sort.o lib/ldb/modules/asq.o
 
-# disabled until build issues sorted out
-# LDB_LDAP_OBJ=lib/ldb/ldb_ldap/ldb_ldap.o
+# enabled in configure.in
+LDB_LDAP_OBJ=@LDBLDAP@
 
 LDB_OBJ = ${LDB_COMMON_OBJ} ${LDB_TDB_OBJ} ${LDB_LDAP_OBJ} ${LDB_MODULES_OBJ}
 

Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2006-09-24 03:15:58 UTC (rev 18869)
+++ branches/SAMBA_3_0/source/configure.in	2006-09-24 07:11:34 UTC (rev 18870)
@@ -3042,6 +3042,9 @@
 AC_SUBST(SMBLDAP)
 SMBLDAPUTIL=""
 AC_SUBST(SMBLDAPUTIL)
+LDBLDAP=""
+AC_SUBST(LDBLDAP)
+
 if test x"$with_ldap_support" != x"no"; then
 
   ##################################################################
@@ -3111,6 +3114,7 @@
     default_shared_modules="$default_shared_modules";
     SMBLDAP="lib/smbldap.o"
     SMBLDAPUTIL="lib/smbldap_util.o"
+    LDBLDAP="lib/ldb/ldb_ldap/ldb_ldap.o"
     with_ldap_support=yes
     AC_MSG_CHECKING(whether LDAP support is used)
     AC_MSG_RESULT(yes)

Modified: branches/SAMBA_3_0/source/groupdb/mapping_ldb.c
===================================================================
--- branches/SAMBA_3_0/source/groupdb/mapping_ldb.c	2006-09-24 03:15:58 UTC (rev 18869)
+++ branches/SAMBA_3_0/source/groupdb/mapping_ldb.c	2006-09-24 07:11:34 UTC (rev 18870)
@@ -53,8 +53,8 @@
 		return True;
 	}
 
-	/* this is needed as Samba3 doesn't have the auto init code yet */
-	ldb_tdb_init();
+	/* this is needed as Samba3 doesn't have this globally yet */
+	ldb_global_init();
 
 	db_path = lock_path("group_mapping.ldb");
 



More information about the samba-cvs mailing list