torture: tidy up rpc.lsa OpenPolicy2 test to more clearly use torture_fail()

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 942dd5234b9db92e77a7c5d8e3b5960282fae947..27b307f2f36def774e8eb2acb3e798a355cab259 100644 (file)
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -247,22 +247,18 @@ static bool test_OpenPolicy2_fail(struct dcerpc_binding_handle *b,
                return true;
        }
 
                return true;
        }
 

-       if (!NT_STATUS_IS_OK(r.out.result)) {
-               if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_ACCESS_DENIED) ||
-                   NT_STATUS_EQUAL(r.out.result, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
-                       torture_comment(tctx,
-                                       "OpenPolicy2 correctly returned with "
-                                       "result: %s\n",
-                                       nt_errstr(r.out.result));
-                       return true;
-               }
+       if (NT_STATUS_EQUAL(r.out.result, NT_STATUS_ACCESS_DENIED) ||
+           NT_STATUS_EQUAL(r.out.result, NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED)) {
+               torture_comment(tctx,
+                               "OpenPolicy2 correctly returned with "
+                               "result: %s\n",
+                               nt_errstr(r.out.result));
+               return true;

        }
 
        }
 

-       torture_assert_ntstatus_equal(tctx,
-                                     r.out.result,
-                                     NT_STATUS_OK,
-                                     "OpenPolicy2 return value should be "
-                                     "ACCESS_DENIED");
+       torture_fail(tctx,
+                    "OpenPolicy2 return value should be "
+                    "ACCESS_DENIED or RPC_PROTSEQ_NOT_SUPPORTED");

 
        return false;
 }
 
        return false;
 }