diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-07-24 16:22:12 +1200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2020-03-23 13:02:31 +0000 |
| commit | 607c9ab307db36aee0604d209a13b45d28c63d9b (patch) | |
| tree | d32f7487e0b4ecc22ec79c914cb64b213757fc8a /source3 | |
| parent | 4337c144bcbc87b73c019a510a263a9731a0bdf2 (diff) | |
| download | samba-607c9ab307db36aee0604d209a13b45d28c63d9b.tar.gz | |
build: Require --without-ad-dc for --without-ads
Building an AD DC while setting --without-ads makes no sense and just wastes compile time on our build hosts.
To allow samba-nt4 to build --without-ad-dc we set rpc.spoolss.notify
(which is built on the NTVFS fileserver for the callbacks) to run in
the ad_member environment rather than nt4_dc and ad_dc.
This is also just more realistic in any case.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/selftest/tests.py | 2 | ||||
| -rw-r--r-- | source3/wscript | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 208c89cb071..9e44c091147 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -745,6 +745,8 @@ for t in tests: elif t == "rpc.samba3.pipes_supported_interfaces": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + elif t == "rpc.spoolss.notify": + plansmbtorture4testsuite(t, "ad_member", '//$SERVER_IP/tmp -U$DC_USERNAME%$DC_PASSWORD') else: plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') diff --git a/source3/wscript b/source3/wscript index 6d5bd22ca49..48194f261a4 100644 --- a/source3/wscript +++ b/source3/wscript @@ -810,6 +810,9 @@ msg.msg_accrightslen = sizeof(fd); forced_shared_modules.extend(TO_LIST('idmap_ad idmap_rfc2307')) elif Options.options.with_ads == False: Logs.info("Building without Active Directory support (--without-ads).") + if not Options.options.without_ad_dc: + conf.fatal("Building --without-ads requires also " + "building --without-ad-dc.") else: if not use_ads_krb5: Logs.warn("Active Directory support not available: krb5 libs don't have all required features") |