diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-30 11:41:11 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-30 23:49:01 +1100 |
| commit | 04574d5738bb6a3bed3f6ee536b93068517263d8 (patch) | |
| tree | c52bf09a3b305373903637d9b6b86393c9450765 /source4/lib/ldb-samba | |
| parent | 228803cd015e54362e988e168a9976f6b7a27f85 (diff) | |
| download | samba-04574d5738bb6a3bed3f6ee536b93068517263d8.tar.gz samba-04574d5738bb6a3bed3f6ee536b93068517263d8.tar.xz samba-04574d5738bb6a3bed3f6ee536b93068517263d8.zip | |
s4-ldbwrap: split ldb-wrap out from the LDBSAMBA subsystem
ldb-wrap and the ldif-handlers are not really related, and this allows
us to remove another dependency loop
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/lib/ldb-samba')
| -rw-r--r-- | source4/lib/ldb-samba/ldb_wrap.h | 3 | ||||
| -rw-r--r-- | source4/lib/ldb-samba/wscript_build | 25 |
2 files changed, 19 insertions, 9 deletions
diff --git a/source4/lib/ldb-samba/ldb_wrap.h b/source4/lib/ldb-samba/ldb_wrap.h index 531aa9ac70..4d2539fff5 100644 --- a/source4/lib/ldb-samba/ldb_wrap.h +++ b/source4/lib/ldb-samba/ldb_wrap.h @@ -64,4 +64,7 @@ char *ldb_relative_path(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, const char *name); +int samba_ldb_connect(struct ldb_context *ldb, struct loadparm_context *lp_ctx, + const char *url, int flags); + #endif /* _LDB_WRAP_H_ */ diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index adfd949fcb..7a07bc524e 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -4,15 +4,22 @@ # as a built-in module and this delutes the symbols in the ldb library with # the symbols of all of ldb_ildap's dependencies. -bld.SAMBA_SUBSYSTEM('LDBSAMBA', - source='ldif_handlers.c ldb_wrap.c', - autoproto='ldif_handlers_proto.h', - public_deps='ldb', - public_headers='ldb_wrap.h', - deps='security ndr NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB' - ) +bld.SAMBA_LIBRARY('LDBSAMBA', + source='ldif_handlers.c', + autoproto='ldif_handlers_proto.h', + public_deps='ldb', + public_headers='ldb_wrap.h', + deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA', + private_library=True + ) + +bld.SAMBA_SUBSYSTEM('ldbwrap', + source='ldb_wrap.c', + public_headers='ldb_wrap.h', + deps='ldb samba-util LDBSAMBA samba-hostconfig' + ) bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c', - deps='LDBSAMBA pyparam_util', - realname='samba/_ldb.so') + deps='LDBSAMBA pyparam_util ldbwrap', + realname='samba/_ldb.so') |