From 7c5f1f28db117e97014f760086464acb0b49c2ee Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 24 Sep 2006 07:11:34 +0000
Subject: 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 a6c53e58616d7731a1df9af33f78ccf0c774296e)
---
 source3/Makefile.in           | 4 ++--
 source3/configure.in          | 4 ++++
 source3/groupdb/mapping_ldb.c | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index cc2c355f1c..f33b80e079 100644
--- a/source3/Makefile.in
+++ b/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}
 
diff --git a/source3/configure.in b/source3/configure.in
index 53b78e9e0e..d88d491b86 100644
--- a/source3/configure.in
+++ b/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)
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index 6368e41a06..bfff98e87f 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/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");
 
-- 
cgit