diff options
author | Andrew Bartlett <abartlet@samba.org> | 2015-10-10 09:30:17 +1300 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2015-10-23 22:27:30 +0200 |
commit | 71dcc76b70d8e249624f9bf057fc4fd3a44125e1 (patch) | |
tree | 885ea66f041ef4b751510364131f4545a98b05a7 /wscript | |
parent | 0ccf842e12c0b5de52a89f1b6d74eba3a5e3feb5 (diff) | |
download | samba-71dcc76b70d8e249624f9bf057fc4fd3a44125e1.tar.gz |
build: Enable NTVFS file server to be omitted
We now only build it by default with --enable-sefltest, or otherwise
if requested.
The NTVFS file server still has features not present in the smbd file
server, such as a CIFS/SMB proxy, and a radically different design,
but it is also not undergoing any ongoing development so this keeps it
in a safe state for care and maintaince, with less of a security risk
if such an issue were to come up.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -53,6 +53,14 @@ def set_options(opt): help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base).', action='store_true', dest='without_ad_dc', default=False) + opt.add_option('--with-ntvfs-fileserver', + help='enable the depricated NTVFS file server from the original Samba4 branch (default if --enable-selftest specicifed). Conflicts with --with-system-mitkrb5 and --without-ad-dc', + action='store_true', dest='with_ntvfs_fileserver') + + opt.add_option('--without-ntvfs-fileserver', + help='disable the depricated NTVFS file server from the original Samba4 branch', + action='store_false', dest='with_ntvfs_fileserver') + opt.add_option('--with-pie', help=("Build Position Independent Executables " + "(default if supported by compiler)"), @@ -132,6 +140,7 @@ def configure(conf): conf.PROCESS_SEPARATE_RULE('system_mitkrb5') if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) + # Only process heimdal_build for non-MIT KRB5 builds # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set # to the lowcased output of 'krb5-config --vendor'. @@ -154,6 +163,19 @@ def configure(conf): conf.RECURSE('lib/resolv_wrapper') conf.RECURSE('lib/socket_wrapper') conf.RECURSE('lib/uid_wrapper') + if Options.options.with_ntvfs_fileserver != False: + if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): + conf.DEFINE('WITH_NTVFS_FILESERVER', 1) + if Options.options.with_ntvfs_fileserver == False: + if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): + raise Utils.WafError('--without-ntvfs-fileserver conflicts with --enable-selftest while building the AD DC') + + if Options.options.with_ntvfs_fileserver == True: + if Options.options.without_ad_dc: + raise Utils.WafError('--with-ntvfs-fileserver conflicts with --without-ad-dc') + if Options.options.with_system_mitkrb5: + raise Utils.WafError('--with-ntvfs-fileserver conflicts with --with-system-mitkrb5') + conf.DEFINE('WITH_NTVFS_FILESERVER', 1) conf.RECURSE('source3') conf.RECURSE('lib/texpect') if conf.env.with_ctdb: |