X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wscript;h=57545c6a57195e15235d087b222a9cbf8f72c6b4;hb=HEAD;hp=9d928034228ce4560b3450f540e576f6d00e57d4;hpb=a9b5727632f5e6b23478af6e90ec3b3ac4a3e609;p=cs%2Fsamba-autobuild%2F.git diff --git a/wscript b/wscript index 9d928034228..57545c6a571 100644 --- a/wscript +++ b/wscript @@ -16,6 +16,8 @@ from waflib.Tools import bison samba_dist.DIST_DIRS('.') samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions') +DEFAULT_PRIVATE_LIBS = ["ldb"] + # install in /usr/local/samba by default default_prefix = Options.default_prefix = '/usr/local/samba' @@ -35,7 +37,7 @@ def system_mitkrb5_callback(option, opt, value, parser): def options(opt): opt.BUILTIN_DEFAULT('NONE') - opt.PRIVATE_EXTENSION_DEFAULT('samba4') + opt.PRIVATE_EXTENSION_DEFAULT('private-samba') opt.RECURSE('lib/replace') opt.RECURSE('dynconfig') opt.RECURSE('packaging') @@ -45,7 +47,6 @@ def options(opt): opt.RECURSE('pidl') opt.RECURSE('source3') opt.RECURSE('lib/util') - opt.RECURSE('lib/crypto') opt.RECURSE('ctdb') # Optional Libraries @@ -116,7 +117,17 @@ def options(opt): help=("Disable RELRO builds"), action="store_false", dest='enable_relro') - gr = opt.option_group('developer options') + opt.add_option('--with-kernel-keyring', + help=('Enable kernely keyring support for credential storage ' + + '(default if keyutils libraries are available)'), + action='store_true', dest='enable_keyring') + opt.add_option('--without-kernel-keyring', + help=('Disable kernely keyring support for credential storage'), + action='store_false', dest='enable_keyring') + + opt.samba_add_onoff_option('ldap') + + opt.option_group('developer options') opt.load('python') # options for disabling pyc or pyo compilation # enable options related to building python extensions @@ -170,7 +181,7 @@ def configure(conf): conf.RECURSE('examples/winexe') conf.SAMBA_CHECK_PERL(mandatory=True) - conf.find_program('xsltproc', var='XSLTPROC') + conf.CHECK_XSLTPROC_MANPAGES() if conf.env.disable_python: if not (Options.options.without_ad_dc): @@ -200,6 +211,13 @@ def configure(conf): mandatory=True) conf.CHECK_FUNCS_IN('inflateInit2', 'z') + if Options.options.enable_keyring is not False: + conf.env['WITH_KERNEL_KEYRING'] = 'auto' + if Options.options.enable_keyring is True: + conf.env['WITH_KERNEL_KEYRING'] = True + else: + conf.env['WITH_KERNEL_KEYRING'] = False + if conf.CHECK_FOR_THIRD_PARTY(): conf.RECURSE('third_party') else: @@ -240,6 +258,56 @@ def configure(conf): else: conf.define('USING_SYSTEM_PAM_WRAPPER', 1) + # Check for LDAP + if Options.options.with_ldap: + conf.CHECK_HEADERS('ldap.h lber.h ldap_pvt.h') + conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h') + conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber') + conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h') + + # if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print it out + # for the samba logs + conf.CHECK_VARIABLE('LBER_OPT_LOG_PRINT_FN', + define='HAVE_LBER_LOG_PRINT_FN', headers='lber.h') + + conf.CHECK_FUNCS_IN('ldap_init ldap_init_fd ldap_initialize ldap_set_rebind_proc', 'ldap') + conf.CHECK_FUNCS_IN('ldap_add_result_entry', 'ldap') + + # Check if ldap_set_rebind_proc() takes three arguments + if conf.CHECK_CODE('ldap_set_rebind_proc(0, 0, 0)', + 'LDAP_SET_REBIND_PROC_ARGS', + msg="Checking whether ldap_set_rebind_proc takes 3 arguments", + headers='ldap.h lber.h', link=False): + conf.DEFINE('LDAP_SET_REBIND_PROC_ARGS', '3') + else: + conf.DEFINE('LDAP_SET_REBIND_PROC_ARGS', '2') + + # last but not least, if ldap_init() exists, we want to use ldap + if conf.CONFIG_SET('HAVE_LDAP_INIT') and conf.CONFIG_SET('HAVE_LDAP_H'): + conf.DEFINE('HAVE_LDAP', '1') + conf.DEFINE('LDAP_DEPRECATED', '1') + conf.env['HAVE_LDAP'] = '1' + # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can add + # SASL wrapping hooks + if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \ + conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'): + conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1') + conf.env.ENABLE_LDAP_BACKEND = True + else: + conf.fatal("LDAP support not found. " + "Try installing libldap2-dev or openldap-devel. " + "Otherwise, use --without-ldap to build without " + "LDAP support. " + "LDAP support is required for the LDAP passdb backend, " + "LDAP idmap backends and ADS. " + "ADS support improves communication with " + "Active Directory domain controllers.") + else: + conf.SET_TARGET_TYPE('ldap', 'EMPTY') + conf.SET_TARGET_TYPE('lber', 'EMPTY') + + conf.RECURSE('lib/tdb') + conf.RECURSE('lib/tevent') conf.RECURSE('lib/ldb') if conf.CHECK_LDFLAGS(['-Wl,--wrap=test']): @@ -310,7 +378,6 @@ def configure(conf): conf.RECURSE('source4/auth') conf.RECURSE('nsswitch') conf.RECURSE('libcli/smbreadline') - conf.RECURSE('lib/crypto') conf.RECURSE('pidl') if conf.CONFIG_GET('ENABLE_SELFTEST'): if not (Options.options.without_ad_dc): @@ -326,13 +393,13 @@ def configure(conf): conf.SET_TARGET_TYPE('jansson', 'EMPTY') - if Options.options.with_json != False: + if Options.options.with_json is not False: if conf.CHECK_CFG(package='jansson', args='--cflags --libs', msg='Checking for jansson'): conf.CHECK_FUNCS_IN('json_object', 'jansson') if not conf.CONFIG_GET('HAVE_JSON_OBJECT'): - if Options.options.with_json != False: + if Options.options.with_json is not False: conf.fatal("Jansson JSON support not found. " "Try installing libjansson-dev or jansson-devel. " "Otherwise, use --without-json to build without " @@ -348,12 +415,14 @@ def configure(conf): conf.RECURSE('source3') conf.RECURSE('lib/texpect') + conf.RECURSE('lib/tsocket') conf.RECURSE('python') if conf.env.with_ctdb: conf.RECURSE('ctdb') conf.RECURSE('lib/socket') conf.RECURSE('lib/mscat') conf.RECURSE('packaging') + conf.RECURSE('lib/krb5_wrap') conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() @@ -362,7 +431,8 @@ def configure(conf): # allows us to find problems on our development hosts faster. # It also results in faster load time. - if conf.CHECK_LDFLAGS('-Wl,--as-needed'): + if (not Options.options.address_sanitizer + and conf.CHECK_LDFLAGS('-Wl,--as-needed')): conf.env.append_unique('LINKFLAGS', '-Wl,--as-needed') if not conf.CHECK_NEED_LC("-lc not needed"): @@ -374,8 +444,8 @@ def configure(conf): msg='Checking configure summary'): raise Errors.WafError('configure summary failed') - if Options.options.enable_pie != False: - if Options.options.enable_pie == True: + if Options.options.enable_pie is not False: + if Options.options.enable_pie is True: need_pie = True else: # not specified, only build PIEs if supported by compiler @@ -384,8 +454,8 @@ def configure(conf): msg="Checking compiler for PIE support"): conf.env['ENABLE_PIE'] = True - if Options.options.enable_relro != False: - if Options.options.enable_relro == True: + if Options.options.enable_relro is not False: + if Options.options.enable_relro is True: need_relro = True else: # not specified, only build RELROs if supported by compiler @@ -394,7 +464,14 @@ def configure(conf): msg="Checking compiler for full RELRO support"): conf.env['ENABLE_RELRO'] = True - if Options.options.with_smb1server != False: + if conf.CONFIG_GET('ENABLE_SELFTEST') and \ + Options.options.with_smb1server is False and \ + Options.options.without_ad_dc is not True: + conf.fatal('--without-smb1-server cannot be specified with ' + '--enable-selftest/--enable-developer if ' + '--without-ad-dc is NOT set!') + + if Options.options.with_smb1server is not False: conf.DEFINE('WITH_SMB1SERVER', '1') # @@ -429,9 +506,8 @@ def configure(conf): def etags(ctx): '''build TAGS file using etags''' - from waflib import Utils source_root = os.path.dirname(Context.g_module.root_path) - cmd = 'rm -f %s/TAGS && (find %s -name "*.[ch]" | egrep -v \.inst\. | xargs -n 100 etags -a)' % (source_root, source_root) + cmd = r'rm -f %s/TAGS && (find %s -name "*.[ch]" | egrep -v \.inst\. | xargs -n 100 etags -a)' % (source_root, source_root) print("Running: %s" % cmd) status = os.system(cmd) if os.WEXITSTATUS(status): @@ -439,9 +515,8 @@ def etags(ctx): def ctags(ctx): "build 'tags' file using ctags" - from waflib import Utils source_root = os.path.dirname(Context.g_module.root_path) - cmd = 'ctags --python-kinds=-i $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.) $(find %s -name "*.py")' % (source_root, source_root) + cmd = r'ctags --python-kinds=-i $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.) $(find %s -name "*.py")' % (source_root, source_root) print("Running: %s" % cmd) status = os.system(cmd) if os.WEXITSTATUS(status): @@ -455,28 +530,6 @@ def build(bld): samba_version.load_version(env=bld.env, is_install=bld.is_install) -def pydoctor(ctx): - '''build python apidocs''' - bp = os.path.abspath('bin/python') - mpaths = {} - modules = ['talloc', 'tdb', 'ldb'] - for m in modules: - f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r') - try: - mpaths[m] = f.read().strip() - finally: - f.close() - mpaths['main'] = bp - cmd = ('PYTHONPATH=%(main)s pydoctor --introspect-c-modules --project-name=Samba ' - '--project-url=http://www.samba.org --make-html --docformat=restructuredtext ' - '--add-package bin/python/samba ' + ''.join('--add-module %s ' % n for n in modules)) - cmd = cmd % mpaths - print("Running: %s" % cmd) - status = os.system(cmd) - if os.WEXITSTATUS(status): - raise Errors.WafError('pydoctor failed') - - def pep8(ctx): '''run pep8 validator''' cmd='PYTHONPATH=bin/python pep8 -r bin/python/samba' @@ -486,21 +539,6 @@ def pep8(ctx): raise Errors.WafError('pep8 failed') -def wafdocs(ctx): - '''build wafsamba apidocs''' - from samba_utils import recursive_dirlist - os.system('pwd') - list = recursive_dirlist('../buildtools/wafsamba', '.', pattern='*.py') - - print(list) - cmd='PYTHONPATH=bin/python pydoctor --project-name=wafsamba --project-url=http://www.samba.org --make-html --docformat=restructuredtext' +\ - "".join(' --add-module %s' % f for f in list) - print("Running: %s" % cmd) - status = os.system(cmd) - if os.WEXITSTATUS(status): - raise Errors.WafError('wafdocs failed') - - def dist(): '''makes a tarball for distribution''' sambaversion = samba_version.load_version(env=None) @@ -532,6 +570,11 @@ def distcheck(): '''test that distribution tarball builds and installs''' samba_version.load_version(env=None) +def printversion(ctx): + '''print version''' + ver = samba_version.load_version(env=None) + print('Samba Version: ' + ver.STRING_WITH_NICKNAME) + def wildcard_cmd(cmd): '''called on a unknown command''' from samba_wildcard import run_named_build_task @@ -545,7 +588,6 @@ Scripting.main = main def reconfigure(ctx): '''reconfigure if config scripts have changed''' - import samba_utils samba_utils.reconfigure(ctx)