sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3-build link passdb modules against libpassdb

Browse Source 
This ensures that they don't include a duplicate copy of
pdb_interface.c functions, because they will instead link the library.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Jul  4 12:24:50 CEST 2011 on sn-devel-104
This commit is contained in:
Andrew Bartlett 2011-07-04 19:07:40 +10:00
parent 6b97a3b1ff
commit 0ac4f64928
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/passdb/wscript_build
View File

@ -6,13 +6,8 @@ PDB_ADS_SRC = 'pdb_ads.c'
PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
bld.SAMBA3_SUBSYSTEM('pdb',
source='pdb_interface.c',
deps='',
vars=locals())
bld.SAMBA3_MODULE('pdb_tdbsam',
subsystem='pdb',
subsystem='passdb',
source=PDB_TDBSAM_SRC,
deps='samba-util tdb',
init_function='',
@ -20,14 +15,14 @@ bld.SAMBA3_MODULE('pdb_tdbsam',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
bld.SAMBA3_MODULE('pdb_ldap',
subsystem='pdb',
subsystem='passdb',
source=PDB_LDAP_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.env.HAVE_LDAP)
bld.SAMBA3_MODULE('pdb_ads',
subsystem='pdb',
subsystem='passdb',
source=PDB_ADS_SRC,
deps='cli-ldap-common TLDAP',
init_function='',
@ -35,7 +30,7 @@ bld.SAMBA3_MODULE('pdb_ads',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ads'))
bld.SAMBA3_MODULE('pdb_smbpasswd',
subsystem='pdb',
subsystem='passdb',
source=PDB_SMBPASSWD_SRC,
deps='samba-util',
init_function='',
@ -43,7 +38,7 @@ bld.SAMBA3_MODULE('pdb_smbpasswd',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_smbpasswd'))
bld.SAMBA3_MODULE('pdb_wbc_sam',
subsystem='pdb',
subsystem='passdb',
source=PDB_WBC_SAM_SRC,
deps='samba-util',
init_function='',
@ -51,7 +46,7 @@ bld.SAMBA3_MODULE('pdb_wbc_sam',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_wbc_sam'))
bld.SAMBA3_MODULE('pdb_samba4',
subsystem='pdb',
subsystem='passdb',
source='pdb_samba4.c',
init_function='',
deps='IDMAP samdb',

4
source3/wscript_build
View File

@ -223,7 +223,7 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
passdb/login_cache.c
passdb/account_pol.c ${PRIVILEGES_SRC}
lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}
passdb/pdb_util.c'''
passdb/pdb_util.c passdb/pdb_interface.c'''
#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
@ -721,7 +721,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
bld.SAMBA3_LIBRARY('passdb',
source=PASSDB_SRC,
deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH flag_mapping',
deps='SECRETS3 SMBLDAP GROUPDB wbclient LIBCLI_AUTH flag_mapping',
private_library=True,
vars=locals())