s4-torture: Remove obsolte code in backupkey_heimdal rpc test

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Dec 10 11:54:00 CET 2015 on sn-devel-104

diff --git a/source4/torture/rpc/backupkey_heimdal.c b/source4/torture/rpc/backupkey_heimdal.c
index e8cc4a6ba00f2fe62ee72bc31dceb3895f3912d6..9c388c0f608063ddd4df96b223202ae06054f9d7 100644 (file)
--- a/source4/torture/rpc/backupkey_heimdal.c
+++ b/source4/torture/rpc/backupkey_heimdal.c
@@ -24,7 +24,6 @@
 #include "torture/rpc/torture_rpc.h"
 #include "torture/ndr/ndr.h"
 
-#ifdef SAMBA4_USES_HEIMDAL
 #include "librpc/gen_ndr/ndr_backupkey_c.h"
 #include "librpc/gen_ndr/ndr_backupkey.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
@@ -2035,21 +2034,11 @@ static bool test_ServerWrap_encrypt_decrypt_wrong_sid(struct torture_context *tc
 {
        return test_ServerWrap_decrypt_wrong_stuff(tctx, p, WRONG_SID);
 }
-#else
-static bool test_skip(struct torture_context *tctx,
-                     void *data)
-{
-       torture_skip(tctx, "Skip backupkey test with MIT Kerberos");
-
-       return true;
-}
-#endif
 
 struct torture_suite *torture_rpc_backupkey(TALLOC_CTX *mem_ctx)
 {
        struct torture_suite *suite = torture_suite_create(mem_ctx, "backupkey");
 
-#ifdef SAMBA4_USES_HEIMDAL
        struct torture_rpc_tcase *tcase;
 
        tcase = torture_suite_add_rpc_iface_tcase(suite, "backupkey",
@@ -2140,14 +2129,6 @@ struct torture_suite *torture_rpc_backupkey(TALLOC_CTX *mem_ctx)
 
        torture_rpc_tcase_add_test(tcase, "server_wrap_encrypt_decrypt_wrong_sid",
                                   test_ServerWrap_encrypt_decrypt_wrong_sid);
-#else
-       struct torture_tcase *tcase;
-
-       tcase = torture_suite_add_tcase(suite, "backupkey");
-
-       torture_tcase_add_simple_test(tcase, "skip",
-                                     test_skip);
-#endif
 
        return suite;
 }