From 7755e196a15ada80505c3ffd77b41c20e60b69ec Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 16 Jul 2010 22:41:32 +0200 Subject: s4-smbtorture: make sure to wipe out dcerpc auth flags before RPC-BIND starts. Guenther --- source4/torture/rpc/bind.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/rpc') diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c index b36e54cac0..909596d1cd 100644 --- a/source4/torture/rpc/bind.c +++ b/source4/torture/rpc/bind.c @@ -52,6 +52,7 @@ static bool test_bind(struct torture_context *tctx, torture_rpc_binding(tctx, &binding), "failed to parse binding string"); + binding->flags &= ~DCERPC_AUTH_OPTIONS; binding->flags |= *flags; torture_assert_ntstatus_ok(tctx, -- cgit From 1c7d08990469cc41e07e11e3d3d714021753f7e2 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 16 Jul 2010 22:42:11 +0200 Subject: s4-smbtorture: rearrange testlist in RPC-BIND. Guenther --- source4/torture/rpc/bind.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'source4/torture/rpc') diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c index 909596d1cd..c2bd60143d 100644 --- a/source4/torture/rpc/bind.c +++ b/source4/torture/rpc/bind.c @@ -87,11 +87,29 @@ static void test_bind_op(struct torture_suite *suite, struct torture_suite *torture_rpc_bind(TALLOC_CTX *mem_ctx) { struct torture_suite *suite = torture_suite_create(mem_ctx, "BIND"); - - test_bind_op(suite, "ntlm,sign", DCERPC_AUTH_NTLM | DCERPC_SIGN); - test_bind_op(suite, "ntlm,sign,seal", DCERPC_AUTH_NTLM | DCERPC_SIGN | DCERPC_SEAL); - test_bind_op(suite, "spnego,sign", DCERPC_AUTH_SPNEGO | DCERPC_SIGN); - test_bind_op(suite, "spnego,sign,seal", DCERPC_AUTH_SPNEGO | DCERPC_SIGN | DCERPC_SEAL); + struct { + const char *test_name; + uint32_t flags; + } tests[] = { + { + .test_name = "ntlm,sign", + .flags = DCERPC_AUTH_NTLM | DCERPC_SIGN + },{ + .test_name = "ntlm,sign,seal", + .flags = DCERPC_AUTH_NTLM | DCERPC_SIGN | DCERPC_SEAL + },{ + .test_name = "spnego,sign", + .flags = DCERPC_AUTH_SPNEGO | DCERPC_SIGN + },{ + .test_name = "spnego,sign,seal", + .flags = DCERPC_AUTH_SPNEGO | DCERPC_SIGN | DCERPC_SEAL + } + }; + int i; + + for (i=0; i < ARRAY_SIZE(tests); i++) { + test_bind_op(suite, tests[i].test_name, tests[i].flags); + } return suite; } -- cgit From 3b0c87cf319b562aeb1f5e12135905d6d57e926f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 16 Jul 2010 22:46:58 +0200 Subject: s4-smbtorture: run all testcases with bigendian push as well in RPC-BIND. Guenther --- source4/torture/rpc/bind.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source4/torture/rpc') diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c index c2bd60143d..f6470595e3 100644 --- a/source4/torture/rpc/bind.c +++ b/source4/torture/rpc/bind.c @@ -110,6 +110,9 @@ struct torture_suite *torture_rpc_bind(TALLOC_CTX *mem_ctx) for (i=0; i < ARRAY_SIZE(tests); i++) { test_bind_op(suite, tests[i].test_name, tests[i].flags); } + for (i=0; i < ARRAY_SIZE(tests); i++) { + test_bind_op(suite, talloc_asprintf(suite, "bigendian,%s", tests[i].test_name), tests[i].flags | DCERPC_PUSH_BIGENDIAN); + } return suite; } -- cgit