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

ldap

- use ldb_global_init() instead of the backend specific
  ldb_tdb_init().
(This used to be commit a6c53e5861)

source3/Makefile.in

@@ -789,8 +789,8 @@ LDB_MODULES_OBJ=lib/ldb/modules/operational.o lib/ldb/modules/schema.o lib/ldb/m
           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}
 

source3/configure.in

@@ -3042,6 +3042,9 @@ SMBLDAP=""
 AC_SUBST(SMBLDAP)
 SMBLDAPUTIL=""
 AC_SUBST(SMBLDAPUTIL)
+LDBLDAP=""
+AC_SUBST(LDBLDAP)
+
 if test x"$with_ldap_support" != x"no"; then
 
   ##################################################################
@@ -3111,6 +3114,7 @@ if test x"$with_ldap_support" != x"no"; then
     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)

source3/groupdb/mapping_ldb.c

@@ -53,8 +53,8 @@ static BOOL mapping_upgrade(const char *tdb_path);
 		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");