s4:lib: merge LDB_WRAP and LDBSAMBA and make LDBSAMBA a library.

This is needed to remove samba specifc symbols from the bundled
ldb, in order to get the ABI right.

metze

Signed-off-by: Andreas Schneider <asn@samba.org>

27 files changed, 25 insertions, 36 deletions

diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 0a1ea1cc7f..3b3dae9e66 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_SUBSYSTEM('SAMDB',
 	source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c',
 	autoproto='samdb/samdb_proto.h',
 	public_deps='HEIMDAL_KRB5',
-	deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL'
+	deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL'
 	)
 
 
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 7767d053b8..34d59b53cd 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -27,7 +27,7 @@
 #include "smbd/service_stream.h"
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 
 #define VALID_DN_SYNTAX(dn) do {\
 	if (!(dn)) {\
diff --git a/source4/lib/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c
index 8bcfb58f61..d7503829b1 100644
--- a/source4/lib/ldb_wrap.c
+++ b/source4/lib/ldb-samba/ldb_wrap.c
@@ -123,7 +123,7 @@ static int ldb_wrap_destructor(struct ldb_wrap *w)
 
   TODO:  We need an error_string parameter
  */
-struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
+ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
 				     struct tevent_context *ev,
 				     struct loadparm_context *lp_ctx,
 				     const char *url,
@@ -267,7 +267,7 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
   when we fork() we need to make sure that any open ldb contexts have
   any open transactions cancelled
  */
-void ldb_wrap_fork_hook(void)
+ void ldb_wrap_fork_hook(void)
 {
 	struct ldb_wrap *w;
 
diff --git a/source4/lib/ldb_wrap.h b/source4/lib/ldb-samba/ldb_wrap.h
index 650f97d17d..650f97d17d 100644
--- a/source4/lib/ldb_wrap.h
+++ b/source4/lib/ldb-samba/ldb_wrap.h
diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build
index 15f031ba37..048cea37f4 100644
--- a/source4/lib/ldb-samba/wscript_build
+++ b/source4/lib/ldb-samba/wscript_build
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 
 
-bld.SAMBA_SUBSYSTEM('LDBSAMBA',
-	source='ldif_handlers.c',
+bld.SAMBA_LIBRARY('LDBSAMBA',
+	source='ldif_handlers.c ldb_wrap.c',
 	autoproto='ldif_handlers_proto.h',
 	public_deps='ldb',
-	deps='LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_DRSBLOBS CREDENTIALS'
+	public_headers='ldb_wrap.h',
+	deps='LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_DRSBLOBS CREDENTIALS UTIL_LDB'
 	)
 
 
diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build
index 185685cdba..de36133f05 100644
--- a/source4/lib/registry/wscript_build
+++ b/source4/lib/registry/wscript_build
@@ -13,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('TDR_REGF',
 bld.SAMBA_LIBRARY('registry',
 	source='interface.c ../../../libcli/registry/util_reg.c util.c samba.c patchfile_dotreg.c patchfile_preg.c patchfile.c regf.c hive.c local.c ldb.c dir.c rpc.c',
 	pc_files='registry.pc',
-	public_deps='LIBSAMBA-UTIL CHARSET TDR_REGF ldb RPC_NDR_WINREG LDB_WRAP',
+	public_deps='LIBSAMBA-UTIL CHARSET TDR_REGF ldb RPC_NDR_WINREG LDBSAMBA',
 	public_headers='registry.h',
 	vnum='0.0.1'
 	)
diff --git a/source4/lib/wscript_build b/source4/lib/wscript_build
index 44267629d3..49da72caca 100644
--- a/source4/lib/wscript_build
+++ b/source4/lib/wscript_build
@@ -13,14 +13,6 @@ bld.SAMBA_SUBSYSTEM('GENCACHE',
 	)
 
 
-bld.SAMBA_SUBSYSTEM('LDB_WRAP',
-	source='ldb_wrap.c',
-	public_deps='ldb',
-	public_headers='ldb_wrap.h',
-	deps='LDBSAMBA UTIL_LDB'
-	)
-
-
 bld.SAMBA_SUBSYSTEM('TDB_WRAP',
 	source='tdb_wrap.c',
 	public_deps='tdb talloc',
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 16ffb5c77d..d64e415f8c 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -23,7 +23,7 @@
 #include "libcli/cldap/cldap.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "../libds/common/flags.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index 66f73d594f..a8b53df56d 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -23,7 +23,7 @@
 #include "libcli/cldap/cldap.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "../libds/common/flags.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 1d5489cc5a..9f1f9626bf 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -34,7 +34,7 @@
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "system/time.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "auth/auth.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
index 9aa9aed5ae..5bf926b05e 100644
--- a/source4/libnet/wscript_build
+++ b/source4/libnet/wscript_build
@@ -3,7 +3,6 @@
 bld.SAMBA_SUBSYSTEM('LIBSAMBA-NET',
 	source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samdump_keytab.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c',
 	autoproto='libnet_proto.h',
-        deps = 'LDB_WRAP',
 	public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET'
 	)
 
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 81c4fb16a5..0df370b4c2 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -21,7 +21,6 @@
 #include <Python.h>
 #include "includes.h"
 #include "auth/auth.h"
-#include "lib/ldb_wrap.h"
 #include "ldb/include/ldb.h"
 #include "ldb_errors.h"
 #include "libcli/raw/libcliraw.h"
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index f3729d0550..47d82f73ea 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -35,7 +35,7 @@ bld.SAMBA_MODULE('share_ldb',
 	source='share_ldb.c',
 	subsystem='share',
 	init_function='share_ldb_init',
-	deps='ldb LDB_WRAP'
+	deps='LDBSAMBA'
 	)
 
 
diff --git a/source4/smbd/process_onefork.c b/source4/smbd/process_onefork.c
index d1688ec98a..b0e2e29bd6 100644
--- a/source4/smbd/process_onefork.c
+++ b/source4/smbd/process_onefork.c
@@ -31,7 +31,7 @@
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 
 #ifdef HAVE_SETPROCTITLE
 #ifdef HAVE_SETPROCTITLE_H
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c
index 7813189f19..fd1dc88fb1 100644
--- a/source4/smbd/process_prefork.c
+++ b/source4/smbd/process_prefork.c
@@ -31,7 +31,7 @@
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 
 #ifdef HAVE_SETPROCTITLE
 #ifdef HAVE_SETPROCTITLE_H
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index baa3136a53..6a7e8833eb 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -27,7 +27,7 @@
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 
 #ifdef HAVE_SETPROCTITLE
 #ifdef HAVE_SETPROCTITLE_H
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 68e75ca1da..217ef95128 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -39,7 +39,7 @@ bld.SAMBA_MODULE('process_model_standard',
 	source='process_standard.c',
 	subsystem='process_model',
 	init_function='process_model_standard_init',
-	deps='LIBEVENTS SETPROCTITLE'
+	deps='LIBEVENTS SETPROCTITLE LDBSAMBA'
 	)
 
 
diff --git a/source4/torture/drs/unit/schemainfo_tests.c b/source4/torture/drs/unit/schemainfo_tests.c
index a69e8a80cc..3958eb365b 100644
--- a/source4/torture/drs/unit/schemainfo_tests.c
+++ b/source4/torture/drs/unit/schemainfo_tests.c
@@ -24,7 +24,7 @@
 #include "torture/smbtorture.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "lib/ldb/include/ldb_module.h"
 #include "torture/rpc/drsuapi.h"
 #include "librpc/ndr/libndr.h"
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index 9e0ab1cb48..1d095fbf5f 100644
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -28,7 +28,7 @@
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "system/time.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "auth/auth.h"
 #include "param/param.h"
 #include "param/provision.h"
diff --git a/source4/torture/libnet/utils.c b/source4/torture/libnet/utils.c
index dcf284bb98..372482d9e8 100644
--- a/source4/torture/libnet/utils.c
+++ b/source4/torture/libnet/utils.c
@@ -29,7 +29,7 @@
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "torture/libnet/proto.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 
 /**
  * Opens handle on Domain using SAMR
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 1541d0ec84..dabf083bff 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -24,7 +24,7 @@
 #include "../tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "lib/tdb_wrap.h"
 #include "torture/smbtorture.h"
 #include "param/param.h"
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index 7d210229d8..8cf3edcdd7 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -29,7 +29,6 @@
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb_wrap.h"
 #include "torture/rpc/torture_rpc.h"
 #include "torture/drs/proto.h"
 
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index d6ed191284..49400bc105 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -30,7 +30,6 @@
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb_wrap.h"
 #include "torture/rpc/torture_rpc.h"
 #include "torture/drs/proto.h"
 #include "lib/tsocket/tsocket.h"
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 03de3bdc10..787914e46d 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -34,7 +34,7 @@
 #include "libcli/security/security.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/util/util_ldb.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "lib/replace/system/network.h"
 #include "dsdb/samdb/samdb.h"
 
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 4474e2b5f6..798e8c7d72 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -102,7 +102,7 @@ bld.SAMBA_MODULE('TORTURE_UNIX',
 bld.SAMBA_MODULE('TORTURE_LDAP',
 	source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c',
 	subsystem='smbtorture',
-	deps='LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDB_WRAP',
+	deps='LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDBSAMBA',
 	internal_module=True,
 	autoproto='ldap/proto.h',
 	init_function='torture_ldap_init'
diff --git a/source4/utils/net/drs/net_drs.c b/source4/utils/net/drs/net_drs.c
index c174bf4f98..578b6f2fc3 100644
--- a/source4/utils/net/drs/net_drs.c
+++ b/source4/utils/net/drs/net_drs.c
@@ -24,7 +24,7 @@
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "utils/net/drs/net_drs.h"
 #include "lib/ldb/include/ldb.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "system/filesys.h"
 
 
diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c
index 9d25a6aaf4..ede2485e6a 100644
--- a/source4/winbind/idmap.c
+++ b/source4/winbind/idmap.c
@@ -23,7 +23,7 @@
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/ldb/include/ldb.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "param/param.h"
 #include "winbind/idmap.h"
 #include "libcli/security/security.h"