sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

s3:wscript: fix the build without any idmap module

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Stefan Metzmacher
2015-08-13 15:04:14 +02:00
committed by Ralph Böhme
parent 345ef6b2ad
commit 5134d29cbb
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source3/winbindd/wscript_build
View File

@ -2,7 +2,7 @@
bld.SAMBA3_LIBRARY('idmap',
source='idmap.c idmap_util.c',
deps='samba-util',
deps='samba-util pdb',
allow_undefined_symbols=True,
private_library=True)
@ -16,12 +16,13 @@ bld.SAMBA3_SUBSYSTEM('IDMAP_TDB_COMMON',
bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
source='idmap_hash/idmap_hash.c idmap_hash/mapfile.c',
deps='samba-util krb5samba')
deps='samba-util krb5samba',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
source='idmap_ad.c',
deps='ads nss_info',
enabled=bld.CONFIG_SET("HAVE_LDAP"))
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
bld.SAMBA3_MODULE('idmap_ad',
subsystem='idmap',
@ -30,7 +31,7 @@ bld.SAMBA3_MODULE('idmap_ad',
deps='IDMAP_AD',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
bld.SAMBA3_MODULE('idmap_rfc2307',
subsystem='idmap',
@ -39,7 +40,7 @@ bld.SAMBA3_MODULE('idmap_rfc2307',
init_function='',
deps='ads',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_rfc2307'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rfc2307') and bld.CONFIG_SET("HAVE_LDAP"))
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rfc2307'))
bld.SAMBA3_MODULE('idmap_rid',
subsystem='idmap',
@ -141,7 +142,7 @@ bld.SAMBA3_MODULE('nss_info_rfc2307',
allow_undefined_symbols=True,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
bld.SAMBA3_MODULE('nss_info_sfu20',
subsystem='nss_info',
@ -150,7 +151,7 @@ bld.SAMBA3_MODULE('nss_info_sfu20',
allow_undefined_symbols=True,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
bld.SAMBA3_MODULE('nss_info_sfu',
subsystem='nss_info',

4
source3/wscript
View File

@ -797,6 +797,7 @@ msg.msg_accrightslen = sizeof(fd);
conf.DEFINE('WITH_ADS', '1')
conf.env['HAVE_ADS'] = '1'
Logs.info("Building with Active Directory support.")
default_shared_modules.extend(TO_LIST('idmap_ad idmap_rfc2307'))
elif Options.options.with_ads == False:
Logs.info("Building without Active Directory support (--without-ads).")
else:
@ -1589,9 +1590,8 @@ main() {
vfs_worm
vfs_crossrename vfs_linux_xfs_sgid
vfs_time_audit idmap_autorid idmap_tdb2
idmap_ad
idmap_script
idmap_rid idmap_hash idmap_rfc2307'''))
idmap_rid idmap_hash'''))
if Options.options.developer:
default_static_modules.extend(TO_LIST('charset_weird'))

1
source3/wscript_build
View File

@ -1310,6 +1310,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
LOCKING
NDR_OPEN_FILES
idmap
IDMAP_TDB_COMMON
samba-cluster-support
''',
cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,