summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-04 19:07:40 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-04 12:24:50 +0200
commit0ac4f6492803b58bff1d49a4b94524bc33750cd7 (patch)
tree6758672aba061ab84bb6ba40bc31d0d9a36f2ee2 /source3
parent6b97a3b1ff6a81df954e45befb72cb1af602e2c9 (diff)
downloadsamba-0ac4f6492803b58bff1d49a4b94524bc33750cd7.tar.gz
samba-0ac4f6492803b58bff1d49a4b94524bc33750cd7.tar.bz2
samba-0ac4f6492803b58bff1d49a4b94524bc33750cd7.zip
s3-build link passdb modules against libpassdb
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
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/wscript_build17
-rwxr-xr-xsource3/wscript_build4
2 files changed, 8 insertions, 13 deletions
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index c4ad73f615..94510351f8 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -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',
diff --git a/source3/wscript_build b/source3/wscript_build
index 33f242c9fe..2b4373d511 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -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())