Move the master copy of ldb (from Samba4) to the top level

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.in b/lib/ldb/Makefile.in
similarity index 100%
rename from source4/lib/ldb/Makefile.in
rename to lib/ldb/Makefile.in

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/aclocal.m4 b/lib/ldb/aclocal.m4
similarity index 100%
rename from source4/lib/ldb/aclocal.m4
rename to lib/ldb/aclocal.m4

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

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

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_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/config.guess b/lib/ldb/config.guess
similarity index 100%
rename from source4/lib/ldb/config.guess
rename to lib/ldb/config.guess

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

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

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

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/external/libevents.m4 b/lib/ldb/external/libevents.m4
similarity index 100%
rename from source4/lib/ldb/external/libevents.m4
rename to lib/ldb/external/libevents.m4

diff --git a/source4/lib/ldb/external/libpopt.m4 b/lib/ldb/external/libpopt.m4
similarity index 100%
rename from source4/lib/ldb/external/libpopt.m4
rename to lib/ldb/external/libpopt.m4

diff --git a/source4/lib/ldb/external/libtalloc.m4 b/lib/ldb/external/libtalloc.m4
similarity index 100%
rename from source4/lib/ldb/external/libtalloc.m4
rename to lib/ldb/external/libtalloc.m4

diff --git a/source4/lib/ldb/external/libtdb.m4 b/lib/ldb/external/libtdb.m4
similarity index 100%
rename from source4/lib/ldb/external/libtdb.m4
rename to lib/ldb/external/libtdb.m4

diff --git a/source4/lib/ldb/external/pkg.m4 b/lib/ldb/external/pkg.m4
similarity index 100%
rename from source4/lib/ldb/external/pkg.m4
rename to lib/ldb/external/pkg.m4

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_includes.h b/lib/ldb/include/ldb_includes.h
similarity index 100%
rename from source4/lib/ldb/include/ldb_includes.h
rename to lib/ldb/include/ldb_includes.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/install-sh b/lib/ldb/install-sh
similarity index 100%
rename from source4/lib/ldb/install-sh
rename to lib/ldb/install-sh

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

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

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_ildap/config.mk b/lib/ldb/ldb_ildap/config.mk
similarity index 100%
rename from source4/lib/ldb/ldb_ildap/config.mk
rename to lib/ldb/ldb_ildap/config.mk

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

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/libldb.m4 b/lib/ldb/libldb.m4
similarity index 100%
rename from source4/lib/ldb/libldb.m4
rename to lib/ldb/libldb.m4

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/ad2oLschema.1.xml b/lib/ldb/man/ad2oLschema.1.xml
similarity index 100%
rename from source4/lib/ldb/man/ad2oLschema.1.xml
rename to lib/ldb/man/ad2oLschema.1.xml

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/man/oLschema2ldif.1.xml b/lib/ldb/man/oLschema2ldif.1.xml
similarity index 100%
rename from source4/lib/ldb/man/oLschema2ldif.1.xml
rename to lib/ldb/man/oLschema2ldif.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/operational.c b/lib/ldb/modules/operational.c
similarity index 100%
rename from source4/lib/ldb/modules/operational.c
rename to lib/ldb/modules/operational.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.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/python.mk b/lib/ldb/python.mk
similarity index 100%
rename from source4/lib/ldb/python.mk
rename to lib/ldb/python.mk

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

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

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

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/python/ldap.py b/lib/ldb/tests/python/ldap.py
similarity index 100%
rename from source4/lib/ldb/tests/python/ldap.py
rename to lib/ldb/tests/python/ldap.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-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.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/config.mk b/lib/ldb/tools/config.mk
similarity index 100%
rename from source4/lib/ldb/tools/config.mk
rename to lib/ldb/tools/config.mk

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/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/Makefile b/source4/Makefile
index c42f0ba9fff60c44ab6b1ce8bc76f71dd9407d3a..104bd09cc4cc948d4d149de70a423c14917741ed 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -63,7 +63,7 @@ libsocketsrcdir := lib/socket
 libcharsetsrcdir := ../lib/util/charset
 ldb_sambasrcdir := lib/ldb-samba
 tdbsrcdir := ../lib/tdb
-ldbsrcdir := lib/ldb
+ldbsrcdir := ../lib/ldb
 libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
 smbreadlinesrcdir := lib/smbreadline

diff --git a/source4/configure.ac b/source4/configure.ac
index 3c23f27d6879a2c63ce20b8207f7f9a4b2d8b522..0c9419c6e8b8325a7c8ce812d7ec77d99dd4bfdc 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -69,8 +69,8 @@ SMB_INCLUDE_MK(../lib/tevent/python.mk)
 
 SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
        [
-               SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
-               SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
+               SMB_INCLUDE_MK(../lib/ldb/ldb_ildap/config.mk)
+               SMB_INCLUDE_MK(../lib/ldb/tools/config.mk)
                define_ldb_modulesdir=no
        ],
        [
@@ -91,14 +91,14 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
                        AC_DEFINE_UNQUOTED(LDB_MODULESDIR, "${LDB_MODULESDIR}" , [ldb Modules directory])
                fi
                ])
-               ldbdir=lib/ldb
+               ldbdir=../lib/ldb
                AC_SUBST(ldbdir)
-               m4_include(lib/ldb/sqlite3.m4)
-               m4_include(lib/ldb/libldb.m4)
-               SMB_INCLUDE_MK(lib/ldb/config.mk)
-               AC_CONFIG_FILES(lib/ldb/ldb.pc)
+               m4_include(../lib/ldb/sqlite3.m4)
+               m4_include(../lib/ldb/libldb.m4)
+               SMB_INCLUDE_MK(../lib/ldb/config.mk)
+               AC_CONFIG_FILES(../lib/ldb/ldb.pc)
        ], [no])
-SMB_INCLUDE_MK(lib/ldb/python.mk) 
+SMB_INCLUDE_MK(../lib/ldb/python.mk) 
 
 m4_include(lib/tls/config.m4)