r24900: - if we use try to create a 3rd dcerpc_pipe then use a 3rd variable

  instead of overwritting the one of the 2nd connection
- make it possible to specify the expected ntstatus for
  DsRoleGetPrimaryDomainInformation as the alter_context
  wants it to fail when used on the wrong pipe

metze
(This used to be commit c7c72ab36b15c5ffac1740b7df93fa92fe4620e9)

1 files changed, 13 insertions, 4 deletions

diff --git a/source4/torture/rpc/dssetup.c b/source4/torture/rpc/dssetup.c
index 006d69acaf..aa5f12eb92 100644
--- a/source4/torture/rpc/dssetup.c
+++ b/source4/torture/rpc/dssetup.c
@@ -25,8 +25,9 @@
 #include "torture/rpc/rpc.h"
 
 
-bool test_DsRoleGetPrimaryDomainInformation(struct torture_context *tctx, 
-					    struct dcerpc_pipe *p)
+bool test_DsRoleGetPrimaryDomainInformation_ext(struct torture_context *tctx, 
+						struct dcerpc_pipe *p,
+						NTSTATUS ext_status)
 {
 	struct dssetup_DsRoleGetPrimaryDomainInformation r;
 	NTSTATUS status;
@@ -37,13 +38,21 @@ bool test_DsRoleGetPrimaryDomainInformation(struct torture_context *tctx,
 		torture_comment(tctx, "dcerpc_dssetup_DsRoleGetPrimaryDomainInformation level %d\n", i);
 
 		status = dcerpc_dssetup_DsRoleGetPrimaryDomainInformation(p, tctx, &r);
-		torture_assert_ntstatus_ok(tctx, status, "DsRoleGetPrimaryDomainInformation failed");
-		torture_assert_werr_ok(tctx, r.out.result, "DsRoleGetPrimaryDomainInformation failed");
+		torture_assert_ntstatus_equal(tctx, ext_status, status, "DsRoleGetPrimaryDomainInformation failed");
+		if (NT_STATUS_IS_OK(ext_status)) {
+			torture_assert_werr_ok(tctx, r.out.result, "DsRoleGetPrimaryDomainInformation failed");
+		}
 	}
 
 	return true;
 }
 
+bool test_DsRoleGetPrimaryDomainInformation(struct torture_context *tctx, 
+					    struct dcerpc_pipe *p)
+{
+	return test_DsRoleGetPrimaryDomainInformation_ext(tctx, p, NT_STATUS_OK);
+}
+
 struct torture_suite *torture_rpc_dssetup(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite = torture_suite_create(mem_ctx, "DSSETUP");