diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-04-12 14:14:29 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-04-15 09:34:06 +0200 |
| commit | c85884ecc889945721303818d6fa18081403b3c2 (patch) | |
| tree | 5ab6f5f992c8f647409f94dd9491776f081ee785 | |
| parent | 98464853f4c508ac26cd0f446dc1365b4c7668c7 (diff) | |
| download | samba-c85884ecc889945721303818d6fa18081403b3c2.tar.gz samba-c85884ecc889945721303818d6fa18081403b3c2.tar.bz2 samba-c85884ecc889945721303818d6fa18081403b3c2.zip | |
s4:torture/rpc/spoolss.c: check for NT_STATUS_RPC_* instead of p->last_fault_code
metze
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index fb8760ef2b..ec4cc78810 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -3251,8 +3251,7 @@ static bool test_GetPrinterDataEx(struct torture_context *tctx, status = dcerpc_spoolss_GetPrinterDataEx_r(b, tctx, &r); if (!NT_STATUS_IS_OK(status)) { - if (NT_STATUS_EQUAL(status,NT_STATUS_NET_WRITE_FAULT) && - p->last_fault_code == DCERPC_FAULT_OP_RNG_ERROR) { + if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) { torture_skip(tctx, "GetPrinterDataEx not supported by server\n"); } torture_assert_ntstatus_ok(tctx, status, "GetPrinterDataEx failed"); @@ -4693,12 +4692,9 @@ static bool test_SecondaryClosePrinter(struct torture_context *tctx, cp.out.handle = handle; status = dcerpc_spoolss_ClosePrinter_r(p2->binding_handle, tctx, &cp); - torture_assert_ntstatus_equal(tctx, status, NT_STATUS_NET_WRITE_FAULT, + torture_assert_ntstatus_equal(tctx, status, NT_STATUS_RPC_SS_CONTEXT_MISMATCH, "ERROR: Allowed close on secondary connection"); - torture_assert_int_equal(tctx, p2->last_fault_code, DCERPC_FAULT_CONTEXT_MISMATCH, - "Unexpected fault code"); - talloc_free(p2); return true; |