From 7111645d3c46e55b2c180e3db0ba8a3c670a3c31 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 16 Sep 2008 15:16:31 +0200
Subject: Use single copy of tdb in both samba3 and samba4.

---
 source3/lib/ldb/ldb_tdb/ldb_tdb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/ldb')

diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb.h b/source3/lib/ldb/ldb_tdb/ldb_tdb.h
index 42f3dc2421..486d948fa0 100644
--- a/source3/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source3/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -6,7 +6,7 @@
 #if (_SAMBA_BUILD_ >= 4)
 #include "lib/tdb/include/tdb.h"
 #elif defined(_SAMBA_BUILD_)
-#include "tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
 #else
 #include "tdb.h"
 #endif
-- 
cgit 


From f27774729e8c88615b9d3d25a85cae0a1fc35c4f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 24 Sep 2008 18:52:04 -0700
Subject: s3:lib/ldb: Don't return already freed pointer on error.

metze

Signed-off-by: Karolin Seeger <kseeger@samba.org>
---
 source3/lib/ldb/common/ldb.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/lib/ldb')

diff --git a/source3/lib/ldb/common/ldb.c b/source3/lib/ldb/common/ldb.c
index 743711b967..c8aa6afdfc 100644
--- a/source3/lib/ldb/common/ldb.c
+++ b/source3/lib/ldb/common/ldb.c
@@ -787,6 +787,7 @@ int ldb_search(struct ldb_context *ldb,
 done:
 	if (ret != LDB_SUCCESS) {
 		talloc_free(res);
+		res = NULL;
 	}
 
 	*_res = res;
-- 
cgit 


From ecca199486a30957e7f0dc084d0e21eb3c812c15 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Oct 2008 23:25:12 +0200
Subject: Fix merged build .

---
 source3/lib/ldb/libldb.m4 | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'source3/lib/ldb')

diff --git a/source3/lib/ldb/libldb.m4 b/source3/lib/ldb/libldb.m4
index 845563b4a1..df2075d4e3 100644
--- a/source3/lib/ldb/libldb.m4
+++ b/source3/lib/ldb/libldb.m4
@@ -1,33 +1 @@
 SMB_ENABLE(ldb_sqlite3,$with_sqlite3_support)
-
-AC_MSG_CHECKING([for Python])
-
-PYTHON=
- 
-AC_ARG_WITH(python,
-[  --with-python=PYTHONNAME  build Python libraries],
-[ case "${withval-python}" in
-  yes)
-        PYTHON=python
-        ;;
-  no)
-        PYTHON=
-        ;;
-  *)
-        PYTHON=${withval-python}
-        ;;
-  esac ])
-
-if test x"$PYTHON" != "x"; then
-	incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
-	CPPFLAGS="$CPPFLAGS -I $incdir"
-fi
-
-if test x"$PYTHON" != "x"; then
-	AC_MSG_RESULT([${withval-python}])
-else
-	AC_MSG_RESULT(no)
-	SMB_ENABLE(swig_ldb, NO)
-fi
-
-AC_SUBST(PYTHON)
-- 
cgit