ldb: make ldb a top level library for Samba 4.0

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

diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 466ae54d6a783cd70df7b407fb8ca6a9c6aa08a4..36e1840cbfafeb65875452e73ce55a905ca13e4e 100644 (file)
--- 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 8b65af2c10ae3e266fc17d00b491d214398aa5c0..127e52589103e455423ccbc24c464d43540df9cd 100755 (executable)
--- 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
similarity index 100%
rename from source4/lib/ldb-samba/README
rename to lib/ldb-samba/README

diff --git a/source4/lib/ldb-samba/ldb_ildap.c b/lib/ldb-samba/ldb_ildap.c
similarity index 100%
rename from source4/lib/ldb-samba/ldb_ildap.c
rename to lib/ldb-samba/ldb_ildap.c

diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
similarity index 100%
rename from source4/lib/ldb-samba/ldb_wrap.c
rename to lib/ldb-samba/ldb_wrap.c

diff --git a/source4/lib/ldb-samba/ldb_wrap.h b/lib/ldb-samba/ldb_wrap.h
similarity index 100%
rename from source4/lib/ldb-samba/ldb_wrap.h
rename to lib/ldb-samba/ldb_wrap.h

diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/lib/ldb-samba/ldif_handlers.c
similarity index 100%
rename from source4/lib/ldb-samba/ldif_handlers.c
rename to lib/ldb-samba/ldif_handlers.c

diff --git a/source4/lib/ldb-samba/ldif_handlers.h b/lib/ldb-samba/ldif_handlers.h
similarity index 100%
rename from source4/lib/ldb-samba/ldif_handlers.h
rename to lib/ldb-samba/ldif_handlers.h

diff --git a/source4/lib/ldb-samba/pyldb.c b/lib/ldb-samba/pyldb.c
similarity index 100%
rename from source4/lib/ldb-samba/pyldb.c
rename to lib/ldb-samba/pyldb.c

diff --git a/source4/lib/ldb-samba/samba_extensions.c b/lib/ldb-samba/samba_extensions.c
similarity index 100%
rename from source4/lib/ldb-samba/samba_extensions.c
rename to lib/ldb-samba/samba_extensions.c

diff --git a/source4/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build
similarity index 100%
rename from source4/lib/ldb-samba/wscript_build
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.10.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.12.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.15.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.16.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.17.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.18.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.19.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.20.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.22.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.23.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-0.9.24.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-1.0.0.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-1.0.1.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-1.0.2.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-1.1.0.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-ildap-0.9.12.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-samba4-0.9.10.sigs
rename to 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
similarity index 100%
rename from source4/lib/ldb/ABI/ldb-samba4-0.9.11.sigs
rename to lib/ldb/ABI/ldb-samba4-0.9.11.sigs

diff --git a/source4/lib/ldb/Doxyfile b/lib/ldb/Doxyfile
similarity index 100%
rename from source4/lib/ldb/Doxyfile
rename to lib/ldb/Doxyfile

diff --git a/source4/lib/ldb/Makefile b/lib/ldb/Makefile
similarity index 89%
rename from source4/lib/ldb/Makefile
rename to lib/ldb/Makefile
index a07b4a716415fd570332d6925650da5545979e8e..5acfcbce58e893ea4bbccb56dda739a891be485d 100644 (file)
--- 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
similarity index 100%
rename from source4/lib/ldb/README_gcov.txt
rename to lib/ldb/README_gcov.txt

diff --git a/source4/lib/ldb/common/attrib_handlers.c b/lib/ldb/common/attrib_handlers.c
similarity index 100%
rename from source4/lib/ldb/common/attrib_handlers.c
rename to lib/ldb/common/attrib_handlers.c

diff --git a/source4/lib/ldb/common/ldb.c b/lib/ldb/common/ldb.c
similarity index 100%
rename from source4/lib/ldb/common/ldb.c
rename to lib/ldb/common/ldb.c

diff --git a/source4/lib/ldb/common/ldb_attributes.c b/lib/ldb/common/ldb_attributes.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_attributes.c
rename to lib/ldb/common/ldb_attributes.c

diff --git a/source4/lib/ldb/common/ldb_controls.c b/lib/ldb/common/ldb_controls.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_controls.c
rename to lib/ldb/common/ldb_controls.c

diff --git a/source4/lib/ldb/common/ldb_debug.c b/lib/ldb/common/ldb_debug.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_debug.c
rename to lib/ldb/common/ldb_debug.c

diff --git a/source4/lib/ldb/common/ldb_dn.c b/lib/ldb/common/ldb_dn.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_dn.c
rename to lib/ldb/common/ldb_dn.c

diff --git a/source4/lib/ldb/common/ldb_ldif.c b/lib/ldb/common/ldb_ldif.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_ldif.c
rename to lib/ldb/common/ldb_ldif.c

diff --git a/source4/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_match.c
rename to lib/ldb/common/ldb_match.c

diff --git a/source4/lib/ldb/common/ldb_modules.c b/lib/ldb/common/ldb_modules.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_modules.c
rename to lib/ldb/common/ldb_modules.c

diff --git a/source4/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_msg.c
rename to lib/ldb/common/ldb_msg.c

diff --git a/source4/lib/ldb/common/ldb_options.c b/lib/ldb/common/ldb_options.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_options.c
rename to lib/ldb/common/ldb_options.c

diff --git a/source4/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_parse.c
rename to lib/ldb/common/ldb_parse.c

diff --git a/source4/lib/ldb/common/ldb_utf8.c b/lib/ldb/common/ldb_utf8.c
similarity index 100%
rename from source4/lib/ldb/common/ldb_utf8.c
rename to lib/ldb/common/ldb_utf8.c

diff --git a/source4/lib/ldb/common/qsort.c b/lib/ldb/common/qsort.c
similarity index 100%
rename from source4/lib/ldb/common/qsort.c
rename to lib/ldb/common/qsort.c

diff --git a/source4/lib/ldb/configure b/lib/ldb/configure
similarity index 79%
rename from source4/lib/ldb/configure
rename to lib/ldb/configure
index 137a26bcbe0e6165e00f1c49b8f5bce07803b967..82146fe109afbd14f8cb86aeae21f0cfed9340a7 100755 (executable)
--- 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
similarity index 100%
rename from source4/lib/ldb/docs/builddocs.sh
rename to lib/ldb/docs/builddocs.sh

diff --git a/source4/lib/ldb/docs/design.txt b/lib/ldb/docs/design.txt
similarity index 100%
rename from source4/lib/ldb/docs/design.txt
rename to lib/ldb/docs/design.txt

diff --git a/source4/lib/ldb/docs/installdocs.sh b/lib/ldb/docs/installdocs.sh
similarity index 100%
rename from source4/lib/ldb/docs/installdocs.sh
rename to lib/ldb/docs/installdocs.sh

diff --git a/source4/lib/ldb/examples.dox b/lib/ldb/examples.dox
similarity index 100%
rename from source4/lib/ldb/examples.dox
rename to lib/ldb/examples.dox

diff --git a/source4/lib/ldb/examples/ldbreader.c b/lib/ldb/examples/ldbreader.c
similarity index 100%
rename from source4/lib/ldb/examples/ldbreader.c
rename to lib/ldb/examples/ldbreader.c

diff --git a/source4/lib/ldb/examples/ldifreader.c b/lib/ldb/examples/ldifreader.c
similarity index 100%
rename from source4/lib/ldb/examples/ldifreader.c
rename to lib/ldb/examples/ldifreader.c

diff --git a/source4/lib/ldb/include/dlinklist.h b/lib/ldb/include/dlinklist.h
similarity index 100%
rename from source4/lib/ldb/include/dlinklist.h
rename to lib/ldb/include/dlinklist.h

diff --git a/source4/lib/ldb/include/ldb.h b/lib/ldb/include/ldb.h
similarity index 100%
rename from source4/lib/ldb/include/ldb.h
rename to lib/ldb/include/ldb.h

diff --git a/source4/lib/ldb/include/ldb_errors.h b/lib/ldb/include/ldb_errors.h
similarity index 100%
rename from source4/lib/ldb/include/ldb_errors.h
rename to lib/ldb/include/ldb_errors.h

diff --git a/source4/lib/ldb/include/ldb_handlers.h b/lib/ldb/include/ldb_handlers.h
similarity index 100%
rename from source4/lib/ldb/include/ldb_handlers.h
rename to lib/ldb/include/ldb_handlers.h

diff --git a/source4/lib/ldb/include/ldb_module.h b/lib/ldb/include/ldb_module.h
similarity index 100%
rename from source4/lib/ldb/include/ldb_module.h
rename to lib/ldb/include/ldb_module.h

diff --git a/source4/lib/ldb/include/ldb_private.h b/lib/ldb/include/ldb_private.h
similarity index 100%
rename from source4/lib/ldb/include/ldb_private.h
rename to lib/ldb/include/ldb_private.h

diff --git a/source4/lib/ldb/ldb.pc.in b/lib/ldb/ldb.pc.in
similarity index 100%
rename from source4/lib/ldb/ldb.pc.in
rename to lib/ldb/ldb.pc.in

diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/lib/ldb/ldb_ldap/ldb_ldap.c
similarity index 100%
rename from source4/lib/ldb/ldb_ldap/ldb_ldap.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_map/ldb_map.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_map/ldb_map.h
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_map/ldb_map_inbound.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_map/ldb_map_outbound.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_map/ldb_map_private.h
rename to lib/ldb/ldb_map/ldb_map_private.h

diff --git a/source4/lib/ldb/ldb_sqlite3/README b/lib/ldb/ldb_sqlite3/README
similarity index 100%
rename from source4/lib/ldb/ldb_sqlite3/README
rename to lib/ldb/ldb_sqlite3/README

diff --git a/source4/lib/ldb/ldb_sqlite3/base160.c b/lib/ldb/ldb_sqlite3/base160.c
similarity index 100%
rename from source4/lib/ldb/ldb_sqlite3/base160.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
rename to lib/ldb/ldb_sqlite3/ldb_sqlite3.c

diff --git a/source4/lib/ldb/ldb_sqlite3/schema b/lib/ldb/ldb_sqlite3/schema
similarity index 100%
rename from source4/lib/ldb/ldb_sqlite3/schema
rename to lib/ldb/ldb_sqlite3/schema

diff --git a/source4/lib/ldb/ldb_sqlite3/trees.ps b/lib/ldb/ldb_sqlite3/trees.ps
similarity index 100%
rename from source4/lib/ldb/ldb_sqlite3/trees.ps
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_tdb/ldb_cache.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_tdb/ldb_index.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_tdb/ldb_pack.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_tdb/ldb_search.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_tdb/ldb_tdb.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_tdb/ldb_tdb.h
rename to 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
similarity index 100%
rename from source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
rename to lib/ldb/ldb_tdb/ldb_tdb_wrap.c

diff --git a/source4/lib/ldb/mainpage.dox b/lib/ldb/mainpage.dox
similarity index 100%
rename from source4/lib/ldb/mainpage.dox
rename to lib/ldb/mainpage.dox

diff --git a/source4/lib/ldb/man/ldb.3.xml b/lib/ldb/man/ldb.3.xml
similarity index 100%
rename from source4/lib/ldb/man/ldb.3.xml
rename to lib/ldb/man/ldb.3.xml

diff --git a/source4/lib/ldb/man/ldbadd.1.xml b/lib/ldb/man/ldbadd.1.xml
similarity index 100%
rename from source4/lib/ldb/man/ldbadd.1.xml
rename to lib/ldb/man/ldbadd.1.xml

diff --git a/source4/lib/ldb/man/ldbdel.1.xml b/lib/ldb/man/ldbdel.1.xml
similarity index 100%
rename from source4/lib/ldb/man/ldbdel.1.xml
rename to lib/ldb/man/ldbdel.1.xml

diff --git a/source4/lib/ldb/man/ldbedit.1.xml b/lib/ldb/man/ldbedit.1.xml
similarity index 100%
rename from source4/lib/ldb/man/ldbedit.1.xml
rename to lib/ldb/man/ldbedit.1.xml

diff --git a/source4/lib/ldb/man/ldbmodify.1.xml b/lib/ldb/man/ldbmodify.1.xml
similarity index 100%
rename from source4/lib/ldb/man/ldbmodify.1.xml
rename to lib/ldb/man/ldbmodify.1.xml

diff --git a/source4/lib/ldb/man/ldbrename.1.xml b/lib/ldb/man/ldbrename.1.xml
similarity index 100%
rename from source4/lib/ldb/man/ldbrename.1.xml
rename to lib/ldb/man/ldbrename.1.xml

diff --git a/source4/lib/ldb/man/ldbsearch.1.xml b/lib/ldb/man/ldbsearch.1.xml
similarity index 100%
rename from source4/lib/ldb/man/ldbsearch.1.xml
rename to lib/ldb/man/ldbsearch.1.xml

diff --git a/source4/lib/ldb/modules/asq.c b/lib/ldb/modules/asq.c
similarity index 100%
rename from source4/lib/ldb/modules/asq.c
rename to lib/ldb/modules/asq.c

diff --git a/source4/lib/ldb/modules/paged_results.c b/lib/ldb/modules/paged_results.c
similarity index 100%
rename from source4/lib/ldb/modules/paged_results.c
rename to lib/ldb/modules/paged_results.c

diff --git a/source4/lib/ldb/modules/paged_searches.c b/lib/ldb/modules/paged_searches.c
similarity index 100%
rename from source4/lib/ldb/modules/paged_searches.c
rename to lib/ldb/modules/paged_searches.c

diff --git a/source4/lib/ldb/modules/rdn_name.c b/lib/ldb/modules/rdn_name.c
similarity index 100%
rename from source4/lib/ldb/modules/rdn_name.c
rename to lib/ldb/modules/rdn_name.c

diff --git a/source4/lib/ldb/modules/skel.c b/lib/ldb/modules/skel.c
similarity index 100%
rename from source4/lib/ldb/modules/skel.c
rename to lib/ldb/modules/skel.c

diff --git a/source4/lib/ldb/modules/sort.c b/lib/ldb/modules/sort.c
similarity index 100%
rename from source4/lib/ldb/modules/sort.c
rename to lib/ldb/modules/sort.c

diff --git a/source4/lib/ldb/nssldb/README.txt b/lib/ldb/nssldb/README.txt
similarity index 100%
rename from source4/lib/ldb/nssldb/README.txt
rename to lib/ldb/nssldb/README.txt

diff --git a/source4/lib/ldb/nssldb/ldb-grp.c b/lib/ldb/nssldb/ldb-grp.c
similarity index 100%
rename from source4/lib/ldb/nssldb/ldb-grp.c
rename to lib/ldb/nssldb/ldb-grp.c

diff --git a/source4/lib/ldb/nssldb/ldb-nss.c b/lib/ldb/nssldb/ldb-nss.c
similarity index 100%
rename from source4/lib/ldb/nssldb/ldb-nss.c
rename to lib/ldb/nssldb/ldb-nss.c

diff --git a/source4/lib/ldb/nssldb/ldb-nss.h b/lib/ldb/nssldb/ldb-nss.h
similarity index 100%
rename from source4/lib/ldb/nssldb/ldb-nss.h
rename to lib/ldb/nssldb/ldb-nss.h

diff --git a/source4/lib/ldb/nssldb/ldb-pwd.c b/lib/ldb/nssldb/ldb-pwd.c
similarity index 100%
rename from source4/lib/ldb/nssldb/ldb-pwd.c
rename to lib/ldb/nssldb/ldb-pwd.c

diff --git a/source4/lib/ldb/pyldb-util.pc.in b/lib/ldb/pyldb-util.pc.in
similarity index 100%
rename from source4/lib/ldb/pyldb-util.pc.in
rename to lib/ldb/pyldb-util.pc.in

diff --git a/source4/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
similarity index 100%
rename from source4/lib/ldb/pyldb.c
rename to lib/ldb/pyldb.c

diff --git a/source4/lib/ldb/pyldb.h b/lib/ldb/pyldb.h
similarity index 100%
rename from source4/lib/ldb/pyldb.h
rename to lib/ldb/pyldb.h

diff --git a/source4/lib/ldb/pyldb_util.c b/lib/ldb/pyldb_util.c
similarity index 100%
rename from source4/lib/ldb/pyldb_util.c
rename to lib/ldb/pyldb_util.c

diff --git a/source4/lib/ldb/tests/init.ldif b/lib/ldb/tests/init.ldif
similarity index 100%
rename from source4/lib/ldb/tests/init.ldif
rename to lib/ldb/tests/init.ldif

diff --git a/source4/lib/ldb/tests/init_slapd.sh b/lib/ldb/tests/init_slapd.sh
similarity index 100%
rename from source4/lib/ldb/tests/init_slapd.sh
rename to lib/ldb/tests/init_slapd.sh

diff --git a/source4/lib/ldb/tests/kill_slapd.sh b/lib/ldb/tests/kill_slapd.sh
similarity index 100%
rename from source4/lib/ldb/tests/kill_slapd.sh
rename to lib/ldb/tests/kill_slapd.sh

diff --git a/source4/lib/ldb/tests/ldapi_url.sh b/lib/ldb/tests/ldapi_url.sh
similarity index 100%
rename from source4/lib/ldb/tests/ldapi_url.sh
rename to lib/ldb/tests/ldapi_url.sh

diff --git a/source4/lib/ldb/tests/photo.ldif b/lib/ldb/tests/photo.ldif
similarity index 100%
rename from source4/lib/ldb/tests/photo.ldif
rename to lib/ldb/tests/photo.ldif

diff --git a/source4/lib/ldb/tests/python/api.py b/lib/ldb/tests/python/api.py
similarity index 100%
rename from source4/lib/ldb/tests/python/api.py
rename to lib/ldb/tests/python/api.py

diff --git a/source4/lib/ldb/tests/samba4.png b/lib/ldb/tests/samba4.png
similarity index 100%
rename from source4/lib/ldb/tests/samba4.png
rename to lib/ldb/tests/samba4.png

diff --git a/source4/lib/ldb/tests/sample_module.c b/lib/ldb/tests/sample_module.c
similarity index 100%
rename from source4/lib/ldb/tests/sample_module.c
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/schema-tests/schema-add-test.ldif
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/schema-tests/schema.ldif
rename to lib/ldb/tests/schema-tests/schema.ldif

diff --git a/source4/lib/ldb/tests/slapd.conf b/lib/ldb/tests/slapd.conf
similarity index 100%
rename from source4/lib/ldb/tests/slapd.conf
rename to lib/ldb/tests/slapd.conf

diff --git a/source4/lib/ldb/tests/start_slapd.sh b/lib/ldb/tests/start_slapd.sh
similarity index 100%
rename from source4/lib/ldb/tests/start_slapd.sh
rename to lib/ldb/tests/start_slapd.sh

diff --git a/source4/lib/ldb/tests/test-attribs.ldif b/lib/ldb/tests/test-attribs.ldif
similarity index 100%
rename from source4/lib/ldb/tests/test-attribs.ldif
rename to lib/ldb/tests/test-attribs.ldif

diff --git a/source4/lib/ldb/tests/test-config.ldif b/lib/ldb/tests/test-config.ldif
similarity index 100%
rename from source4/lib/ldb/tests/test-config.ldif
rename to lib/ldb/tests/test-config.ldif

diff --git a/source4/lib/ldb/tests/test-controls.sh b/lib/ldb/tests/test-controls.sh
similarity index 100%
rename from source4/lib/ldb/tests/test-controls.sh
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/test-default-config.ldif
rename to lib/ldb/tests/test-default-config.ldif

diff --git a/source4/lib/ldb/tests/test-extended.sh b/lib/ldb/tests/test-extended.sh
similarity index 100%
rename from source4/lib/ldb/tests/test-extended.sh
rename to lib/ldb/tests/test-extended.sh

diff --git a/source4/lib/ldb/tests/test-generic.sh b/lib/ldb/tests/test-generic.sh
similarity index 100%
rename from source4/lib/ldb/tests/test-generic.sh
rename to lib/ldb/tests/test-generic.sh

diff --git a/source4/lib/ldb/tests/test-index.ldif b/lib/ldb/tests/test-index.ldif
similarity index 100%
rename from source4/lib/ldb/tests/test-index.ldif
rename to lib/ldb/tests/test-index.ldif

diff --git a/source4/lib/ldb/tests/test-ldap.sh b/lib/ldb/tests/test-ldap.sh
similarity index 100%
rename from source4/lib/ldb/tests/test-ldap.sh
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/test-modify-modrdn.ldif
rename to lib/ldb/tests/test-modify-modrdn.ldif

diff --git a/source4/lib/ldb/tests/test-modify.ldif b/lib/ldb/tests/test-modify.ldif
similarity index 100%
rename from source4/lib/ldb/tests/test-modify.ldif
rename to lib/ldb/tests/test-modify.ldif

diff --git a/source4/lib/ldb/tests/test-schema.sh b/lib/ldb/tests/test-schema.sh
similarity index 100%
rename from source4/lib/ldb/tests/test-schema.sh
rename to lib/ldb/tests/test-schema.sh

diff --git a/source4/lib/ldb/tests/test-soloading.sh b/lib/ldb/tests/test-soloading.sh
similarity index 100%
rename from source4/lib/ldb/tests/test-soloading.sh
rename to lib/ldb/tests/test-soloading.sh

diff --git a/source4/lib/ldb/tests/test-sqlite3.sh b/lib/ldb/tests/test-sqlite3.sh
similarity index 100%
rename from source4/lib/ldb/tests/test-sqlite3.sh
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/test-tdb-features.sh
rename to lib/ldb/tests/test-tdb-features.sh

diff --git a/source4/lib/ldb/tests/test-tdb.sh b/lib/ldb/tests/test-tdb.sh
similarity index 100%
rename from source4/lib/ldb/tests/test-tdb.sh
rename to lib/ldb/tests/test-tdb.sh

diff --git a/source4/lib/ldb/tests/test-wildcard.ldif b/lib/ldb/tests/test-wildcard.ldif
similarity index 100%
rename from source4/lib/ldb/tests/test-wildcard.ldif
rename to 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
similarity index 100%
rename from source4/lib/ldb/tests/test-wrong_attributes.ldif
rename to lib/ldb/tests/test-wrong_attributes.ldif

diff --git a/source4/lib/ldb/tests/test.ldif b/lib/ldb/tests/test.ldif
similarity index 100%
rename from source4/lib/ldb/tests/test.ldif
rename to lib/ldb/tests/test.ldif

diff --git a/source4/lib/ldb/tests/testdata.txt b/lib/ldb/tests/testdata.txt
similarity index 100%
rename from source4/lib/ldb/tests/testdata.txt
rename to lib/ldb/tests/testdata.txt

diff --git a/source4/lib/ldb/tests/testsearch.txt b/lib/ldb/tests/testsearch.txt
similarity index 100%
rename from source4/lib/ldb/tests/testsearch.txt
rename to lib/ldb/tests/testsearch.txt

diff --git a/source4/lib/ldb/tools/cmdline.c b/lib/ldb/tools/cmdline.c
similarity index 100%
rename from source4/lib/ldb/tools/cmdline.c
rename to lib/ldb/tools/cmdline.c

diff --git a/source4/lib/ldb/tools/cmdline.h b/lib/ldb/tools/cmdline.h
similarity index 100%
rename from source4/lib/ldb/tools/cmdline.h
rename to lib/ldb/tools/cmdline.h

diff --git a/source4/lib/ldb/tools/ldbadd.c b/lib/ldb/tools/ldbadd.c
similarity index 100%
rename from source4/lib/ldb/tools/ldbadd.c
rename to lib/ldb/tools/ldbadd.c

diff --git a/source4/lib/ldb/tools/ldbdel.c b/lib/ldb/tools/ldbdel.c
similarity index 100%
rename from source4/lib/ldb/tools/ldbdel.c
rename to lib/ldb/tools/ldbdel.c

diff --git a/source4/lib/ldb/tools/ldbedit.c b/lib/ldb/tools/ldbedit.c
similarity index 100%
rename from source4/lib/ldb/tools/ldbedit.c
rename to lib/ldb/tools/ldbedit.c

diff --git a/source4/lib/ldb/tools/ldbmodify.c b/lib/ldb/tools/ldbmodify.c
similarity index 100%
rename from source4/lib/ldb/tools/ldbmodify.c
rename to lib/ldb/tools/ldbmodify.c

diff --git a/source4/lib/ldb/tools/ldbrename.c b/lib/ldb/tools/ldbrename.c
similarity index 100%
rename from source4/lib/ldb/tools/ldbrename.c
rename to lib/ldb/tools/ldbrename.c

diff --git a/source4/lib/ldb/tools/ldbsearch.c b/lib/ldb/tools/ldbsearch.c
similarity index 100%
rename from source4/lib/ldb/tools/ldbsearch.c
rename to lib/ldb/tools/ldbsearch.c

diff --git a/source4/lib/ldb/tools/ldbtest.c b/lib/ldb/tools/ldbtest.c
similarity index 100%
rename from source4/lib/ldb/tools/ldbtest.c
rename to lib/ldb/tools/ldbtest.c

diff --git a/source4/lib/ldb/tools/ldbutil.c b/lib/ldb/tools/ldbutil.c
similarity index 100%
rename from source4/lib/ldb/tools/ldbutil.c
rename to lib/ldb/tools/ldbutil.c

diff --git a/source4/lib/ldb/tools/ldbutil.h b/lib/ldb/tools/ldbutil.h
similarity index 100%
rename from source4/lib/ldb/tools/ldbutil.h
rename to lib/ldb/tools/ldbutil.h

diff --git a/source4/lib/ldb/web/index.html b/lib/ldb/web/index.html
similarity index 100%
rename from source4/lib/ldb/web/index.html
rename to lib/ldb/web/index.html

diff --git a/source4/lib/ldb/wscript b/lib/ldb/wscript
similarity index 99%
rename from source4/lib/ldb/wscript
rename to lib/ldb/wscript
index 7de95494c711cdb88fc216c4bb01ba06f09e404b..f1845546650b175397194c2901b634a42e3b64ce 100755 (executable)
--- 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 545e47ed489358d599d5972763a98af615868afb..3a8c0f81f05192552d1a4bf0e4f679eed75dfbb0 100755 (executable)
--- 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 f8ae7b4493d9f56389aa083e147a3f9c2982eb5f..72bdd4b8408cdd6093673c088485ec1e03180d88 100755 (executable)
--- 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 1ffc8cd74a3985e572befeb5d1c9223a9027024d..518c28452b45833af4feaca144d0b2802f6bf1b1 100755 (executable)
--- 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 a4fb470087206b021423d79cc8ef600f7ec9de25..32c1c80f73a72ee9c02d828a7df0db0b2b118287 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')

diff --git a/wscript_build b/wscript_build
index aa37c4bbc703e5330995ef884b6116308b95d301..a7718385ffaf3702a5fe69894c825a6bc836ff09 100644 (file)
--- 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')