diff options
| author | Günther Deschner <gd@samba.org> | 2013-05-27 14:15:08 +0200 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2013-05-29 11:29:50 +0200 |
| commit | 886f062e72f8ad9cddfe5fab4b2b1a36be0ea30b (patch) | |
| tree | 39cef434bfb498cc944f593d59b4d152fc6ea881 | |
| parent | b48ceef1d3031ec72018dc9bad1cf0dcb9864a56 (diff) | |
| download | samba-886f062e72f8ad9cddfe5fab4b2b1a36be0ea30b.tar.gz samba-886f062e72f8ad9cddfe5fab4b2b1a36be0ea30b.tar.bz2 samba-886f062e72f8ad9cddfe5fab4b2b1a36be0ea30b.zip | |
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
| -rw-r--r-- | source4/torture/ndr/ndr.c | 2 | ||||
| -rwxr-xr-x | source4/torture/wscript_build | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c index 9e63ff71d7..1b0f968bd2 100644 --- 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 be826104dc..c3c997ada2 100755 --- 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' ) |