summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2012-06-07 13:38:20 +0300
committerAlexander Bokovoy <ab@samba.org>2012-06-07 16:08:02 +0300
commit23aac2039d921abdde1a2b6e2bdb4a3d0bcab8ee (patch)
tree309c20e26effb3eb6056cd53ed3b24f3f2f1ff22 /source4
parent8778e411825ab8fe20fc6b60475615f3540ca7c3 (diff)
downloadsamba-23aac2039d921abdde1a2b6e2bdb4a3d0bcab8ee.tar.gz
samba-23aac2039d921abdde1a2b6e2bdb4a3d0bcab8ee.tar.bz2
samba-23aac2039d921abdde1a2b6e2bdb4a3d0bcab8ee.zip
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).
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/ndr/ndr.c2
-rw-r--r--source4/torture/rpc/rpc.c2
-rwxr-xr-xsource4/torture/wscript_build2
3 files changed, 3 insertions, 3 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')