s4-torture: Always compile backupkey ndr testsuite.

This removes another incorrect AD_DC_BUILD_IS_ENABLED check ifdef check. The ndr
test is not at all heimdal specific.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Wed May 29 11:29:51 CEST 2013 on sn-devel-104

diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index 9e63ff71d7c57725cd4649dc2a88cfacdae37928..1b0f968bd2d6d28ec3ab888d44e6356806b25ebf 100644 (file)
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -398,9 +398,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 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));
 
        torture_suite_add_simple_test(suite, "string terminator",

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index be826104dca7095989c5f59f5176d57dc414eb07..c3c997ada28718855bd85379e581a69f83f2567d 100755 (executable)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -36,12 +36,11 @@ heimdal_specific = dict()
 heimdal_specific['ndr'] = ('','')
 heimdal_specific['rpc'] = ('','')
 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_NDR_BACKUPKEY SMB_SERVER dcerpc_server ntvfs')
 
 bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
-       source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/string.c'+heimdal_specific['ndr'][0],
+       source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/string.c ndr/backupkey.c',
        autoproto='ndr/proto.h',
        deps='torture'
        )