diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-06-16 13:43:38 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2010-06-16 14:07:28 +0200 |
| commit | 6dbcffb51d979094cbdac80df5e9480475230137 (patch) | |
| tree | 31a1405822da012949a811433981bb48dde26ca3 /source4/lib | |
| parent | 8843eea2e06736f27080eedab883ffc51feacb33 (diff) | |
| download | samba-6dbcffb51d979094cbdac80df5e9480475230137.tar.gz samba-6dbcffb51d979094cbdac80df5e9480475230137.tar.bz2 samba-6dbcffb51d979094cbdac80df5e9480475230137.zip | |
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>
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb-samba/ldb_wrap.c (renamed from source4/lib/ldb_wrap.c) | 4 | ||||
| -rw-r--r-- | source4/lib/ldb-samba/ldb_wrap.h (renamed from source4/lib/ldb_wrap.h) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb-samba/wscript_build | 7 | ||||
| -rw-r--r-- | source4/lib/registry/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/wscript_build | 8 |
5 files changed, 7 insertions, 14 deletions
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', |