summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-09-23 08:54:58 +0200
committerMichael Adam <obnox@samba.org>2013-09-23 20:23:50 +0200
commit3f64a2a1f4950f18c8e06a89425093a32531badf (patch)
tree23d94106f2cc42edfda2852349652e914b4039ed /source3
parentde8aaf06937fdc4782fce25e1276c945bafb6712 (diff)
downloadsamba-3f64a2a1f4950f18c8e06a89425093a32531badf.tar.gz
samba-3f64a2a1f4950f18c8e06a89425093a32531badf.tar.bz2
samba-3f64a2a1f4950f18c8e06a89425093a32531badf.zip
build: list sources of lib pdb directly in def, removing vars=locals()
Also, remove a comment "#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC" while moving he list: lib/winbind_util.c is in fact a winbind wrapper for passdb. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/wscript_build43
1 files changed, 22 insertions, 21 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 8f54fd7690..dd889da104 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,21 +3,7 @@
from samba_utils import *
import samba_version, samba3
-PRIVILEGES_SRC = '''lib/privileges.c'''
-
-PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
-
-PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
- lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c
- lib/util_sid_passdb.c
- lib/util_unixsids.c passdb/lookup_sid.c
- passdb/login_cache.c
- passdb/account_pol.c ${PRIVILEGES_SRC}
- lib/util_nscd.c lib/winbind_util.c
- passdb/pdb_util.c passdb/pdb_interface.c
- passdb/pdb_secrets.c
- passdb/pdb_unixid.c'''
-#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
+
GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
@@ -421,19 +407,34 @@ private_pdb_match = private_pdb_match + ldapsam_pdb_match
private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match)
bld.SAMBA3_LIBRARY('pdb',
- source=PASSDB_SRC,
+ source='''passdb/pdb_get_set.c
+ passdb/passdb.c
+ lib/util_wellknown.c
+ lib/util_builtin.c
+ passdb/pdb_compat.c
+ lib/util_sid_passdb.c
+ lib/util_unixsids.c
+ passdb/lookup_sid.c
+ passdb/login_cache.c
+ passdb/account_pol.c
+ lib/privileges.c
+ lib/util_nscd.c
+ lib/winbind_util.c
+ passdb/pdb_util.c
+ passdb/pdb_interface.c
+ passdb/pdb_secrets.c
+ passdb/pdb_unixid.c''',
deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping',
private_library=False,
pc_files=[],
public_headers_install=True,
public_headers='''
- include/passdb.h
- passdb/machine_sid.h
- passdb/lookup_sid.h''',
+ include/passdb.h
+ passdb/machine_sid.h
+ passdb/lookup_sid.h''',
abi_match=private_pdb_match,
abi_directory='passdb/ABI',
- vnum='0',
- vars=locals())
+ vnum='0')
bld.SAMBA3_LIBRARY('smbldaphelper',
source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',