diff options
| -rw-r--r-- | source4/torture/ndr/ndr.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/rpc.c | 2 | ||||
| -rwxr-xr-x | source4/torture/wscript_build | 2 | ||||
| -rwxr-xr-x | wscript | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c index b446242049..1fb3bdbf05 100644 --- 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 37ff085ed9..7250eb5456 100644 --- 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 70829f54a6..5b445bdfca 100755 --- 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') @@ -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 |