summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGary Lockyer <gary@catalyst.net.nz>2020-09-28 09:33:35 +1300
committerAndrew Bartlett <abartlet@samba.org>2020-10-16 04:45:40 +0000
commit07c316346ae3e7778d5d6809245480f2b30275bd (patch)
tree69113da2eb1c0a4c4caa2f2d9b26fbcbe85439ea /source4
parent6f59a5fd8416bd648265b909ca45de6376747548 (diff)
downloadsamba-07c316346ae3e7778d5d6809245480f2b30275bd.tar.gz
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>
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/rpc/netlogon.c40
1 files changed, 24 insertions, 16 deletions
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 50f1f0158b8..83a71453a25 100644
--- 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;
}