ldb: make ldb a top level library for Samba 4.0
authorAndrew Bartlett <abartlet@samba.org>
Tue, 5 Jul 2011 00:01:32 +0000 (10:01 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 5 Jul 2011 07:24:47 +0000 (17:24 +1000)
Signed-off-by: Andrew Tridgell <tridge@samba.org>
156 files changed:
MAINTAINERS.txt
buildtools/testwaf.sh
lib/ldb-samba/README [moved from source4/lib/ldb-samba/README with 100% similarity]
lib/ldb-samba/ldb_ildap.c [moved from source4/lib/ldb-samba/ldb_ildap.c with 100% similarity]
lib/ldb-samba/ldb_wrap.c [moved from source4/lib/ldb-samba/ldb_wrap.c with 100% similarity]
lib/ldb-samba/ldb_wrap.h [moved from source4/lib/ldb-samba/ldb_wrap.h with 100% similarity]
lib/ldb-samba/ldif_handlers.c [moved from source4/lib/ldb-samba/ldif_handlers.c with 100% similarity]
lib/ldb-samba/ldif_handlers.h [moved from source4/lib/ldb-samba/ldif_handlers.h with 100% similarity]
lib/ldb-samba/pyldb.c [moved from source4/lib/ldb-samba/pyldb.c with 100% similarity]
lib/ldb-samba/samba_extensions.c [moved from source4/lib/ldb-samba/samba_extensions.c with 100% similarity]
lib/ldb-samba/wscript_build [moved from source4/lib/ldb-samba/wscript_build with 100% similarity]
lib/ldb/ABI/ldb-0.9.10.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.10.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.12.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.12.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.15.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.15.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.16.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.16.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.17.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.17.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.18.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.18.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.19.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.19.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.20.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.20.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.22.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.22.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.23.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.23.sigs with 100% similarity]
lib/ldb/ABI/ldb-0.9.24.sigs [moved from source4/lib/ldb/ABI/ldb-0.9.24.sigs with 100% similarity]
lib/ldb/ABI/ldb-1.0.0.sigs [moved from source4/lib/ldb/ABI/ldb-1.0.0.sigs with 100% similarity]
lib/ldb/ABI/ldb-1.0.1.sigs [moved from source4/lib/ldb/ABI/ldb-1.0.1.sigs with 100% similarity]
lib/ldb/ABI/ldb-1.0.2.sigs [moved from source4/lib/ldb/ABI/ldb-1.0.2.sigs with 100% similarity]
lib/ldb/ABI/ldb-1.1.0.sigs [moved from source4/lib/ldb/ABI/ldb-1.1.0.sigs with 100% similarity]
lib/ldb/ABI/ldb-ildap-0.9.12.sigs [moved from source4/lib/ldb/ABI/ldb-ildap-0.9.12.sigs with 100% similarity]
lib/ldb/ABI/ldb-samba4-0.9.10.sigs [moved from source4/lib/ldb/ABI/ldb-samba4-0.9.10.sigs with 100% similarity]
lib/ldb/ABI/ldb-samba4-0.9.11.sigs [moved from source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs with 100% similarity]
lib/ldb/Doxyfile [moved from source4/lib/ldb/Doxyfile with 100% similarity]
lib/ldb/Makefile [moved from source4/lib/ldb/Makefile with 89% similarity]
lib/ldb/README_gcov.txt [moved from source4/lib/ldb/README_gcov.txt with 100% similarity]
lib/ldb/common/attrib_handlers.c [moved from source4/lib/ldb/common/attrib_handlers.c with 100% similarity]
lib/ldb/common/ldb.c [moved from source4/lib/ldb/common/ldb.c with 100% similarity]
lib/ldb/common/ldb_attributes.c [moved from source4/lib/ldb/common/ldb_attributes.c with 100% similarity]
lib/ldb/common/ldb_controls.c [moved from source4/lib/ldb/common/ldb_controls.c with 100% similarity]
lib/ldb/common/ldb_debug.c [moved from source4/lib/ldb/common/ldb_debug.c with 100% similarity]
lib/ldb/common/ldb_dn.c [moved from source4/lib/ldb/common/ldb_dn.c with 100% similarity]
lib/ldb/common/ldb_ldif.c [moved from source4/lib/ldb/common/ldb_ldif.c with 100% similarity]
lib/ldb/common/ldb_match.c [moved from source4/lib/ldb/common/ldb_match.c with 100% similarity]
lib/ldb/common/ldb_modules.c [moved from source4/lib/ldb/common/ldb_modules.c with 100% similarity]
lib/ldb/common/ldb_msg.c [moved from source4/lib/ldb/common/ldb_msg.c with 100% similarity]
lib/ldb/common/ldb_options.c [moved from source4/lib/ldb/common/ldb_options.c with 100% similarity]
lib/ldb/common/ldb_parse.c [moved from source4/lib/ldb/common/ldb_parse.c with 100% similarity]
lib/ldb/common/ldb_utf8.c [moved from source4/lib/ldb/common/ldb_utf8.c with 100% similarity]
lib/ldb/common/qsort.c [moved from source4/lib/ldb/common/qsort.c with 100% similarity]
lib/ldb/configure [moved from source4/lib/ldb/configure with 79% similarity]
lib/ldb/docs/builddocs.sh [moved from source4/lib/ldb/docs/builddocs.sh with 100% similarity]
lib/ldb/docs/design.txt [moved from source4/lib/ldb/docs/design.txt with 100% similarity]
lib/ldb/docs/installdocs.sh [moved from source4/lib/ldb/docs/installdocs.sh with 100% similarity]
lib/ldb/examples.dox [moved from source4/lib/ldb/examples.dox with 100% similarity]
lib/ldb/examples/ldbreader.c [moved from source4/lib/ldb/examples/ldbreader.c with 100% similarity]
lib/ldb/examples/ldifreader.c [moved from source4/lib/ldb/examples/ldifreader.c with 100% similarity]
lib/ldb/include/dlinklist.h [moved from source4/lib/ldb/include/dlinklist.h with 100% similarity]
lib/ldb/include/ldb.h [moved from source4/lib/ldb/include/ldb.h with 100% similarity]
lib/ldb/include/ldb_errors.h [moved from source4/lib/ldb/include/ldb_errors.h with 100% similarity]
lib/ldb/include/ldb_handlers.h [moved from source4/lib/ldb/include/ldb_handlers.h with 100% similarity]
lib/ldb/include/ldb_module.h [moved from source4/lib/ldb/include/ldb_module.h with 100% similarity]
lib/ldb/include/ldb_private.h [moved from source4/lib/ldb/include/ldb_private.h with 100% similarity]
lib/ldb/ldb.pc.in [moved from source4/lib/ldb/ldb.pc.in with 100% similarity]
lib/ldb/ldb_ldap/ldb_ldap.c [moved from source4/lib/ldb/ldb_ldap/ldb_ldap.c with 100% similarity]
lib/ldb/ldb_map/ldb_map.c [moved from source4/lib/ldb/ldb_map/ldb_map.c with 100% similarity]
lib/ldb/ldb_map/ldb_map.h [moved from source4/lib/ldb/ldb_map/ldb_map.h with 100% similarity]
lib/ldb/ldb_map/ldb_map_inbound.c [moved from source4/lib/ldb/ldb_map/ldb_map_inbound.c with 100% similarity]
lib/ldb/ldb_map/ldb_map_outbound.c [moved from source4/lib/ldb/ldb_map/ldb_map_outbound.c with 100% similarity]
lib/ldb/ldb_map/ldb_map_private.h [moved from source4/lib/ldb/ldb_map/ldb_map_private.h with 100% similarity]
lib/ldb/ldb_sqlite3/README [moved from source4/lib/ldb/ldb_sqlite3/README with 100% similarity]
lib/ldb/ldb_sqlite3/base160.c [moved from source4/lib/ldb/ldb_sqlite3/base160.c with 100% similarity]
lib/ldb/ldb_sqlite3/ldb_sqlite3.c [moved from source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c with 100% similarity]
lib/ldb/ldb_sqlite3/schema [moved from source4/lib/ldb/ldb_sqlite3/schema with 100% similarity]
lib/ldb/ldb_sqlite3/trees.ps [moved from source4/lib/ldb/ldb_sqlite3/trees.ps with 100% similarity]
lib/ldb/ldb_tdb/ldb_cache.c [moved from source4/lib/ldb/ldb_tdb/ldb_cache.c with 100% similarity]
lib/ldb/ldb_tdb/ldb_index.c [moved from source4/lib/ldb/ldb_tdb/ldb_index.c with 100% similarity]
lib/ldb/ldb_tdb/ldb_pack.c [moved from source4/lib/ldb/ldb_tdb/ldb_pack.c with 100% similarity]
lib/ldb/ldb_tdb/ldb_search.c [moved from source4/lib/ldb/ldb_tdb/ldb_search.c with 100% similarity]
lib/ldb/ldb_tdb/ldb_tdb.c [moved from source4/lib/ldb/ldb_tdb/ldb_tdb.c with 100% similarity]
lib/ldb/ldb_tdb/ldb_tdb.h [moved from source4/lib/ldb/ldb_tdb/ldb_tdb.h with 100% similarity]
lib/ldb/ldb_tdb/ldb_tdb_wrap.c [moved from source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c with 100% similarity]
lib/ldb/mainpage.dox [moved from source4/lib/ldb/mainpage.dox with 100% similarity]
lib/ldb/man/ldb.3.xml [moved from source4/lib/ldb/man/ldb.3.xml with 100% similarity]
lib/ldb/man/ldbadd.1.xml [moved from source4/lib/ldb/man/ldbadd.1.xml with 100% similarity]
lib/ldb/man/ldbdel.1.xml [moved from source4/lib/ldb/man/ldbdel.1.xml with 100% similarity]
lib/ldb/man/ldbedit.1.xml [moved from source4/lib/ldb/man/ldbedit.1.xml with 100% similarity]
lib/ldb/man/ldbmodify.1.xml [moved from source4/lib/ldb/man/ldbmodify.1.xml with 100% similarity]
lib/ldb/man/ldbrename.1.xml [moved from source4/lib/ldb/man/ldbrename.1.xml with 100% similarity]
lib/ldb/man/ldbsearch.1.xml [moved from source4/lib/ldb/man/ldbsearch.1.xml with 100% similarity]
lib/ldb/modules/asq.c [moved from source4/lib/ldb/modules/asq.c with 100% similarity]
lib/ldb/modules/paged_results.c [moved from source4/lib/ldb/modules/paged_results.c with 100% similarity]
lib/ldb/modules/paged_searches.c [moved from source4/lib/ldb/modules/paged_searches.c with 100% similarity]
lib/ldb/modules/rdn_name.c [moved from source4/lib/ldb/modules/rdn_name.c with 100% similarity]
lib/ldb/modules/skel.c [moved from source4/lib/ldb/modules/skel.c with 100% similarity]
lib/ldb/modules/sort.c [moved from source4/lib/ldb/modules/sort.c with 100% similarity]
lib/ldb/nssldb/README.txt [moved from source4/lib/ldb/nssldb/README.txt with 100% similarity]
lib/ldb/nssldb/ldb-grp.c [moved from source4/lib/ldb/nssldb/ldb-grp.c with 100% similarity]
lib/ldb/nssldb/ldb-nss.c [moved from source4/lib/ldb/nssldb/ldb-nss.c with 100% similarity]
lib/ldb/nssldb/ldb-nss.h [moved from source4/lib/ldb/nssldb/ldb-nss.h with 100% similarity]
lib/ldb/nssldb/ldb-pwd.c [moved from source4/lib/ldb/nssldb/ldb-pwd.c with 100% similarity]
lib/ldb/pyldb-util.pc.in [moved from source4/lib/ldb/pyldb-util.pc.in with 100% similarity]
lib/ldb/pyldb.c [moved from source4/lib/ldb/pyldb.c with 100% similarity]
lib/ldb/pyldb.h [moved from source4/lib/ldb/pyldb.h with 100% similarity]
lib/ldb/pyldb_util.c [moved from source4/lib/ldb/pyldb_util.c with 100% similarity]
lib/ldb/tests/init.ldif [moved from source4/lib/ldb/tests/init.ldif with 100% similarity]
lib/ldb/tests/init_slapd.sh [moved from source4/lib/ldb/tests/init_slapd.sh with 100% similarity]
lib/ldb/tests/kill_slapd.sh [moved from source4/lib/ldb/tests/kill_slapd.sh with 100% similarity]
lib/ldb/tests/ldapi_url.sh [moved from source4/lib/ldb/tests/ldapi_url.sh with 100% similarity]
lib/ldb/tests/photo.ldif [moved from source4/lib/ldb/tests/photo.ldif with 100% similarity]
lib/ldb/tests/python/api.py [moved from source4/lib/ldb/tests/python/api.py with 100% similarity]
lib/ldb/tests/samba4.png [moved from source4/lib/ldb/tests/samba4.png with 100% similarity]
lib/ldb/tests/sample_module.c [moved from source4/lib/ldb/tests/sample_module.c with 100% similarity]
lib/ldb/tests/schema-tests/schema-add-test.ldif [moved from source4/lib/ldb/tests/schema-tests/schema-add-test.ldif with 100% similarity]
lib/ldb/tests/schema-tests/schema-mod-test-1.ldif [moved from source4/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif with 100% similarity]
lib/ldb/tests/schema-tests/schema-mod-test-2.ldif [moved from source4/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif with 100% similarity]
lib/ldb/tests/schema-tests/schema-mod-test-3.ldif [moved from source4/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif with 100% similarity]
lib/ldb/tests/schema-tests/schema-mod-test-4.ldif [moved from source4/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif with 100% similarity]
lib/ldb/tests/schema-tests/schema-mod-test-5.ldif [moved from source4/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif with 100% similarity]
lib/ldb/tests/schema-tests/schema.ldif [moved from source4/lib/ldb/tests/schema-tests/schema.ldif with 100% similarity]
lib/ldb/tests/slapd.conf [moved from source4/lib/ldb/tests/slapd.conf with 100% similarity]
lib/ldb/tests/start_slapd.sh [moved from source4/lib/ldb/tests/start_slapd.sh with 100% similarity]
lib/ldb/tests/test-attribs.ldif [moved from source4/lib/ldb/tests/test-attribs.ldif with 100% similarity]
lib/ldb/tests/test-config.ldif [moved from source4/lib/ldb/tests/test-config.ldif with 100% similarity]
lib/ldb/tests/test-controls.sh [moved from source4/lib/ldb/tests/test-controls.sh with 100% similarity]
lib/ldb/tests/test-default-config.ldif [moved from source4/lib/ldb/tests/test-default-config.ldif with 100% similarity]
lib/ldb/tests/test-extended.sh [moved from source4/lib/ldb/tests/test-extended.sh with 100% similarity]
lib/ldb/tests/test-generic.sh [moved from source4/lib/ldb/tests/test-generic.sh with 100% similarity]
lib/ldb/tests/test-index.ldif [moved from source4/lib/ldb/tests/test-index.ldif with 100% similarity]
lib/ldb/tests/test-ldap.sh [moved from source4/lib/ldb/tests/test-ldap.sh with 100% similarity]
lib/ldb/tests/test-modify-modrdn.ldif [moved from source4/lib/ldb/tests/test-modify-modrdn.ldif with 100% similarity]
lib/ldb/tests/test-modify.ldif [moved from source4/lib/ldb/tests/test-modify.ldif with 100% similarity]
lib/ldb/tests/test-schema.sh [moved from source4/lib/ldb/tests/test-schema.sh with 100% similarity]
lib/ldb/tests/test-soloading.sh [moved from source4/lib/ldb/tests/test-soloading.sh with 100% similarity]
lib/ldb/tests/test-sqlite3.sh [moved from source4/lib/ldb/tests/test-sqlite3.sh with 100% similarity]
lib/ldb/tests/test-tdb-features.sh [moved from source4/lib/ldb/tests/test-tdb-features.sh with 100% similarity]
lib/ldb/tests/test-tdb.sh [moved from source4/lib/ldb/tests/test-tdb.sh with 100% similarity]
lib/ldb/tests/test-wildcard.ldif [moved from source4/lib/ldb/tests/test-wildcard.ldif with 100% similarity]
lib/ldb/tests/test-wrong_attributes.ldif [moved from source4/lib/ldb/tests/test-wrong_attributes.ldif with 100% similarity]
lib/ldb/tests/test.ldif [moved from source4/lib/ldb/tests/test.ldif with 100% similarity]
lib/ldb/tests/testdata.txt [moved from source4/lib/ldb/tests/testdata.txt with 100% similarity]
lib/ldb/tests/testsearch.txt [moved from source4/lib/ldb/tests/testsearch.txt with 100% similarity]
lib/ldb/tools/cmdline.c [moved from source4/lib/ldb/tools/cmdline.c with 100% similarity]
lib/ldb/tools/cmdline.h [moved from source4/lib/ldb/tools/cmdline.h with 100% similarity]
lib/ldb/tools/ldbadd.c [moved from source4/lib/ldb/tools/ldbadd.c with 100% similarity]
lib/ldb/tools/ldbdel.c [moved from source4/lib/ldb/tools/ldbdel.c with 100% similarity]
lib/ldb/tools/ldbedit.c [moved from source4/lib/ldb/tools/ldbedit.c with 100% similarity]
lib/ldb/tools/ldbmodify.c [moved from source4/lib/ldb/tools/ldbmodify.c with 100% similarity]
lib/ldb/tools/ldbrename.c [moved from source4/lib/ldb/tools/ldbrename.c with 100% similarity]
lib/ldb/tools/ldbsearch.c [moved from source4/lib/ldb/tools/ldbsearch.c with 100% similarity]
lib/ldb/tools/ldbtest.c [moved from source4/lib/ldb/tools/ldbtest.c with 100% similarity]
lib/ldb/tools/ldbutil.c [moved from source4/lib/ldb/tools/ldbutil.c with 100% similarity]
lib/ldb/tools/ldbutil.h [moved from source4/lib/ldb/tools/ldbutil.h with 100% similarity]
lib/ldb/web/index.html [moved from source4/lib/ldb/web/index.html with 100% similarity]
lib/ldb/wscript [moved from source4/lib/ldb/wscript with 99% similarity]
script/autobuild.py
script/land.py
source4/selftest/tests.py
wscript
wscript_build

index 466ae54..36e1840 100644 (file)
@@ -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:
index 8b65af2..127e525 100755 (executable)
@@ -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")
similarity index 100%
rename from source4/lib/ldb/Doxyfile
rename to lib/ldb/Doxyfile
similarity index 89%
rename from source4/lib/ldb/Makefile
rename to lib/ldb/Makefile
index a07b4a7..5acfcbc 100644 (file)
@@ -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
similarity index 79%
rename from source4/lib/ldb/configure
rename to lib/ldb/configure
index 137a26b..82146fe 100755 (executable)
@@ -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
similarity index 100%
rename from source4/lib/ldb/ldb.pc.in
rename to lib/ldb/ldb.pc.in
similarity index 100%
rename from source4/lib/ldb/pyldb.c
rename to lib/ldb/pyldb.c
similarity index 100%
rename from source4/lib/ldb/pyldb.h
rename to lib/ldb/pyldb.h
similarity index 99%
rename from source4/lib/ldb/wscript
rename to lib/ldb/wscript
index 7de9549..f184554 100755 (executable)
@@ -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''')
 
index 545e47e..3a8c0f8 100755 (executable)
@@ -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") ],
 
index f8ae7b4..72bdd4b 100755 (executable)
@@ -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") ],
index 1ffc8cd..518c284 100755 (executable)
@@ -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 a4fb470..32c1c80 100755 (executable)
--- 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')
index aa37c4b..a771838 100644 (file)
@@ -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')