waf: support --without-ad-dc for Heimdal (embedded and system) as well

--without-ad-dc was hardwired to mean --with-system-mitkrb5. With this change
it also possible to build source3/ code and source4/ client side without
building AD DC functionality using Heimdal (embedded or system).

diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index b4462420492b1e6be7464602194e544d79493715..1fb3bdbf0516e1e72f0fca79787f6c0623266411 100644 (file)
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -372,7 +372,7 @@ struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx)
        torture_suite_add_suite(suite, ndr_drsblobs_suite(suite));
        torture_suite_add_suite(suite, ndr_nbt_suite(suite));
        torture_suite_add_suite(suite, ndr_ntlmssp_suite(suite));
-#ifdef SAMBA4_USES_HEIMDAL /* Add Heimdal-specific KDC test */
+#ifdef AD_DC_BUILD_IS_ENABLED /* Add Heimdal-specific KDC test */
        torture_suite_add_suite(suite, ndr_backupkey_suite(suite));
 #endif
        torture_suite_add_suite(suite, ndr_string_suite(suite));

diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 37ff085ed96c3a10c1bc9cb6a00dcb0e1545046a..7250eb54566902f90d117f169733c590dc877af9 100644 (file)
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -528,7 +528,7 @@ NTSTATUS torture_rpc_init(void)
        torture_suite_add_simple_test(suite, "asyncbind", torture_async_bind);
        torture_suite_add_suite(suite, torture_rpc_ntsvcs(suite));
        torture_suite_add_suite(suite, torture_rpc_bind(suite));
-#ifdef SAMBA4_USES_HEIMDAL /* Add Heimdal-specific KDC test */
+#ifdef AD_DC_BUILD_IS_ENABLED /* Add Heimdal-specific KDC test */
        torture_suite_add_suite(suite, torture_rpc_backupkey(suite));
 #endif
 

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 70829f54a6fb49a4661fb069acc7e2d34d613280..5b445bdfcab3b1ac5039868002f00b8fc21e6797 100755 (executable)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -35,7 +35,7 @@ bld.RECURSE('libsmbclient')
 heimdal_specific = dict()
 heimdal_specific['ndr'] = ('','')
 heimdal_specific['rpc'] = ('','')
-if bld.CONFIG_SET('SAMBA4_USES_HEIMDAL'):
+if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
        heimdal_specific['ndr'] = (' ndr/backupkey.c','')
        heimdal_specific['rpc'] = (' rpc/backupkey.c rpc/spoolss_notify.c rpc/spoolss_win.c',
                                    ' RPC_NDR_BACKUPKEY SMB_SERVER dcerpc_server ntvfs')

diff --git a/wscript b/wscript
index 168e17dcfb7e7d446fa25d33aafa08152074eadf..cccd19377bb3e587efc2ca0d613be2d1a78d9b91 100755 (executable)
--- a/wscript
+++ b/wscript
@@ -52,8 +52,8 @@ def set_options(opt):
                    action='callback', callback=system_mitkrb5_callback, dest='with_system_mitkrb5', default=False)
 
     opt.add_option('--without-ad-dc',
-                   help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base). Requires system MIT krb5',
-                   action='store_true', dest='with_system_mitkrb5', default=False)
+                   help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base).',
+                   action='store_true', dest='without_ad_dc', default=False)
 
     gr = opt.option_group('developer options')
     gr.add_option('--enable-build-farm',
@@ -110,7 +110,7 @@ def configure(conf):
 
     if Options.options.with_system_mitkrb5:
         conf.PROCESS_SEPARATE_RULE('system_mitkrb5')
-    else:
+    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