CVE-2020-1472(ZeroLogon): torture: Move existing tests

Move the existing ZeroLogon tests into the ZeroLogon testsuite.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 50f1f0158b8f6a8138fc2e98ccb18edba7d3a831..83a71453a25e0f40ed3fe1a8a7459b3a49583203 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -5274,22 +5274,7 @@ struct torture_suite *torture_rpc_netlogon(TALLOC_CTX *mem_ctx)
 
        torture_rpc_tcase_add_test(tcase, "Broken RPC binding handle",
                                   test_netr_broken_binding_handle);
-       torture_rpc_tcase_add_test_creds(
-               tcase,
-               "ServerReqChallenge",
-               test_ServerReqChallenge);
-       torture_rpc_tcase_add_test_creds(
-               tcase,
-               "ServerReqChallenge_zero_challenge",
-               test_ServerReqChallenge_zero_challenge);
-       torture_rpc_tcase_add_test_creds(
-               tcase,
-               "ServerReqChallenge_5_repeats",
-               test_ServerReqChallenge_5_repeats);
-       torture_rpc_tcase_add_test_creds(
-               tcase,
-               "ServerReqChallenge_4_repeats",
-               test_ServerReqChallenge_4_repeats);
+
        return suite;
 }
 
@@ -5317,7 +5302,30 @@ struct torture_suite *torture_rpc_netlogon_zerologon(TALLOC_CTX *mem_ctx)
        struct torture_suite *suite = torture_suite_create(
                mem_ctx,
                "netlogon.zerologon");
+       struct torture_rpc_tcase *tcase;
 
+       tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(
+               suite,
+               "netlogon",
+               &ndr_table_netlogon,
+               TEST_MACHINE_NAME);
+
+       torture_rpc_tcase_add_test_creds(
+               tcase,
+               "ServerReqChallenge",
+               test_ServerReqChallenge);
+       torture_rpc_tcase_add_test_creds(
+               tcase,
+               "ServerReqChallenge_zero_challenge",
+               test_ServerReqChallenge_zero_challenge);
+       torture_rpc_tcase_add_test_creds(
+               tcase,
+               "ServerReqChallenge_5_repeats",
+               test_ServerReqChallenge_5_repeats);
+       torture_rpc_tcase_add_test_creds(
+               tcase,
+               "ServerReqChallenge_4_repeats",
+               test_ServerReqChallenge_4_repeats);
        return suite;
 }