sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4-ldbwrap: split ldb-wrap out from the LDBSAMBA subsystem

Browse Source 
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>
This commit is contained in:
Andrew Tridgell 2010-10-30 11:41:11 +11:00
parent 228803cd01
commit 04574d5738
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/dsdb/samdb/samdb.c
View File

@ -26,6 +26,7 @@
#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "lib/events/events.h"
#include "lib/ldb-samba/ldb_wrap.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
#include "libcli/security/security.h"

2
source4/dsdb/wscript_build
View File

@ -6,7 +6,7 @@ bld.SAMBA_LIBRARY('SAMDB',
source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c',
autoproto='samdb/samdb_proto.h',
public_deps='krb5',
deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA LDBSAMBA samdb-common LIBCLI_DRSUAPI LIBCLI_LDAP_NDR samba-util com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS',
deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA LDBSAMBA samdb-common LIBCLI_DRSUAPI LIBCLI_LDAP_NDR samba-util com_err authkrb5 CREDENTIALS ldbwrap',
vnum='0.0.1'
)

3
source4/lib/ldb-samba/ldb_wrap.h
View File

@ -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_ */

25
source4/lib/ldb-samba/wscript_build
View File

@ -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')

4
source4/param/wscript_build
View File

@ -37,13 +37,13 @@ bld.SAMBA_MODULE('share_ldb',
source='share_ldb.c',
subsystem='share',
init_function='share_ldb_init',
deps='LDBSAMBA'
deps='LDBSAMBA auth_system_session'
)
bld.SAMBA_SUBSYSTEM('SECRETS',
source='secrets.c',
deps='ldb TDB_WRAP UTIL_TDB NDR_SECURITY tevent LDBSAMBA'
deps='ldb TDB_WRAP UTIL_TDB NDR_SECURITY tevent ldbwrap'
)