ldb: make ldb a top level library for Samba 4.0

Signed-off-by: Andrew Tridgell <tridge@samba.org>

156 files changed, 16 insertions, 16 deletions

diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 466ae54d6a7..36e1840cbfa 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -62,7 +62,7 @@ policy:
          pass. Larger commits require discussion on samba-technical
          list and review by the maintainer
 
-files: lib/tevent/py*, lib/talloc/py*, source4/lib/ldb/py*, lib/tdb/py*
+files: lib/tevent/py*, lib/talloc/py*, lib/ldb/py*, lib/tdb/py*
 maintainers:
          Jelmer Vernooij <jelmer@samba.org>
 policy:
diff --git a/buildtools/testwaf.sh b/buildtools/testwaf.sh
index 8b65af2c10a..127e5258910 100755
--- a/buildtools/testwaf.sh
+++ b/buildtools/testwaf.sh
@@ -11,7 +11,7 @@ PREFIX=$HOME/testprefix
 if [ $# -gt 0 ]; then
     tests="$*"
 else
-    tests="lib/replace lib/talloc lib/tevent lib/tdb source4/lib/ldb"
+    tests="lib/replace lib/talloc lib/tevent lib/tdb lib/ldb"
 fi
 
 echo "testing in dirs $tests"
@@ -27,7 +27,7 @@ for d in $tests; do
     make install
     make distcheck
     case $d in
-	"source4/lib/ldb")
+	"lib/ldb")
 	    ldd bin/ldbadd
 	    ;;
 	"lib/replace")
diff --git a/source4/lib/ldb-samba/README b/lib/ldb-samba/README
index 3fa47159ca9..3fa47159ca9 100644
--- a/source4/lib/ldb-samba/README
+++ b/lib/ldb-samba/README
diff --git a/source4/lib/ldb-samba/ldb_ildap.c b/lib/ldb-samba/ldb_ildap.c
index 3c28690bd66..3c28690bd66 100644
--- a/source4/lib/ldb-samba/ldb_ildap.c
+++ b/lib/ldb-samba/ldb_ildap.c
diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
index 66213bf2881..66213bf2881 100644
--- a/source4/lib/ldb-samba/ldb_wrap.c
+++ b/lib/ldb-samba/ldb_wrap.c
diff --git a/source4/lib/ldb-samba/ldb_wrap.h b/lib/ldb-samba/ldb_wrap.h
index aa7ccb3a234..aa7ccb3a234 100644
--- a/source4/lib/ldb-samba/ldb_wrap.h
+++ b/lib/ldb-samba/ldb_wrap.h
diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/lib/ldb-samba/ldif_handlers.c
index af3c4b46e17..af3c4b46e17 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/lib/ldb-samba/ldif_handlers.c
diff --git a/source4/lib/ldb-samba/ldif_handlers.h b/lib/ldb-samba/ldif_handlers.h
index 62903c4a964..62903c4a964 100644
--- a/source4/lib/ldb-samba/ldif_handlers.h
+++ b/lib/ldb-samba/ldif_handlers.h
diff --git a/source4/lib/ldb-samba/pyldb.c b/lib/ldb-samba/pyldb.c
index ff48a3bb040..ff48a3bb040 100644
--- a/source4/lib/ldb-samba/pyldb.c
+++ b/lib/ldb-samba/pyldb.c
diff --git a/source4/lib/ldb-samba/samba_extensions.c b/lib/ldb-samba/samba_extensions.c
index be9f36a5a7d..be9f36a5a7d 100644
--- a/source4/lib/ldb-samba/samba_extensions.c
+++ b/lib/ldb-samba/samba_extensions.c
diff --git a/source4/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build
index 2e1cacba649..2e1cacba649 100644
--- a/source4/lib/ldb-samba/wscript_build
+++ b/lib/ldb-samba/wscript_build
diff --git a/source4/lib/ldb/ABI/ldb-0.9.10.sigs b/lib/ldb/ABI/ldb-0.9.10.sigs
index 012ac65bb78..012ac65bb78 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.10.sigs
+++ b/lib/ldb/ABI/ldb-0.9.10.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.12.sigs b/lib/ldb/ABI/ldb-0.9.12.sigs
index 2206e790fc1..2206e790fc1 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.12.sigs
+++ b/lib/ldb/ABI/ldb-0.9.12.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.15.sigs b/lib/ldb/ABI/ldb-0.9.15.sigs
index 39d2f3eac49..39d2f3eac49 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.15.sigs
+++ b/lib/ldb/ABI/ldb-0.9.15.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.16.sigs b/lib/ldb/ABI/ldb-0.9.16.sigs
index 610a0a4a754..610a0a4a754 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.16.sigs
+++ b/lib/ldb/ABI/ldb-0.9.16.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.17.sigs b/lib/ldb/ABI/ldb-0.9.17.sigs
index d0f56991d2c..d0f56991d2c 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.17.sigs
+++ b/lib/ldb/ABI/ldb-0.9.17.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.18.sigs b/lib/ldb/ABI/ldb-0.9.18.sigs
index 15913c93853..15913c93853 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.18.sigs
+++ b/lib/ldb/ABI/ldb-0.9.18.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.19.sigs b/lib/ldb/ABI/ldb-0.9.19.sigs
index 62738709e4e..62738709e4e 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.19.sigs
+++ b/lib/ldb/ABI/ldb-0.9.19.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.20.sigs b/lib/ldb/ABI/ldb-0.9.20.sigs
index 62738709e4e..62738709e4e 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.20.sigs
+++ b/lib/ldb/ABI/ldb-0.9.20.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.22.sigs b/lib/ldb/ABI/ldb-0.9.22.sigs
index b5a69c14a9b..b5a69c14a9b 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.22.sigs
+++ b/lib/ldb/ABI/ldb-0.9.22.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.23.sigs b/lib/ldb/ABI/ldb-0.9.23.sigs
index 73e5caa896d..73e5caa896d 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.23.sigs
+++ b/lib/ldb/ABI/ldb-0.9.23.sigs
diff --git a/source4/lib/ldb/ABI/ldb-0.9.24.sigs b/lib/ldb/ABI/ldb-0.9.24.sigs
index 5cb32f7c46b..5cb32f7c46b 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.24.sigs
+++ b/lib/ldb/ABI/ldb-0.9.24.sigs
diff --git a/source4/lib/ldb/ABI/ldb-1.0.0.sigs b/lib/ldb/ABI/ldb-1.0.0.sigs
index 5cb32f7c46b..5cb32f7c46b 100644
--- a/source4/lib/ldb/ABI/ldb-1.0.0.sigs
+++ b/lib/ldb/ABI/ldb-1.0.0.sigs
diff --git a/source4/lib/ldb/ABI/ldb-1.0.1.sigs b/lib/ldb/ABI/ldb-1.0.1.sigs
index 5cb32f7c46b..5cb32f7c46b 100644
--- a/source4/lib/ldb/ABI/ldb-1.0.1.sigs
+++ b/lib/ldb/ABI/ldb-1.0.1.sigs
diff --git a/source4/lib/ldb/ABI/ldb-1.0.2.sigs b/lib/ldb/ABI/ldb-1.0.2.sigs
index c13ac873d21..c13ac873d21 100644
--- a/source4/lib/ldb/ABI/ldb-1.0.2.sigs
+++ b/lib/ldb/ABI/ldb-1.0.2.sigs
diff --git a/source4/lib/ldb/ABI/ldb-1.1.0.sigs b/lib/ldb/ABI/ldb-1.1.0.sigs
index 149d4bc0ae8..149d4bc0ae8 100644
--- a/source4/lib/ldb/ABI/ldb-1.1.0.sigs
+++ b/lib/ldb/ABI/ldb-1.1.0.sigs
diff --git a/source4/lib/ldb/ABI/ldb-ildap-0.9.12.sigs b/lib/ldb/ABI/ldb-ildap-0.9.12.sigs
index 46392207599..46392207599 100644
--- a/source4/lib/ldb/ABI/ldb-ildap-0.9.12.sigs
+++ b/lib/ldb/ABI/ldb-ildap-0.9.12.sigs
diff --git a/source4/lib/ldb/ABI/ldb-samba4-0.9.10.sigs b/lib/ldb/ABI/ldb-samba4-0.9.10.sigs
index 7f9dbb5297c..7f9dbb5297c 100644
--- a/source4/lib/ldb/ABI/ldb-samba4-0.9.10.sigs
+++ b/lib/ldb/ABI/ldb-samba4-0.9.10.sigs
diff --git a/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs b/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
index 46392207599..46392207599 100644
--- a/source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
+++ b/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
diff --git a/source4/lib/ldb/Doxyfile b/lib/ldb/Doxyfile
index 07b12b516a8..07b12b516a8 100644
--- a/source4/lib/ldb/Doxyfile
+++ b/lib/ldb/Doxyfile
diff --git a/source4/lib/ldb/Makefile b/lib/ldb/Makefile
index a07b4a71641..5acfcbce58e 100644
--- a/source4/lib/ldb/Makefile
+++ b/lib/ldb/Makefile
@@ -1,6 +1,6 @@
 # simple makefile wrapper to run waf
 
-WAF=WAF_MAKE=1 PATH=buildtools/bin:../../../buildtools/bin:$$PATH waf
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
 
 all:
 	$(WAF) build
diff --git a/source4/lib/ldb/README_gcov.txt b/lib/ldb/README_gcov.txt
index 2abd9378f43..2abd9378f43 100644
--- a/source4/lib/ldb/README_gcov.txt
+++ b/lib/ldb/README_gcov.txt
diff --git a/source4/lib/ldb/common/attrib_handlers.c b/lib/ldb/common/attrib_handlers.c
index 2f4454c7b41..2f4454c7b41 100644
--- a/source4/lib/ldb/common/attrib_handlers.c
+++ b/lib/ldb/common/attrib_handlers.c
diff --git a/source4/lib/ldb/common/ldb.c b/lib/ldb/common/ldb.c
index 433f30b7c19..433f30b7c19 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/lib/ldb/common/ldb.c
diff --git a/source4/lib/ldb/common/ldb_attributes.c b/lib/ldb/common/ldb_attributes.c
index 21a3e6eb93b..21a3e6eb93b 100644
--- a/source4/lib/ldb/common/ldb_attributes.c
+++ b/lib/ldb/common/ldb_attributes.c
diff --git a/source4/lib/ldb/common/ldb_controls.c b/lib/ldb/common/ldb_controls.c
index b3ef2434932..b3ef2434932 100644
--- a/source4/lib/ldb/common/ldb_controls.c
+++ b/lib/ldb/common/ldb_controls.c
diff --git a/source4/lib/ldb/common/ldb_debug.c b/lib/ldb/common/ldb_debug.c
index 6aa58ccf71f..6aa58ccf71f 100644
--- a/source4/lib/ldb/common/ldb_debug.c
+++ b/lib/ldb/common/ldb_debug.c
diff --git a/source4/lib/ldb/common/ldb_dn.c b/lib/ldb/common/ldb_dn.c
index cd9055da928..cd9055da928 100644
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/lib/ldb/common/ldb_dn.c
diff --git a/source4/lib/ldb/common/ldb_ldif.c b/lib/ldb/common/ldb_ldif.c
index 63b797c4f3d..63b797c4f3d 100644
--- a/source4/lib/ldb/common/ldb_ldif.c
+++ b/lib/ldb/common/ldb_ldif.c
diff --git a/source4/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
index a42cf9449d3..a42cf9449d3 100644
--- a/source4/lib/ldb/common/ldb_match.c
+++ b/lib/ldb/common/ldb_match.c
diff --git a/source4/lib/ldb/common/ldb_modules.c b/lib/ldb/common/ldb_modules.c
index 61d1901513a..61d1901513a 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/lib/ldb/common/ldb_modules.c
diff --git a/source4/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c
index 28c414e6b23..28c414e6b23 100644
--- a/source4/lib/ldb/common/ldb_msg.c
+++ b/lib/ldb/common/ldb_msg.c
diff --git a/source4/lib/ldb/common/ldb_options.c b/lib/ldb/common/ldb_options.c
index f07f3935624..f07f3935624 100644
--- a/source4/lib/ldb/common/ldb_options.c
+++ b/lib/ldb/common/ldb_options.c
diff --git a/source4/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
index b4eabf8375c..b4eabf8375c 100644
--- a/source4/lib/ldb/common/ldb_parse.c
+++ b/lib/ldb/common/ldb_parse.c
diff --git a/source4/lib/ldb/common/ldb_utf8.c b/lib/ldb/common/ldb_utf8.c
index 55d8f905d35..55d8f905d35 100644
--- a/source4/lib/ldb/common/ldb_utf8.c
+++ b/lib/ldb/common/ldb_utf8.c
diff --git a/source4/lib/ldb/common/qsort.c b/lib/ldb/common/qsort.c
index 1a0b886b8c2..1a0b886b8c2 100644
--- a/source4/lib/ldb/common/qsort.c
+++ b/lib/ldb/common/qsort.c
diff --git a/source4/lib/ldb/configure b/lib/ldb/configure
index 137a26bcbe0..82146fe109a 100755
--- a/source4/lib/ldb/configure
+++ b/lib/ldb/configure
@@ -2,8 +2,8 @@
 
 PREVPATH=`dirname $0`
 
-if [ -f $PREVPATH/../../../buildtools/bin/waf ]; then
-	WAF=../../../buildtools/bin/waf
+if [ -f $PREVPATH/../../buildtools/bin/waf ]; then
+	WAF=../../buildtools/bin/waf
 elif [ -f $PREVPATH/buildtools/bin/waf ]; then
 	WAF=./buildtools/bin/waf
 else
diff --git a/source4/lib/ldb/docs/builddocs.sh b/lib/ldb/docs/builddocs.sh
index 449dcb26815..449dcb26815 100755
--- a/source4/lib/ldb/docs/builddocs.sh
+++ b/lib/ldb/docs/builddocs.sh
diff --git a/source4/lib/ldb/docs/design.txt b/lib/ldb/docs/design.txt
index 0bb278b5b42..0bb278b5b42 100644
--- a/source4/lib/ldb/docs/design.txt
+++ b/lib/ldb/docs/design.txt
diff --git a/source4/lib/ldb/docs/installdocs.sh b/lib/ldb/docs/installdocs.sh
index 6cc7b74ad51..6cc7b74ad51 100755
--- a/source4/lib/ldb/docs/installdocs.sh
+++ b/lib/ldb/docs/installdocs.sh
diff --git a/source4/lib/ldb/examples.dox b/lib/ldb/examples.dox
index ef4b4f0a400..ef4b4f0a400 100644
--- a/source4/lib/ldb/examples.dox
+++ b/lib/ldb/examples.dox
diff --git a/source4/lib/ldb/examples/ldbreader.c b/lib/ldb/examples/ldbreader.c
index 3496baf4ce2..3496baf4ce2 100644
--- a/source4/lib/ldb/examples/ldbreader.c
+++ b/lib/ldb/examples/ldbreader.c
diff --git a/source4/lib/ldb/examples/ldifreader.c b/lib/ldb/examples/ldifreader.c
index dcd9daf8121..dcd9daf8121 100644
--- a/source4/lib/ldb/examples/ldifreader.c
+++ b/lib/ldb/examples/ldifreader.c
diff --git a/source4/lib/ldb/include/dlinklist.h b/lib/ldb/include/dlinklist.h
index 1c577bb6b90..1c577bb6b90 100644
--- a/source4/lib/ldb/include/dlinklist.h
+++ b/lib/ldb/include/dlinklist.h
diff --git a/source4/lib/ldb/include/ldb.h b/lib/ldb/include/ldb.h
index d745f377b61..d745f377b61 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/lib/ldb/include/ldb.h
diff --git a/source4/lib/ldb/include/ldb_errors.h b/lib/ldb/include/ldb_errors.h
index b247fbe09c4..b247fbe09c4 100644
--- a/source4/lib/ldb/include/ldb_errors.h
+++ b/lib/ldb/include/ldb_errors.h
diff --git a/source4/lib/ldb/include/ldb_handlers.h b/lib/ldb/include/ldb_handlers.h
index 6e71f1fa014..6e71f1fa014 100644
--- a/source4/lib/ldb/include/ldb_handlers.h
+++ b/lib/ldb/include/ldb_handlers.h
diff --git a/source4/lib/ldb/include/ldb_module.h b/lib/ldb/include/ldb_module.h
index 6d6fff251cd..6d6fff251cd 100644
--- a/source4/lib/ldb/include/ldb_module.h
+++ b/lib/ldb/include/ldb_module.h
diff --git a/source4/lib/ldb/include/ldb_private.h b/lib/ldb/include/ldb_private.h
index cafc020e291..cafc020e291 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/lib/ldb/include/ldb_private.h
diff --git a/source4/lib/ldb/ldb.pc.in b/lib/ldb/ldb.pc.in
index aeba17a6775..aeba17a6775 100644
--- a/source4/lib/ldb/ldb.pc.in
+++ b/lib/ldb/ldb.pc.in
diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/lib/ldb/ldb_ldap/ldb_ldap.c
index 7e6ac903c8a..7e6ac903c8a 100644
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/lib/ldb/ldb_ldap/ldb_ldap.c
diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/lib/ldb/ldb_map/ldb_map.c
index d35e5c604fc..d35e5c604fc 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/lib/ldb/ldb_map/ldb_map.c
diff --git a/source4/lib/ldb/ldb_map/ldb_map.h b/lib/ldb/ldb_map/ldb_map.h
index 5db3e02a08a..5db3e02a08a 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.h
+++ b/lib/ldb/ldb_map/ldb_map.h
diff --git a/source4/lib/ldb/ldb_map/ldb_map_inbound.c b/lib/ldb/ldb_map/ldb_map_inbound.c
index b61037222a8..b61037222a8 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_inbound.c
+++ b/lib/ldb/ldb_map/ldb_map_inbound.c
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/lib/ldb/ldb_map/ldb_map_outbound.c
index 2c517a625dc..2c517a625dc 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/lib/ldb/ldb_map/ldb_map_outbound.c
diff --git a/source4/lib/ldb/ldb_map/ldb_map_private.h b/lib/ldb/ldb_map/ldb_map_private.h
index 7faaa997088..7faaa997088 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_private.h
+++ b/lib/ldb/ldb_map/ldb_map_private.h
diff --git a/source4/lib/ldb/ldb_sqlite3/README b/lib/ldb/ldb_sqlite3/README
index 6cda0a77595..6cda0a77595 100644
--- a/source4/lib/ldb/ldb_sqlite3/README
+++ b/lib/ldb/ldb_sqlite3/README
diff --git a/source4/lib/ldb/ldb_sqlite3/base160.c b/lib/ldb/ldb_sqlite3/base160.c
index 7ad39f7c2f5..7ad39f7c2f5 100644
--- a/source4/lib/ldb/ldb_sqlite3/base160.c
+++ b/lib/ldb/ldb_sqlite3/base160.c
diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index 223868a6c0a..223868a6c0a 100644
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
diff --git a/source4/lib/ldb/ldb_sqlite3/schema b/lib/ldb/ldb_sqlite3/schema
index ab7c5cc406f..ab7c5cc406f 100644
--- a/source4/lib/ldb/ldb_sqlite3/schema
+++ b/lib/ldb/ldb_sqlite3/schema
diff --git a/source4/lib/ldb/ldb_sqlite3/trees.ps b/lib/ldb/ldb_sqlite3/trees.ps
index 433a064816c..433a064816c 100644
--- a/source4/lib/ldb/ldb_sqlite3/trees.ps
+++ b/lib/ldb/ldb_sqlite3/trees.ps
diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/lib/ldb/ldb_tdb/ldb_cache.c
index e54ceaaa98a..e54ceaaa98a 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/lib/ldb/ldb_tdb/ldb_cache.c
diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/lib/ldb/ldb_tdb/ldb_index.c
index 24cc93feb94..24cc93feb94 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/lib/ldb/ldb_tdb/ldb_index.c
diff --git a/source4/lib/ldb/ldb_tdb/ldb_pack.c b/lib/ldb/ldb_tdb/ldb_pack.c
index 7c13065aeef..7c13065aeef 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_pack.c
+++ b/lib/ldb/ldb_tdb/ldb_pack.c
diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/lib/ldb/ldb_tdb/ldb_search.c
index 46e2d749984..46e2d749984 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/lib/ldb/ldb_tdb/ldb_search.c
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c
index 0d4be491235..0d4be491235 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/lib/ldb/ldb_tdb/ldb_tdb.c
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/lib/ldb/ldb_tdb/ldb_tdb.h
index 96ad43fbd6c..96ad43fbd6c 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/lib/ldb/ldb_tdb/ldb_tdb.h
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
index 16a037a6c33..16a037a6c33 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
+++ b/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
diff --git a/source4/lib/ldb/mainpage.dox b/lib/ldb/mainpage.dox
index bbd8d9c5025..bbd8d9c5025 100644
--- a/source4/lib/ldb/mainpage.dox
+++ b/lib/ldb/mainpage.dox
diff --git a/source4/lib/ldb/man/ldb.3.xml b/lib/ldb/man/ldb.3.xml
index 19d9a89e102..19d9a89e102 100644
--- a/source4/lib/ldb/man/ldb.3.xml
+++ b/lib/ldb/man/ldb.3.xml
diff --git a/source4/lib/ldb/man/ldbadd.1.xml b/lib/ldb/man/ldbadd.1.xml
index b77b151e2df..b77b151e2df 100644
--- a/source4/lib/ldb/man/ldbadd.1.xml
+++ b/lib/ldb/man/ldbadd.1.xml
diff --git a/source4/lib/ldb/man/ldbdel.1.xml b/lib/ldb/man/ldbdel.1.xml
index 41da3bc9845..41da3bc9845 100644
--- a/source4/lib/ldb/man/ldbdel.1.xml
+++ b/lib/ldb/man/ldbdel.1.xml
diff --git a/source4/lib/ldb/man/ldbedit.1.xml b/lib/ldb/man/ldbedit.1.xml
index a2eec0579c2..a2eec0579c2 100644
--- a/source4/lib/ldb/man/ldbedit.1.xml
+++ b/lib/ldb/man/ldbedit.1.xml
diff --git a/source4/lib/ldb/man/ldbmodify.1.xml b/lib/ldb/man/ldbmodify.1.xml
index 9bb492ab1bb..9bb492ab1bb 100644
--- a/source4/lib/ldb/man/ldbmodify.1.xml
+++ b/lib/ldb/man/ldbmodify.1.xml
diff --git a/source4/lib/ldb/man/ldbrename.1.xml b/lib/ldb/man/ldbrename.1.xml
index 3576bc27bbc..3576bc27bbc 100644
--- a/source4/lib/ldb/man/ldbrename.1.xml
+++ b/lib/ldb/man/ldbrename.1.xml
diff --git a/source4/lib/ldb/man/ldbsearch.1.xml b/lib/ldb/man/ldbsearch.1.xml
index 623a5992e5e..623a5992e5e 100644
--- a/source4/lib/ldb/man/ldbsearch.1.xml
+++ b/lib/ldb/man/ldbsearch.1.xml
diff --git a/source4/lib/ldb/modules/asq.c b/lib/ldb/modules/asq.c
index 7482de826f0..7482de826f0 100644
--- a/source4/lib/ldb/modules/asq.c
+++ b/lib/ldb/modules/asq.c
diff --git a/source4/lib/ldb/modules/paged_results.c b/lib/ldb/modules/paged_results.c
index 2d6c62fd54b..2d6c62fd54b 100644
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/lib/ldb/modules/paged_results.c
diff --git a/source4/lib/ldb/modules/paged_searches.c b/lib/ldb/modules/paged_searches.c
index 68eeb4c76e3..68eeb4c76e3 100644
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/lib/ldb/modules/paged_searches.c
diff --git a/source4/lib/ldb/modules/rdn_name.c b/lib/ldb/modules/rdn_name.c
index 50b63aee133..50b63aee133 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/lib/ldb/modules/rdn_name.c
diff --git a/source4/lib/ldb/modules/skel.c b/lib/ldb/modules/skel.c
index 1ce3ec1df97..1ce3ec1df97 100644
--- a/source4/lib/ldb/modules/skel.c
+++ b/lib/ldb/modules/skel.c
diff --git a/source4/lib/ldb/modules/sort.c b/lib/ldb/modules/sort.c
index c6fce2d96e0..c6fce2d96e0 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/lib/ldb/modules/sort.c
diff --git a/source4/lib/ldb/nssldb/README.txt b/lib/ldb/nssldb/README.txt
index ddba62b3804..ddba62b3804 100644
--- a/source4/lib/ldb/nssldb/README.txt
+++ b/lib/ldb/nssldb/README.txt
diff --git a/source4/lib/ldb/nssldb/ldb-grp.c b/lib/ldb/nssldb/ldb-grp.c
index 5e7556dc735..5e7556dc735 100644
--- a/source4/lib/ldb/nssldb/ldb-grp.c
+++ b/lib/ldb/nssldb/ldb-grp.c
diff --git a/source4/lib/ldb/nssldb/ldb-nss.c b/lib/ldb/nssldb/ldb-nss.c
index 92b0635561e..92b0635561e 100644
--- a/source4/lib/ldb/nssldb/ldb-nss.c
+++ b/lib/ldb/nssldb/ldb-nss.c
diff --git a/source4/lib/ldb/nssldb/ldb-nss.h b/lib/ldb/nssldb/ldb-nss.h
index 583876fea67..583876fea67 100644
--- a/source4/lib/ldb/nssldb/ldb-nss.h
+++ b/lib/ldb/nssldb/ldb-nss.h
diff --git a/source4/lib/ldb/nssldb/ldb-pwd.c b/lib/ldb/nssldb/ldb-pwd.c
index 6ab103a6fed..6ab103a6fed 100644
--- a/source4/lib/ldb/nssldb/ldb-pwd.c
+++ b/lib/ldb/nssldb/ldb-pwd.c
diff --git a/source4/lib/ldb/pyldb-util.pc.in b/lib/ldb/pyldb-util.pc.in
index 348ae8b95d6..348ae8b95d6 100644
--- a/source4/lib/ldb/pyldb-util.pc.in
+++ b/lib/ldb/pyldb-util.pc.in
diff --git a/source4/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index e2a2e7180e1..e2a2e7180e1 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
diff --git a/source4/lib/ldb/pyldb.h b/lib/ldb/pyldb.h
index 04d8ff856c1..04d8ff856c1 100644
--- a/source4/lib/ldb/pyldb.h
+++ b/lib/ldb/pyldb.h
diff --git a/source4/lib/ldb/pyldb_util.c b/lib/ldb/pyldb_util.c
index 79077416be4..79077416be4 100644
--- a/source4/lib/ldb/pyldb_util.c
+++ b/lib/ldb/pyldb_util.c
diff --git a/source4/lib/ldb/tests/init.ldif b/lib/ldb/tests/init.ldif
index 97b4561e378..97b4561e378 100644
--- a/source4/lib/ldb/tests/init.ldif
+++ b/lib/ldb/tests/init.ldif
diff --git a/source4/lib/ldb/tests/init_slapd.sh b/lib/ldb/tests/init_slapd.sh
index cf06acd08b9..cf06acd08b9 100755
--- a/source4/lib/ldb/tests/init_slapd.sh
+++ b/lib/ldb/tests/init_slapd.sh
diff --git a/source4/lib/ldb/tests/kill_slapd.sh b/lib/ldb/tests/kill_slapd.sh
index 91beb108149..91beb108149 100755
--- a/source4/lib/ldb/tests/kill_slapd.sh
+++ b/lib/ldb/tests/kill_slapd.sh
diff --git a/source4/lib/ldb/tests/ldapi_url.sh b/lib/ldb/tests/ldapi_url.sh
index fef6c35f2be..fef6c35f2be 100755
--- a/source4/lib/ldb/tests/ldapi_url.sh
+++ b/lib/ldb/tests/ldapi_url.sh
diff --git a/source4/lib/ldb/tests/photo.ldif b/lib/ldb/tests/photo.ldif
index 95ab065672b..95ab065672b 100644
--- a/source4/lib/ldb/tests/photo.ldif
+++ b/lib/ldb/tests/photo.ldif
diff --git a/source4/lib/ldb/tests/python/api.py b/lib/ldb/tests/python/api.py
index e7658d51ab6..e7658d51ab6 100755
--- a/source4/lib/ldb/tests/python/api.py
+++ b/lib/ldb/tests/python/api.py
diff --git a/source4/lib/ldb/tests/samba4.png b/lib/ldb/tests/samba4.png
index c8096889a67..c8096889a67 100644
--- a/source4/lib/ldb/tests/samba4.png
+++ b/lib/ldb/tests/samba4.png
diff --git a/source4/lib/ldb/tests/sample_module.c b/lib/ldb/tests/sample_module.c
index bee40a5e80f..bee40a5e80f 100644
--- a/source4/lib/ldb/tests/sample_module.c
+++ b/lib/ldb/tests/sample_module.c
diff --git a/source4/lib/ldb/tests/schema-tests/schema-add-test.ldif b/lib/ldb/tests/schema-tests/schema-add-test.ldif
index 472ab48fac9..472ab48fac9 100644
--- a/source4/lib/ldb/tests/schema-tests/schema-add-test.ldif
+++ b/lib/ldb/tests/schema-tests/schema-add-test.ldif
diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif b/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif
index b9767244854..b9767244854 100644
--- a/source4/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif
+++ b/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif
diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif b/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif
index fa193af6832..fa193af6832 100644
--- a/source4/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif
+++ b/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif
diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif b/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif
index 8ab7798f9ce..8ab7798f9ce 100644
--- a/source4/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif
+++ b/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif
diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif b/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif
index cbf0e60bbea..cbf0e60bbea 100644
--- a/source4/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif
+++ b/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif
diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif b/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif
index bc64e9edb61..bc64e9edb61 100644
--- a/source4/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif
+++ b/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif
diff --git a/source4/lib/ldb/tests/schema-tests/schema.ldif b/lib/ldb/tests/schema-tests/schema.ldif
index 4ab1932839b..4ab1932839b 100644
--- a/source4/lib/ldb/tests/schema-tests/schema.ldif
+++ b/lib/ldb/tests/schema-tests/schema.ldif
diff --git a/source4/lib/ldb/tests/slapd.conf b/lib/ldb/tests/slapd.conf
index fa2789d8c17..fa2789d8c17 100644
--- a/source4/lib/ldb/tests/slapd.conf
+++ b/lib/ldb/tests/slapd.conf
diff --git a/source4/lib/ldb/tests/start_slapd.sh b/lib/ldb/tests/start_slapd.sh
index 11679d47a3e..11679d47a3e 100755
--- a/source4/lib/ldb/tests/start_slapd.sh
+++ b/lib/ldb/tests/start_slapd.sh
diff --git a/source4/lib/ldb/tests/test-attribs.ldif b/lib/ldb/tests/test-attribs.ldif
index 79508c4b7bc..79508c4b7bc 100644
--- a/source4/lib/ldb/tests/test-attribs.ldif
+++ b/lib/ldb/tests/test-attribs.ldif
diff --git a/source4/lib/ldb/tests/test-config.ldif b/lib/ldb/tests/test-config.ldif
index 7926a9e3c58..7926a9e3c58 100644
--- a/source4/lib/ldb/tests/test-config.ldif
+++ b/lib/ldb/tests/test-config.ldif
diff --git a/source4/lib/ldb/tests/test-controls.sh b/lib/ldb/tests/test-controls.sh
index 771085ec606..771085ec606 100755
--- a/source4/lib/ldb/tests/test-controls.sh
+++ b/lib/ldb/tests/test-controls.sh
diff --git a/source4/lib/ldb/tests/test-default-config.ldif b/lib/ldb/tests/test-default-config.ldif
index 87b7bcd3cc7..87b7bcd3cc7 100644
--- a/source4/lib/ldb/tests/test-default-config.ldif
+++ b/lib/ldb/tests/test-default-config.ldif
diff --git a/source4/lib/ldb/tests/test-extended.sh b/lib/ldb/tests/test-extended.sh
index 14b988e3f94..14b988e3f94 100755
--- a/source4/lib/ldb/tests/test-extended.sh
+++ b/lib/ldb/tests/test-extended.sh
diff --git a/source4/lib/ldb/tests/test-generic.sh b/lib/ldb/tests/test-generic.sh
index ae9ff7344ad..ae9ff7344ad 100755
--- a/source4/lib/ldb/tests/test-generic.sh
+++ b/lib/ldb/tests/test-generic.sh
diff --git a/source4/lib/ldb/tests/test-index.ldif b/lib/ldb/tests/test-index.ldif
index 268173641d1..268173641d1 100644
--- a/source4/lib/ldb/tests/test-index.ldif
+++ b/lib/ldb/tests/test-index.ldif
diff --git a/source4/lib/ldb/tests/test-ldap.sh b/lib/ldb/tests/test-ldap.sh
index 14cfb5f9793..14cfb5f9793 100755
--- a/source4/lib/ldb/tests/test-ldap.sh
+++ b/lib/ldb/tests/test-ldap.sh
diff --git a/source4/lib/ldb/tests/test-modify-modrdn.ldif b/lib/ldb/tests/test-modify-modrdn.ldif
index efa31494626..efa31494626 100644
--- a/source4/lib/ldb/tests/test-modify-modrdn.ldif
+++ b/lib/ldb/tests/test-modify-modrdn.ldif
diff --git a/source4/lib/ldb/tests/test-modify.ldif b/lib/ldb/tests/test-modify.ldif
index e5b9ca40861..e5b9ca40861 100644
--- a/source4/lib/ldb/tests/test-modify.ldif
+++ b/lib/ldb/tests/test-modify.ldif
diff --git a/source4/lib/ldb/tests/test-schema.sh b/lib/ldb/tests/test-schema.sh
index 97841844db8..97841844db8 100755
--- a/source4/lib/ldb/tests/test-schema.sh
+++ b/lib/ldb/tests/test-schema.sh
diff --git a/source4/lib/ldb/tests/test-soloading.sh b/lib/ldb/tests/test-soloading.sh
index da6d57541e5..da6d57541e5 100755
--- a/source4/lib/ldb/tests/test-soloading.sh
+++ b/lib/ldb/tests/test-soloading.sh
diff --git a/source4/lib/ldb/tests/test-sqlite3.sh b/lib/ldb/tests/test-sqlite3.sh
index 0cef318d98a..0cef318d98a 100755
--- a/source4/lib/ldb/tests/test-sqlite3.sh
+++ b/lib/ldb/tests/test-sqlite3.sh
diff --git a/source4/lib/ldb/tests/test-tdb-features.sh b/lib/ldb/tests/test-tdb-features.sh
index d4248366cac..d4248366cac 100644
--- a/source4/lib/ldb/tests/test-tdb-features.sh
+++ b/lib/ldb/tests/test-tdb-features.sh
diff --git a/source4/lib/ldb/tests/test-tdb.sh b/lib/ldb/tests/test-tdb.sh
index 9da1e57060a..9da1e57060a 100755
--- a/source4/lib/ldb/tests/test-tdb.sh
+++ b/lib/ldb/tests/test-tdb.sh
diff --git a/source4/lib/ldb/tests/test-wildcard.ldif b/lib/ldb/tests/test-wildcard.ldif
index 222512eeabd..222512eeabd 100644
--- a/source4/lib/ldb/tests/test-wildcard.ldif
+++ b/lib/ldb/tests/test-wildcard.ldif
diff --git a/source4/lib/ldb/tests/test-wrong_attributes.ldif b/lib/ldb/tests/test-wrong_attributes.ldif
index 27f45f0e562..27f45f0e562 100644
--- a/source4/lib/ldb/tests/test-wrong_attributes.ldif
+++ b/lib/ldb/tests/test-wrong_attributes.ldif
diff --git a/source4/lib/ldb/tests/test.ldif b/lib/ldb/tests/test.ldif
index fd37f0037e5..fd37f0037e5 100644
--- a/source4/lib/ldb/tests/test.ldif
+++ b/lib/ldb/tests/test.ldif
diff --git a/source4/lib/ldb/tests/testdata.txt b/lib/ldb/tests/testdata.txt
index dadb9f0f98e..dadb9f0f98e 100644
--- a/source4/lib/ldb/tests/testdata.txt
+++ b/lib/ldb/tests/testdata.txt
diff --git a/source4/lib/ldb/tests/testsearch.txt b/lib/ldb/tests/testsearch.txt
index c5738639b7f..c5738639b7f 100644
--- a/source4/lib/ldb/tests/testsearch.txt
+++ b/lib/ldb/tests/testsearch.txt
diff --git a/source4/lib/ldb/tools/cmdline.c b/lib/ldb/tools/cmdline.c
index a06445fc0f4..a06445fc0f4 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/lib/ldb/tools/cmdline.c
diff --git a/source4/lib/ldb/tools/cmdline.h b/lib/ldb/tools/cmdline.h
index 416bf51d228..416bf51d228 100644
--- a/source4/lib/ldb/tools/cmdline.h
+++ b/lib/ldb/tools/cmdline.h
diff --git a/source4/lib/ldb/tools/ldbadd.c b/lib/ldb/tools/ldbadd.c
index 47fd2618416..47fd2618416 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/lib/ldb/tools/ldbadd.c
diff --git a/source4/lib/ldb/tools/ldbdel.c b/lib/ldb/tools/ldbdel.c
index 8036d09a70d..8036d09a70d 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/lib/ldb/tools/ldbdel.c
diff --git a/source4/lib/ldb/tools/ldbedit.c b/lib/ldb/tools/ldbedit.c
index aaf6d80352d..aaf6d80352d 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/lib/ldb/tools/ldbedit.c
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/lib/ldb/tools/ldbmodify.c
index 2ca7b62b2c3..2ca7b62b2c3 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/lib/ldb/tools/ldbmodify.c
diff --git a/source4/lib/ldb/tools/ldbrename.c b/lib/ldb/tools/ldbrename.c
index 9bbd1f06b1a..9bbd1f06b1a 100644
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/lib/ldb/tools/ldbrename.c
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/lib/ldb/tools/ldbsearch.c
index d10b9650daf..d10b9650daf 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/lib/ldb/tools/ldbsearch.c
diff --git a/source4/lib/ldb/tools/ldbtest.c b/lib/ldb/tools/ldbtest.c
index 4e181af9d55..4e181af9d55 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/lib/ldb/tools/ldbtest.c
diff --git a/source4/lib/ldb/tools/ldbutil.c b/lib/ldb/tools/ldbutil.c
index 26f252704c1..26f252704c1 100644
--- a/source4/lib/ldb/tools/ldbutil.c
+++ b/lib/ldb/tools/ldbutil.c
diff --git a/source4/lib/ldb/tools/ldbutil.h b/lib/ldb/tools/ldbutil.h
index f8d3f3a2106..f8d3f3a2106 100644
--- a/source4/lib/ldb/tools/ldbutil.h
+++ b/lib/ldb/tools/ldbutil.h
diff --git a/source4/lib/ldb/web/index.html b/lib/ldb/web/index.html
index 7f50cdc63ad..7f50cdc63ad 100644
--- a/source4/lib/ldb/web/index.html
+++ b/lib/ldb/web/index.html
diff --git a/source4/lib/ldb/wscript b/lib/ldb/wscript
index 7de95494c71..f1845546650 100755
--- a/source4/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -15,7 +15,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
 import wafsamba, samba_dist, Options
 
-samba_dist.DIST_DIRS('''source4/lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
+samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
                         lib/tdb:lib/tdb lib/tdb2:lib/tdb2 lib/tdb_compat:lib/tdb_compat lib/ccan:lib/ccan lib/tevent:lib/tevent lib/popt:lib/popt
                         buildtools:buildtools''')
 
diff --git a/script/autobuild.py b/script/autobuild.py
index 545e47ed489..3a8c0f81f05 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -18,7 +18,7 @@ builddirs = {
     "samba3"  : "source3",
     "samba3-waf": "source3",
     "samba4"  : ".",
-    "ldb"     : "source4/lib/ldb",
+    "ldb"     : "lib/ldb",
     "tdb"     : "lib/tdb",
     "talloc"  : "lib/talloc",
     "replace" : "lib/replace",
@@ -59,7 +59,7 @@ tasks = {
               ("make", "make -j", "text/plain"),
               ("install", "make install", "text/plain"),
               ("test", "TDB_NO_FSYNC=1 make test", "text/plain"),
-              ("check-clean-tree", "../../../script/clean-source-tree.sh", "text/plain"),
+              ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
               ("distcheck", "make distcheck", "text/plain"),
               ("clean", "make clean", "text/plain") ],
 
diff --git a/script/land.py b/script/land.py
index f8ae7b4493d..72bdd4b8408 100755
--- a/script/land.py
+++ b/script/land.py
@@ -41,7 +41,7 @@ tasks = {
                   ("install", "make install", "text/plain"),
                   ("test", "TDB_NO_FSYNC=1 make subunit-test", "text/x-subunit") ],
 
-    "source4/lib/ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+    "lib/ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
                           ("make", "make -j", "text/plain"),
                           ("install", "make install", "text/plain"),
                           ("test", "make test", "text/plain") ],
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 1ffc8cd74a3..518c28452b4 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -93,7 +93,7 @@ for options in ['-U"$USERNAME%$PASSWORD"']:
 for t in smb4torture_testsuites("ldap."):
     plansmbtorturetestsuite(t, "dc", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
 
-ldbdir = os.path.join(samba4srcdir, "lib/ldb")
+ldbdir = os.path.join(srcdir(), "lib/ldb")
 # Don't run LDB tests when using system ldb, as we won't have ldbtest installed
 if os.path.exists(os.path.join(samba4bindir, "ldbtest")):
     plantestsuite("ldb.base", "none", "%s/tests/test-tdb.sh" % ldbdir,
@@ -377,7 +377,7 @@ def plansambapythontestsuite(name, env, path, module, environ={}, extra_args=[])
     plantestsuite(name, env, args)
 
 
-plansambapythontestsuite("ldb.python", "none", "%s/lib/ldb/tests/python/" % samba4srcdir, 'api')
+plansambapythontestsuite("ldb.python", "none", "%s/lib/ldb/tests/python/" % srcdir(), 'api')
 planpythontestsuite("none", "samba.tests.credentials")
 plantestsuite_idlist("samba.tests.gensec", "dc:local", [subunitrun, "$LISTOPT", '-U"$USERNAME%$PASSWORD"', "samba.tests.gensec"])
 planpythontestsuite("none", "samba.tests.registry")
diff --git a/wscript b/wscript
index a4fb4700872..32c1c80f73a 100755
--- a/wscript
+++ b/wscript
@@ -23,7 +23,7 @@ def set_options(opt):
     opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('lib/replace')
     opt.RECURSE('dynconfig')
-    opt.RECURSE('source4/lib/ldb')
+    opt.RECURSE('lib/ldb')
     opt.RECURSE('selftest')
     opt.RECURSE('source4/lib/tls')
     opt.RECURSE('lib/nss_wrapper')
@@ -80,7 +80,7 @@ def configure(conf):
         raise Utils.WafError('Python version 3.x is not supported by Samba yet')
 
     conf.RECURSE('dynconfig')
-    conf.RECURSE('source4/lib/ldb')
+    conf.RECURSE('lib/ldb')
     conf.RECURSE('source4/heimdal_build')
     conf.RECURSE('source4/lib/tls')
     conf.RECURSE('source4/ntvfs/sysdep')
diff --git a/wscript_build b/wscript_build
index aa37c4bbc70..a7718385ffa 100644
--- a/wscript_build
+++ b/wscript_build
@@ -38,7 +38,7 @@ bld.RECURSE('lib/talloc')
 bld.RECURSE('lib/tevent')
 bld.RECURSE('lib/ccan')
 bld.RECURSE('lib/tdb_compat')
-bld.RECURSE('source4/lib/ldb')
+bld.RECURSE('lib/ldb')
 bld.RECURSE('dynconfig')
 bld.RECURSE('lib/util/charset')
 bld.RECURSE('source4/scripting/python')
@@ -57,7 +57,7 @@ bld.RECURSE('nsswitch')
 bld.RECURSE('nsswitch/libwbclient')
 bld.RECURSE('source4/lib/samba3')
 bld.RECURSE('source4/lib/socket')
-bld.RECURSE('source4/lib/ldb-samba')
+bld.RECURSE('lib/ldb-samba')
 bld.RECURSE('source4/lib/tls')
 bld.RECURSE('source4/lib/registry')
 bld.RECURSE('source4/lib/messaging')