The branch, master has been updated
via fc33659... Remove the copy of ldb from Samba 3.
from 24b2ddd... s3-build: fix the build of vfs_notify_fam.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fc336590dc35f1737ddc74333b959bdd32ee22d3
Author: Jelmer Vernooij <jel...@samba.org>
Date: Thu May 6 10:41:43 2010 +0200
Remove the copy of ldb from Samba 3.
There were two utility functions that other parts of Samba 3
still relied on; they have been moved to lib/ldb_compat.[ch].
-----------------------------------------------------------------------
Summary of changes:
libcli/ldap/ldap_ndr.c | 4 +
source3/Makefile.in | 127 +-
source3/configure.in | 2 -
source3/lib/ldb/Doxyfile | 26 -
source3/lib/ldb/Makefile.in | 173 --
source3/lib/ldb/README_gcov.txt | 29 -
source3/lib/ldb/aclocal.m4 | 1 -
source3/lib/ldb/autogen.sh | 17 -
source3/lib/ldb/common/attrib_handlers.c | 405 -----
source3/lib/ldb/common/ldb.c | 1136 ------------
source3/lib/ldb/common/ldb_attributes.c | 308 ----
source3/lib/ldb/common/ldb_controls.c | 105 --
source3/lib/ldb/common/ldb_debug.c | 104 --
source3/lib/ldb/common/ldb_dn.c | 1050 -----------
source3/lib/ldb/common/ldb_ldif.c | 760 --------
source3/lib/ldb/common/ldb_match.c | 430 -----
source3/lib/ldb/common/ldb_modules.c | 459 -----
source3/lib/ldb/common/ldb_msg.c | 829 ---------
source3/lib/ldb/common/ldb_parse.c | 818 ---------
source3/lib/ldb/common/ldb_utf8.c | 148 --
source3/lib/ldb/common/qsort.c | 252 ---
source3/lib/ldb/config.guess | 1561 ----------------
source3/lib/ldb/config.mk | 315 ----
source3/lib/ldb/config.sub | 1686 -----------------
source3/lib/ldb/configure.ac | 74 -
source3/lib/ldb/docs/builddocs.sh | 52 -
source3/lib/ldb/docs/design.txt | 41 -
source3/lib/ldb/docs/installdocs.sh | 17 -
source3/lib/ldb/examples.dox | 16 -
source3/lib/ldb/examples/ldbreader.c | 122 --
source3/lib/ldb/examples/ldifreader.c | 127 --
source3/lib/ldb/include/dlinklist.h | 181 --
source3/lib/ldb/include/includes.h | 29 -
source3/lib/ldb/include/ldb.h | 1554 ----------------
source3/lib/ldb/include/ldb_errors.h | 310 ----
source3/lib/ldb/include/ldb_private.h | 224 ---
source3/lib/ldb/install-sh | 238 ---
source3/lib/ldb/ldap.m4 | 90 -
source3/lib/ldb/ldb.pc.in | 15 -
source3/lib/ldb/ldb_ildap/ldb_ildap.c | 827 ---------
source3/lib/ldb/ldb_ldap/ldb_ldap.c | 846 ---------
source3/lib/ldb/ldb_sqlite3/README | 7 -
source3/lib/ldb/ldb_sqlite3/base160.c | 154 --
source3/lib/ldb/ldb_sqlite3/ldb_sqlite3.c | 1912 --------------------
source3/lib/ldb/ldb_sqlite3/schema | 363 ----
source3/lib/ldb/ldb_sqlite3/trees.ps | 1760 ------------------
source3/lib/ldb/ldb_tdb/ldb_cache.c | 560 ------
source3/lib/ldb/ldb_tdb/ldb_index.c | 1178 ------------
source3/lib/ldb/ldb_tdb/ldb_pack.c | 293 ---
source3/lib/ldb/ldb_tdb/ldb_search.c | 527 ------
source3/lib/ldb/ldb_tdb/ldb_tdb.c | 1087 -----------
source3/lib/ldb/ldb_tdb/ldb_tdb.h | 123 --
source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c | 141 --
source3/lib/ldb/libldb.m4 | 1 -
source3/lib/ldb/mainpage.dox | 80 -
source3/lib/ldb/man/ad2oLschema.1.xml | 87 -
source3/lib/ldb/man/ldb.3.xml | 262 ---
source3/lib/ldb/man/ldbadd.1.xml | 105 --
source3/lib/ldb/man/ldbdel.1.xml | 105 --
source3/lib/ldb/man/ldbedit.1.xml | 200 --
source3/lib/ldb/man/ldbmodify.1.xml | 93 -
source3/lib/ldb/man/ldbrename.1.xml | 107 --
source3/lib/ldb/man/ldbsearch.1.xml | 119 --
source3/lib/ldb/man/oLschema2ldif.1.xml | 79 -
source3/lib/ldb/modules/asq.c | 488 -----
source3/lib/ldb/modules/ldb_map.c | 1337 --------------
source3/lib/ldb/modules/ldb_map.h | 157 --
source3/lib/ldb/modules/ldb_map_inbound.c | 723 --------
source3/lib/ldb/modules/ldb_map_outbound.c | 1285 -------------
source3/lib/ldb/modules/ldb_map_private.h | 117 --
source3/lib/ldb/modules/objectclass.c | 693 -------
source3/lib/ldb/modules/operational.c | 311 ----
source3/lib/ldb/modules/paged_results.c | 553 ------
source3/lib/ldb/modules/paged_searches.c | 467 -----
source3/lib/ldb/modules/rdn_name.c | 342 ----
source3/lib/ldb/modules/skel.c | 136 --
source3/lib/ldb/modules/sort.c | 442 -----
source3/lib/ldb/nssldb/README.txt | 34 -
source3/lib/ldb/nssldb/ldb-grp.c | 392 ----
source3/lib/ldb/nssldb/ldb-nss.c | 400 ----
source3/lib/ldb/nssldb/ldb-nss.h | 84 -
source3/lib/ldb/nssldb/ldb-pwd.c | 215 ---
source3/lib/ldb/samba/README | 7 -
source3/lib/ldb/samba/ldif_handlers.c | 482 -----
source3/lib/ldb/sqlite3.m4 | 62 -
source3/lib/ldb/standalone.sh | 25 -
source3/lib/ldb/swig/Ldb.py | 178 --
source3/lib/ldb/swig/ldb.i | 239 ---
source3/lib/ldb/tests/init.ldif | 40 -
source3/lib/ldb/tests/init_slapd.sh | 41 -
source3/lib/ldb/tests/kill_slapd.sh | 12 -
source3/lib/ldb/tests/ldapi_url.sh | 11 -
source3/lib/ldb/tests/photo.ldif | 5 -
source3/lib/ldb/tests/samba4.png | Bin 6239 -> 0 bytes
.../ldb/tests/schema-tests/schema-add-test.ldif | 66 -
.../ldb/tests/schema-tests/schema-mod-test-1.ldif | 5 -
.../ldb/tests/schema-tests/schema-mod-test-2.ldif | 5 -
.../ldb/tests/schema-tests/schema-mod-test-3.ldif | 5 -
.../ldb/tests/schema-tests/schema-mod-test-4.ldif | 5 -
.../ldb/tests/schema-tests/schema-mod-test-5.ldif | 5 -
source3/lib/ldb/tests/schema-tests/schema.ldif | 112 --
source3/lib/ldb/tests/slapd.conf | 26 -
source3/lib/ldb/tests/start_slapd.sh | 14 -
source3/lib/ldb/tests/test-attribs.ldif | 15 -
source3/lib/ldb/tests/test-config.ldif | 67 -
source3/lib/ldb/tests/test-default-config.ldif | 17 -
source3/lib/ldb/tests/test-extended.sh | 69 -
source3/lib/ldb/tests/test-generic.sh | 128 --
source3/lib/ldb/tests/test-index.ldif | 11 -
source3/lib/ldb/tests/test-ldap.sh | 54 -
source3/lib/ldb/tests/test-modify.ldif | 23 -
source3/lib/ldb/tests/test-schema.sh | 34 -
source3/lib/ldb/tests/test-sqlite3.sh | 25 -
source3/lib/ldb/tests/test-tdb-features.sh | 119 --
source3/lib/ldb/tests/test-tdb.sh | 31 -
source3/lib/ldb/tests/test-wildcard.ldif | 5 -
source3/lib/ldb/tests/test-wrong_attributes.ldif | 3 -
source3/lib/ldb/tests/test.ldif | 411 -----
source3/lib/ldb/tests/testdata.txt | 8 -
source3/lib/ldb/tests/testsearch.txt | 5 -
source3/lib/ldb/tools/ad2oLschema.c | 624 -------
source3/lib/ldb/tools/cmdline.c | 754 --------
source3/lib/ldb/tools/cmdline.h | 53 -
source3/lib/ldb/tools/convert.c | 165 --
source3/lib/ldb/tools/convert.h | 10 -
source3/lib/ldb/tools/ldbadd.c | 118 --
source3/lib/ldb/tools/ldbdel.c | 118 --
source3/lib/ldb/tools/ldbedit.c | 330 ----
source3/lib/ldb/tools/ldbmodify.c | 120 --
source3/lib/ldb/tools/ldbrename.c | 84 -
source3/lib/ldb/tools/ldbsearch.c | 320 ----
source3/lib/ldb/tools/ldbtest.c | 407 -----
source3/lib/ldb/tools/oLschema2ldif.c | 607 -------
source3/lib/ldb/web/index.html | 85 -
source3/lib/ldb_compat.c | 682 +++++++
source3/lib/ldb_compat.h | 74 +
source3/libads/ldap.c | 1 -
137 files changed, 788 insertions(+), 39161 deletions(-)
delete mode 100644 source3/lib/ldb/Doxyfile
delete mode 100644 source3/lib/ldb/Makefile.in
delete mode 100644 source3/lib/ldb/README_gcov.txt
delete mode 100644 source3/lib/ldb/aclocal.m4
delete mode 100755 source3/lib/ldb/autogen.sh
delete mode 100644 source3/lib/ldb/common/attrib_handlers.c
delete mode 100644 source3/lib/ldb/common/ldb.c
delete mode 100644 source3/lib/ldb/common/ldb_attributes.c
delete mode 100644 source3/lib/ldb/common/ldb_controls.c
delete mode 100644 source3/lib/ldb/common/ldb_debug.c
delete mode 100644 source3/lib/ldb/common/ldb_dn.c
delete mode 100644 source3/lib/ldb/common/ldb_ldif.c
delete mode 100644 source3/lib/ldb/common/ldb_match.c
delete mode 100644 source3/lib/ldb/common/ldb_modules.c
delete mode 100644 source3/lib/ldb/common/ldb_msg.c
delete mode 100644 source3/lib/ldb/common/ldb_parse.c
delete mode 100644 source3/lib/ldb/common/ldb_utf8.c
delete mode 100644 source3/lib/ldb/common/qsort.c
delete mode 100755 source3/lib/ldb/config.guess
delete mode 100644 source3/lib/ldb/config.mk
delete mode 100755 source3/lib/ldb/config.sub
delete mode 100644 source3/lib/ldb/configure.ac
delete mode 100755 source3/lib/ldb/docs/builddocs.sh
delete mode 100644 source3/lib/ldb/docs/design.txt
delete mode 100755 source3/lib/ldb/docs/installdocs.sh
delete mode 100644 source3/lib/ldb/examples.dox
delete mode 100644 source3/lib/ldb/examples/ldbreader.c
delete mode 100644 source3/lib/ldb/examples/ldifreader.c
delete mode 100644 source3/lib/ldb/include/dlinklist.h
delete mode 100644 source3/lib/ldb/include/includes.h
delete mode 100644 source3/lib/ldb/include/ldb.h
delete mode 100644 source3/lib/ldb/include/ldb_errors.h
delete mode 100644 source3/lib/ldb/include/ldb_private.h
delete mode 100755 source3/lib/ldb/install-sh
delete mode 100644 source3/lib/ldb/ldap.m4
delete mode 100644 source3/lib/ldb/ldb.pc.in
delete mode 100644 source3/lib/ldb/ldb_ildap/ldb_ildap.c
delete mode 100644 source3/lib/ldb/ldb_ldap/ldb_ldap.c
delete mode 100644 source3/lib/ldb/ldb_sqlite3/README
delete mode 100644 source3/lib/ldb/ldb_sqlite3/base160.c
delete mode 100644 source3/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
delete mode 100644 source3/lib/ldb/ldb_sqlite3/schema
delete mode 100644 source3/lib/ldb/ldb_sqlite3/trees.ps
delete mode 100644 source3/lib/ldb/ldb_tdb/ldb_cache.c
delete mode 100644 source3/lib/ldb/ldb_tdb/ldb_index.c
delete mode 100644 source3/lib/ldb/ldb_tdb/ldb_pack.c
delete mode 100644 source3/lib/ldb/ldb_tdb/ldb_search.c
delete mode 100644 source3/lib/ldb/ldb_tdb/ldb_tdb.c
delete mode 100644 source3/lib/ldb/ldb_tdb/ldb_tdb.h
delete mode 100644 source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
delete mode 100644 source3/lib/ldb/libldb.m4
delete mode 100644 source3/lib/ldb/mainpage.dox
delete mode 100644 source3/lib/ldb/man/ad2oLschema.1.xml
delete mode 100644 source3/lib/ldb/man/ldb.3.xml
delete mode 100644 source3/lib/ldb/man/ldbadd.1.xml
delete mode 100644 source3/lib/ldb/man/ldbdel.1.xml
delete mode 100644 source3/lib/ldb/man/ldbedit.1.xml
delete mode 100644 source3/lib/ldb/man/ldbmodify.1.xml
delete mode 100644 source3/lib/ldb/man/ldbrename.1.xml
delete mode 100644 source3/lib/ldb/man/ldbsearch.1.xml
delete mode 100644 source3/lib/ldb/man/oLschema2ldif.1.xml
delete mode 100644 source3/lib/ldb/modules/asq.c
delete mode 100644 source3/lib/ldb/modules/ldb_map.c
delete mode 100644 source3/lib/ldb/modules/ldb_map.h
delete mode 100644 source3/lib/ldb/modules/ldb_map_inbound.c
delete mode 100644 source3/lib/ldb/modules/ldb_map_outbound.c
delete mode 100644 source3/lib/ldb/modules/ldb_map_private.h
delete mode 100644 source3/lib/ldb/modules/objectclass.c
delete mode 100644 source3/lib/ldb/modules/operational.c
delete mode 100644 source3/lib/ldb/modules/paged_results.c
delete mode 100644 source3/lib/ldb/modules/paged_searches.c
delete mode 100644 source3/lib/ldb/modules/rdn_name.c
delete mode 100644 source3/lib/ldb/modules/skel.c
delete mode 100644 source3/lib/ldb/modules/sort.c
delete mode 100644 source3/lib/ldb/nssldb/README.txt
delete mode 100644 source3/lib/ldb/nssldb/ldb-grp.c
delete mode 100644 source3/lib/ldb/nssldb/ldb-nss.c
delete mode 100644 source3/lib/ldb/nssldb/ldb-nss.h
delete mode 100644 source3/lib/ldb/nssldb/ldb-pwd.c
delete mode 100644 source3/lib/ldb/samba/README
delete mode 100644 source3/lib/ldb/samba/ldif_handlers.c
delete mode 100644 source3/lib/ldb/sqlite3.m4
delete mode 100755 source3/lib/ldb/standalone.sh
delete mode 100644 source3/lib/ldb/swig/Ldb.py
delete mode 100644 source3/lib/ldb/swig/ldb.i
delete mode 100644 source3/lib/ldb/tests/init.ldif
delete mode 100755 source3/lib/ldb/tests/init_slapd.sh
delete mode 100755 source3/lib/ldb/tests/kill_slapd.sh
delete mode 100755 source3/lib/ldb/tests/ldapi_url.sh
delete mode 100644 source3/lib/ldb/tests/photo.ldif
delete mode 100644 source3/lib/ldb/tests/samba4.png
delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-add-test.ldif
delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif
delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif
delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif
delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif
delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif
delete mode 100644 source3/lib/ldb/tests/schema-tests/schema.ldif
delete mode 100644 source3/lib/ldb/tests/slapd.conf
delete mode 100755 source3/lib/ldb/tests/start_slapd.sh
delete mode 100644 source3/lib/ldb/tests/test-attribs.ldif
delete mode 100644 source3/lib/ldb/tests/test-config.ldif
delete mode 100644 source3/lib/ldb/tests/test-default-config.ldif
delete mode 100755 source3/lib/ldb/tests/test-extended.sh
delete mode 100755 source3/lib/ldb/tests/test-generic.sh
delete mode 100644 source3/lib/ldb/tests/test-index.ldif
delete mode 100755 source3/lib/ldb/tests/test-ldap.sh
delete mode 100644 source3/lib/ldb/tests/test-modify.ldif
delete mode 100755 source3/lib/ldb/tests/test-schema.sh
delete mode 100755 source3/lib/ldb/tests/test-sqlite3.sh
delete mode 100644 source3/lib/ldb/tests/test-tdb-features.sh
delete mode 100755 source3/lib/ldb/tests/test-tdb.sh
delete mode 100644 source3/lib/ldb/tests/test-wildcard.ldif
delete mode 100644 source3/lib/ldb/tests/test-wrong_attributes.ldif
delete mode 100644 source3/lib/ldb/tests/test.ldif
delete mode 100644 source3/lib/ldb/tests/testdata.txt
delete mode 100644 source3/lib/ldb/tests/testsearch.txt
delete mode 100644 source3/lib/ldb/tools/ad2oLschema.c
delete mode 100644 source3/lib/ldb/tools/cmdline.c
delete mode 100644 source3/lib/ldb/tools/cmdline.h
delete mode 100644 source3/lib/ldb/tools/convert.c
delete mode 100644 source3/lib/ldb/tools/convert.h
delete mode 100644 source3/lib/ldb/tools/ldbadd.c
delete mode 100644 source3/lib/ldb/tools/ldbdel.c
delete mode 100644 source3/lib/ldb/tools/ldbedit.c
delete mode 100644 source3/lib/ldb/tools/ldbmodify.c
delete mode 100644 source3/lib/ldb/tools/ldbrename.c
delete mode 100644 source3/lib/ldb/tools/ldbsearch.c
delete mode 100644 source3/lib/ldb/tools/ldbtest.c
delete mode 100644 source3/lib/ldb/tools/oLschema2ldif.c
delete mode 100644 source3/lib/ldb/web/index.html
create mode 100644 source3/lib/ldb_compat.c
create mode 100644 source3/lib/ldb_compat.h
Changeset truncated at 500 lines:
diff --git a/libcli/ldap/ldap_ndr.c b/libcli/ldap/ldap_ndr.c
index 6f1bb4e..c176d0e 100644
--- a/libcli/ldap/ldap_ndr.c
+++ b/libcli/ldap/ldap_ndr.c
@@ -21,7 +21,11 @@
*/
#include "includes.h"
+#if _SAMBA_BUILD_ == 3
+#include "lib/ldb_compat.h"
+#else
#include "lib/ldb/include/ldb.h"
+#endif
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "libcli/ldap/ldap_ndr.h"
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b187dbd..ac936e4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -217,8 +217,6 @@ BIN_PROGS2 = bin/smbcont...@exeext@ bin/smbt...@exeext@
$(TDBBACKUP) \
BIN_PROGS3 = bin/smbpas...@exeext@ bin/rpccli...@exeext@ bin/smbca...@exeext@ \
bin/profi...@exeext@ bin/ntlm_a...@exeext@ bin/share...@exeext@ \
bin/smbcquo...@exeext@ bin/eventlog...@exeext@
-BIN_PROGS4 = bin/ldbe...@exeext@ bin/ldbsea...@exeext@ bin/ldb...@exeext@ \
- bin/ldb...@exeext@ bin/ldbmod...@exeext@ bin/ldbren...@exeext@
TORTURE_PROGS = bin/smbtort...@exeext@ bin/msgt...@exeext@ \
bin/maskt...@exeext@ bin/lockt...@exeext@ \
@@ -228,7 +226,7 @@ TORTURE_PROGS = bin/smbtort...@exeext@ bin/msgt...@exeext@ \
bin/smbconft...@exeext@ bin/v...@exeext@
BIN_PROGS = @EXTRA_BIN_PROGS@ \
- $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4)
+ $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3)
EVERYTHING_PROGS = bin/debug2h...@exeext@ bin/smbfil...@exeext@ \
$(TALLOCTORT) bin/replacet...@exeext@ \
@@ -500,7 +498,7 @@ LIBTSOCKET_OBJ = ../lib/tsocket/tsocket.o \
../lib/tsocket/tsocket_bsd.o
CLDAP_OBJ = libads/cldap.o \
- ../libcli/cldap/cldap.o \
+ ../libcli/cldap/cldap.o lib/ldb_compat.o \
../lib/util/idtree.o \
$(LIBCLI_LDAP_MESSAGE_OBJ) $(LIBCLI_LDAP_NDR_OBJ) $(LIBTSOCKET_OBJ)
@@ -826,7 +824,7 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV)
$(LIBSMB_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(AVAHI_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
$(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
- $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) \
+ $(SMBLDAP_OBJ) $(LIBNET_OBJ) \
$(LIBSMBCONF_OBJ) \
$(PRIVILEGES_BASIC_OBJ)
@@ -853,7 +851,7 @@ NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o
nmbd/nmbd_become_dmb.o \
nmbd/nmbd_subnetdb.o nmbd/nmbd_winsproxy.o nmbd/nmbd_winsserver.o \
nmbd/nmbd_workgroupdb.o nmbd/nmbd_synclists.o
-NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) $(KRBCLIENT_OBJ)
\
+NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
$(LIBNDR_GEN_OBJ0)
@@ -864,7 +862,7 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ)
$(PRINTBASE_OBJ) $(LIBSMB_O
$(LOCKING_OBJ) $(PASSDB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ)
$(LIBMSRPC_OBJ) \
- $(PASSCHANGE_OBJ) $(LDB_OBJ) $(FNAME_UTIL_OBJ)
+ $(PASSCHANGE_OBJ) $(FNAME_UTIL_OBJ)
STATUS_OBJ = utils/status.o utils/status_profile.o \
$(LOCKING_OBJ) $(PARAM_OBJ) \
@@ -879,7 +877,7 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
$(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \
$(RPC_CLIENT_OBJ1) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(LIBMSRPC_GEN_OBJ)
TESTPARM_OBJ = utils/testparm.o \
@@ -900,13 +898,12 @@ SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ)
$(PASSCHANGE_OBJ) \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) \
- $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ)
+ $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ)
PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
$(LIBSAMBA_OBJ) $(LIBTSOCKET_OBJ) \
$(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) ../lib/util/asn1.o \
- $(LDB_OBJ)
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) ../lib/util/asn1.o
SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1)
@@ -927,7 +924,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
$(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ)
$(LIBMSRPC_OBJ) \
$(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
$(LIBADS_OBJ) $(POPT_LIB_OBJ) \
- $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ)
+ $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
$(LIBREPLACE_OBJ) @BUILD_INIPARSER@
@@ -954,7 +951,7 @@ LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1)
@@ -966,7 +963,7 @@ LIBBIGBALLOFMUD_MAJOR = 0
LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ)
$(PASSDB_OBJ) \
- $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
+ $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ)
CLIENT_OBJ1 = client/client.o client/clitar.o $(RPC_CLIENT_OBJ) \
../librpc/rpc/binding.o \
@@ -977,7 +974,7 @@ CLIENT_OBJ1 = client/client.o client/clitar.o
$(RPC_CLIENT_OBJ) \
CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(READLINE_OBJ) $(POPT_LIB_OBJ) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(DISPLAY_SEC_OBJ)
LIBSMBCONF_OBJ = ../lib/smbconf/smbconf.o \
@@ -1037,14 +1034,14 @@ NET_OBJ = $(NET_OBJ1) \
$(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
- $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
+ $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
$(REG_SMBCONF_OBJ) \
$(LIBNET_OBJ) $(LIBNET_DSSYNC_OBJ) $(LIBNET_SAMSYNC_OBJ) \
$(LIBSMBCONF_OBJ) \
$(PRIVILEGES_BASIC_OBJ) \
$(LIB_EVENTLOG_OBJ) localedir.o
-CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) \
+CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(LIBNDR_GEN_OBJ0)
@@ -1056,29 +1053,29 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o
torture/scanner.o torture/uta
torture/test_posix_append.o
SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
- $(LIBSMB_OBJ) $(LDB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
+ $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
@LIBWBCLIENT_STATIC@ \
../nsswitch/libwbclient/wbc_async.o \
../nsswitch/libwbclient/wb_reqtrans.o \
$(LIBNDR_GEN_OBJ0)
-MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ)
$(KRBCLIENT_OBJ) \
+MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) \
$(LIBNDR_GEN_OBJ0)
-MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_ERR_OBJ) $(LDB_OBJ) \
+MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_ERR_OBJ) \
$(LIB_NONSMBD_OBJ) \
$(LIBNDR_GEN_OBJ0)
LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ)
\
- $(LIBSMB_OBJ) $(LDB_OBJ) $(LIB_NONSMBD_OBJ) \
+ $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBNDR_GEN_OBJ0) $(FNAME_UTIL_OBJ)
NSSTEST_OBJ = torture/nsstest.o $(LIBSAMBAUTIL_OBJ)
PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
- $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ) \
+ $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) \
$(LIBNDR_GEN_OBJ0)
VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE)
$(READLINE_OBJ)
@@ -1087,20 +1084,20 @@ SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o
$(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ
LOG2PCAP_OBJ = utils/log2pcaphex.o
-LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ)
$(LDB_OBJ) \
+LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBNDR_GEN_OBJ0) $(FNAME_UTIL_OBJ)
SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) $(LIBMSRPC_OBJ)
$(LIBMSRPC_GEN_OBJ) \
- $(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ)
$(LDB_OBJ)
+ $(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ)
SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(PARAM_OBJ) \
$(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
EVTLOGADM_OBJ0 = utils/eventlogadm.o
@@ -1127,7 +1124,7 @@ REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \
DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
-SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) \
+SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
$(LIBNDR_GEN_OBJ0)
@@ -1138,7 +1135,7 @@ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o
pam_smbpass/pam_smb_passwd.o \
pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
../lib/util/asn1.o
PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ)
$(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
- $(LDB_OBJ) $(LIBTSOCKET_OBJ)
+ $(LIBTSOCKET_OBJ)
IDMAP_OBJ = winbindd/idmap.o winbindd/idmap_util.o @IDMAP_STATIC@
@@ -1261,7 +1258,7 @@ WINBINDD_OBJ = \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
- $(LIBADS_SERVER_OBJ) $(LDB_OBJ) \
+ $(LIBADS_SERVER_OBJ) \
$(TDB_VALIDATE_OBJ)
WBINFO_OBJ = ../nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ)
$(LIB_NONSMBD_OBJ) \
@@ -1270,38 +1267,6 @@ WBINFO_OBJ = ../nsswitch/wbinfo.o $(LIBSAMBA_OBJ)
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ
WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
-LDB_COMMON_OBJ=lib/ldb/common/ldb.o lib/ldb/common/ldb_ldif.o \
- lib/ldb/common/ldb_parse.o lib/ldb/common/ldb_msg.o
lib/ldb/common/ldb_utf8.o \
- lib/ldb/common/ldb_debug.o lib/ldb/common/ldb_modules.o \
- lib/ldb/common/ldb_dn.o lib/ldb/common/ldb_match.o
lib/ldb/common/ldb_attributes.o \
- lib/ldb/common/attrib_handlers.o lib/ldb/common/ldb_controls.o
lib/ldb/common/qsort.o
-
-LDB_TDB_OBJ=lib/ldb/ldb_tdb/ldb_tdb.o \
- lib/ldb/ldb_tdb/ldb_pack.o lib/ldb/ldb_tdb/ldb_search.o
lib/ldb/ldb_tdb/ldb_index.o \
- lib/ldb/ldb_tdb/ldb_cache.o lib/ldb/ldb_tdb/ldb_tdb_wrap.o
-
-LDB_MODULES_OBJ=lib/ldb/modules/operational.o lib/ldb/modules/rdn_name.o \
- lib/ldb/modules/objectclass.o \
- lib/ldb/modules/paged_results.o lib/ldb/modules/sort.o
lib/ldb/modules/asq.o
-
-# enabled in configure.in
-ldb_ldap_o...@ldbldap@
-
-LDB_OBJ = ${LDB_COMMON_OBJ} ${LDB_TDB_OBJ} ${LDB_LDAP_OBJ} ${LDB_MODULES_OBJ}
-
-LDB_CMDLINE_OBJ = $(PARAM_OBJ) \
- $(POPT_LIB_OBJ) $(LIB_OBJ) $(LIB_DUMMY_OBJ) $(LIBSMB_ERR_OBJ0)
$(LIBSMB_ERR_OBJ1) \
- $(RPC_PARSE_OBJ1) $(SECRETS_OBJ) \
- $(LDB_OBJ) lib/ldb/tools/cmdline.o
-
-
-LDBEDIT_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbedit.o
-LDBSEARCH_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbsearch.o
-LDBADD_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbadd.o
-LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o
-LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
-LDBRENAME_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbrename.o
-
WINBIND_KRB5_LOCATOR_OBJ1 = ../nsswitch/winbind_krb5_locator.o
WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(LIBREPLACE_OBJ)
@@ -1331,7 +1296,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ)
$(POPT_LIB_OBJ) \
$(LIBADS_SERVER_OBJ) \
$(PASSDB_OBJ) $(LIBTSOCKET_OBJ) $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
- $(LDB_OBJ) $(WBCOMMON_OBJ) \
+ $(WBCOMMON_OBJ) \
$(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1) @BUILD_INIPARSER@
@@ -1344,7 +1309,7 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
$(LIBSMB_OBJ) \
$(PARAM_OBJ) \
$(PASSDB_OBJ) \
- $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
+ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(LIB_NONSMBD_OBJ) \
$(KRBCLIENT_OBJ) \
$(RPC_PARSE_OBJ2) \
@@ -1799,42 +1764,6 @@ bin/smbfil...@exeext@: $(BINARY_PREREQS)
$(SMBFILTER_OBJ) @BUILD_POPT@ $(LIBTALL
@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
-bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
$(LIBTDB) $(LIBWBCLIENT)
- @echo Linking $@
- @$(CC) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
-bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ $(LIBTALLOC)
$(LIBTDB) $(LIBWBCLIENT)
- @echo Linking $@
- @$(CC) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
-bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ $(LIBTALLOC)
$(LIBTDB) $(LIBWBCLIENT)
- @echo Linking $@
- @$(CC) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
-bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ $(LIBTALLOC)
$(LIBTDB) $(LIBWBCLIENT)
- @echo Linking $@
- @$(CC) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
-bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ $(LIBTALLOC)
$(LIBTDB) $(LIBWBCLIENT)
- @echo Linking $@
- @$(CC) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
-bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ $(LIBTALLOC)
$(LIBTDB) $(LIBWBCLIENT)
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
bin/versiontest: $(BINARY_PREREQS) lib/version_test.o $(VERSION_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(VERSION_OBJ) lib/version_test.o
@@ -2199,7 +2128,7 @@ LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
$(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \
auth/token_util.o
diff --git a/source3/configure.in b/source3/configure.in
index 30d8a43..330e2e8 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3228,8 +3228,6 @@ SMBLDAP=""
AC_SUBST(SMBLDAP)
SMBLDAPUTIL=""
AC_SUBST(SMBLDAPUTIL)
-LDBLDAP=""
-AC_SUBST(LDBLDAP)
if test x"$with_ldap_support" != x"no"; then
diff --git a/source3/lib/ldb/Doxyfile b/source3/lib/ldb/Doxyfile
deleted file mode 100644
index 07b12b5..0000000
--- a/source3/lib/ldb/Doxyfile
+++ /dev/null
@@ -1,26 +0,0 @@
-PROJECT_NAME = LDB
-OUTPUT_DIRECTORY = apidocs
-REPEAT_BRIEF = YES
-OPTIMIZE_OUTPUT_FOR_C = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-GENERATE_TODOLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-SHOW_USED_FILES = NO
-SHOW_DIRECTORIES = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-INPUT = include .
-FILE_PATTERNS = *.h *.dox
-EXCLUDE = include/config.h include/dlinklist.h \
- include/includes.h
-EXAMPLE_PATH = examples
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-GENERATE_MAN = YES
-ALWAYS_DETAILED_SEC = YES
-JAVADOC_AUTOBRIEF = YES
diff --git a/source3/lib/ldb/Makefile.in b/source3/lib/ldb/Makefile.in
deleted file mode 100644
index a091b48..0000000
--- a/source3/lib/ldb/Makefile.in
+++ /dev/null
@@ -1,173 +0,0 @@
-#!gmake
-#
-CC = @CC@
-GCOV = @GCOV@
-XSLTPROC = @XSLTPROC@
-DOXYGEN = @DOXYGEN@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
-includedir = @includedir@
-libdir = @libdir@
-bindir = @bindir@
-mandir = @mandir@
-VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
-srcdir = @srcdir@
-builddir = @builddir@
-SLAPD = @SLAPD@
-extra_o...@extra_obj@
-TESTS=test-tdb.sh @TESTS@
-
-CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
- @POPT_CFLAGS@ -...@tallocdir@ -...@tdbdir@/include -...@libreplacedir@ \
- -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@shlib...@\" -DUSE_MMAP=1 @CFLAGS@
-
-lib_fla...@ldflags@ -Llib -lldb @LIBS@ @POPT_LIBS@
-
-LDB_TDB_DIR=ldb_tdb
-LDB_TDB_OBJ=$(LDB_TDB_DIR)/ldb_tdb.o \
- $(LDB_TDB_DIR)/ldb_pack.o $(LDB_TDB_DIR)/ldb_search.o
$(LDB_TDB_DIR)/ldb_index.o \
- $(LDB_TDB_DIR)/ldb_cache.o $(LDB_TDB_DIR)/ldb_tdb_wrap.o
-
-COMDIR=common
-COMMON_OBJ=$(COMDIR)/ldb.o $(COMDIR)/ldb_ldif.o \
- $(COMDIR)/ldb_parse.o $(COMDIR)/ldb_msg.o $(COMDIR)/ldb_utf8.o \
- $(COMDIR)/ldb_debug.o $(COMDIR)/ldb_modules.o \
- $(COMDIR)/ldb_dn.o $(COMDIR)/ldb_match.o $(COMDIR)/ldb_attributes.o \
- $(COMDIR)/attrib_handlers.o $(COMDIR)/ldb_controls.o
$(COMDIR)/qsort.o
-
-MODDIR=modules
-MODULES_OBJ=$(MODDIR)/operational.o $(MODDIR)/rdn_name.o \
- $(MODDIR)/objectclass.o \
- $(MODDIR)/paged_results.o $(MODDIR)/sort.o $(MODDIR)/asq.o
-
-NSSDIR=nssldb
-NSS_OBJ= $(NSSDIR)/ldb-nss.o $(NSSDIR)/ldb-pwd.o $(NSSDIR)/ldb-grp.o
-NSS_LIB = lib/libnss_ldb.so.2
-
-OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) @TDBOBJ@ @TALLOCOBJ@
@POPTOBJ@ @LIBREPLACEOBJ@ $(EXTRA_OBJ)
-
-LDB_LIB = lib/libldb.a
-
-BINS = bin/ldbadd bin/ldbsearch bin/ldbdel bin/ldbmodify bin/ldbedit
bin/ldbrename bin/ldbtest bin/oLschema2ldif
-
-LIBS = $(LDB_LIB)
-
-EXAMPLES = examples/ldbreader examples/ldifreader
-
-DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples
-
-default: all
-
-nss: nssdir all $(NSS_LIB)
-
-nssdir:
- @mkdir -p $(NSSDIR)
-
-all: showflags dirs $(OBJS) $(LDB_LIB) $(BINS) $(EXAMPLES) manpages
-
-showflags:
- @echo 'ldb will be compiled with flags:'
- @echo ' CFLAGS = $(CFLAGS)'
- @echo ' LIBS = $(LIBS)'
-
-.c.o:
- @echo Compiling $*.c
- @mkdir -p `dirname $...@`
- @$(CC) $(CFLAGS) -c $< -o $@
-
-dirs:
- @mkdir -p $(DIRS)
-
-lib/libldb.a: $(OBJS)
- ar -rv $@ $(OBJS)
- @-ranlib $@
-
-lib/libnss_ldb.so.2: $(NSS_OBJ) $(LIBS)
- $(CC) -shared -Wl,-soname,libnss_ldb.so.2 -o lib/libnss_ldb.so.2
$(NSS_OBJ) $(OBJS) $(LIB_FLAGS)
-
-bin/ldbadd: tools/ldbadd.o tools/cmdline.o $(LIBS)
- $(CC) -o bin/ldbadd tools/ldbadd.o tools/cmdline.o $(LIB_FLAGS)
-
-bin/ldbsearch: tools/ldbsearch.o tools/cmdline.o $(LIBS)
- $(CC) -o bin/ldbsearch tools/ldbsearch.o tools/cmdline.o $(LIB_FLAGS)
-
-bin/ldbdel: tools/ldbdel.o tools/cmdline.o $(LIBS)
- $(CC) -o bin/ldbdel tools/ldbdel.o tools/cmdline.o $(LIB_FLAGS)
-
-bin/ldbmodify: tools/ldbmodify.o tools/cmdline.o $(LIBS)
- $(CC) -o bin/ldbmodify tools/ldbmodify.o tools/cmdline.o $(LIB_FLAGS)
-
-bin/ldbedit: tools/ldbedit.o tools/cmdline.o $(LIBS)
- $(CC) -o bin/ldbedit tools/ldbedit.o tools/cmdline.o $(LIB_FLAGS)
--
Samba Shared Repository
