From 9ee5d8466513a957128fcf511529fcd76fa3f05b Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Tue, 20 Oct 2009 18:34:09 +0200 Subject: [PATCH] s4-smbtorture: Make it simpler to specify number of trusted domains to create in RPC-LSA-TRUSTED-DOMAINS. Guenther --- source4/torture/rpc/lsa.c | 57 +++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 0271fe73c5c..e4a6a8422c9 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -2137,19 +2137,20 @@ static bool test_EnumTrustDomEx(struct dcerpc_pipe *p, static bool test_CreateTrustedDomain(struct dcerpc_pipe *p, struct torture_context *tctx, - struct policy_handle *handle) + struct policy_handle *handle, + uint32_t num_trusts) { NTSTATUS status; bool ret = true; struct lsa_CreateTrustedDomain r; struct lsa_DomainInfo trustinfo; - struct dom_sid *domsid[12]; - struct policy_handle trustdom_handle[12]; + struct dom_sid **domsid; + struct policy_handle *trustdom_handle; struct lsa_QueryTrustedDomainInfo q; union lsa_TrustedDomainInfo *info = NULL; int i; - torture_comment(tctx, "\nTesting CreateTrustedDomain for 12 domains\n"); + torture_comment(tctx, "\nTesting CreateTrustedDomain for %d domains\n", num_trusts); if (!test_EnumTrustDom(p, tctx, handle)) { ret = false; @@ -2159,7 +2160,10 @@ static bool test_CreateTrustedDomain(struct dcerpc_pipe *p, ret = false; } - for (i=0; i< 12; i++) { + domsid = talloc_array(tctx, struct dom_sid *, num_trusts); + trustdom_handle = talloc_array(tctx, struct policy_handle, num_trusts); + + for (i=0; i< num_trusts; i++) { char *trust_name = talloc_asprintf(tctx, "torturedom%02d", i); char *trust_sid = talloc_asprintf(tctx, "S-1-5-21-97398-379795-100%02d", i); @@ -2226,7 +2230,7 @@ static bool test_CreateTrustedDomain(struct dcerpc_pipe *p, ret = false; } - for (i=0; i<12; i++) { + for (i=0; inum_trusts); if (!test_OpenPolicy(p, tctx)) { ret = false; @@ -2804,11 +2821,11 @@ static bool testcase_TrustedDomains(struct torture_context *tctx, ret = false; } - if (!test_CreateTrustedDomain(p, tctx, handle)) { + if (!test_CreateTrustedDomain(p, tctx, handle, state->num_trusts)) { ret = false; } - if (!test_CreateTrustedDomainEx2(p, tctx, handle)) { + if (!test_CreateTrustedDomainEx2(p, tctx, handle, state->num_trusts)) { ret = false; } @@ -2823,13 +2840,19 @@ struct torture_suite *torture_rpc_lsa_trusted_domains(TALLOC_CTX *mem_ctx) { struct torture_suite *suite; struct torture_rpc_tcase *tcase; + struct lsa_trustdom_state *state; + + state = talloc(mem_ctx, struct lsa_trustdom_state); + + state->num_trusts = 12; suite = torture_suite_create(mem_ctx, "LSA-TRUSTED-DOMAINS"); tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa", &ndr_table_lsarpc); - torture_rpc_tcase_add_test(tcase, "TrustedDomains", - testcase_TrustedDomains); + torture_rpc_tcase_add_test_ex(tcase, "TrustedDomains", + testcase_TrustedDomains, + state); return suite; } -- 2.34.1