From c0736c70d6ab442055f998e7b1308a0536f99a95 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 13 Apr 2010 09:38:03 +0200 Subject: s4:torture/rpc: don't look at p->last_fault_code for debugging anymore metze --- source4/torture/rpc/drsuapi.h | 3 --- source4/torture/rpc/drsuapi_cracknames.c | 27 --------------------------- source4/torture/rpc/dsgetinfo.c | 3 --- source4/torture/rpc/dssync.c | 6 ------ source4/torture/rpc/testjoin.c | 3 --- 5 files changed, 42 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/rpc/drsuapi.h b/source4/torture/rpc/drsuapi.h index ba4c057873..6ce3009001 100644 --- a/source4/torture/rpc/drsuapi.h +++ b/source4/torture/rpc/drsuapi.h @@ -56,9 +56,6 @@ struct DsPrivate { NTSTATUS __nt = _ntstat; \ if (!NT_STATUS_IS_OK(__nt)) { \ const char *errstr = nt_errstr(__nt); \ - if (NT_STATUS_EQUAL(__nt, NT_STATUS_NET_WRITE_FAULT)) { \ - errstr = dcerpc_errstr(_tctx, _p->last_fault_code); \ - } \ torture_fail(tctx, talloc_asprintf(_tctx, "%s failed - %s", _msg, errstr)); \ } \ torture_assert_werr_equal(_tctx, (_pr)->out.result, _werr_expected, _msg); \ diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index 58ce4f728a..5eae0ad401 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -90,9 +90,6 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "testing DsCrackNames (matrix prep) with name '%s' from format: %d desired format:%d failed - %s", names[0].str, r.in.req->req1.format_offered, r.in.req->req1.format_desired, errstr); @@ -175,9 +172,6 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "testing DsCrackNames (matrix) with name '%s' from format: %d desired format:%d failed - %s", names[0].str, r.in.req->req1.format_offered, r.in.req->req1.format_desired, errstr); @@ -285,9 +279,6 @@ bool test_DsCrackNames(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "dcerpc_drsuapi_DsCrackNames failed - %s", errstr); torture_fail(tctx, err_msg); } else if (!W_ERROR_IS_OK(r.out.result)) { @@ -310,9 +301,6 @@ bool test_DsCrackNames(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "dcerpc_drsuapi_DsCrackNames failed - %s", errstr); torture_fail(tctx, err_msg); } else if (!W_ERROR_IS_OK(r.out.result)) { @@ -336,9 +324,6 @@ bool test_DsCrackNames(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "dcerpc_drsuapi_DsCrackNames failed - %s", errstr); torture_fail(tctx, err_msg); } else if (!W_ERROR_IS_OK(r.out.result)) { @@ -384,9 +369,6 @@ bool test_DsCrackNames(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "dcerpc_drsuapi_DsCrackNames failed - %s", errstr); torture_fail(tctx, err_msg); } else if (!W_ERROR_IS_OK(r.out.result)) { @@ -410,9 +392,6 @@ bool test_DsCrackNames(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "dcerpc_drsuapi_DsCrackNames failed - %s", errstr); torture_fail(tctx, err_msg); } else if (!W_ERROR_IS_OK(r.out.result)) { @@ -436,9 +415,6 @@ bool test_DsCrackNames(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "dcerpc_drsuapi_DsCrackNames failed - %s", errstr); torture_fail(tctx, err_msg); } else if (!W_ERROR_IS_OK(r.out.result)) { @@ -956,9 +932,6 @@ bool test_DsCrackNames(struct torture_context *tctx, status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(mem_ctx, p->last_fault_code); - } err_msg = talloc_asprintf(mem_ctx, "dcerpc_drsuapi_DsCrackNames failed - %s", errstr); torture_fail(tctx, err_msg); } else if (!W_ERROR_IS_OK(r.out.result)) { diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c index 0184905f59..31ab7d075d 100644 --- a/source4/torture/rpc/dsgetinfo.c +++ b/source4/torture/rpc/dsgetinfo.c @@ -170,9 +170,6 @@ static bool _test_DsBind(struct torture_context *tctx, status = dcerpc_drsuapi_DsBind_r(b->drs_handle, ctx, &b->req); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(ctx, b->drs_pipe->last_fault_code); - } printf("dcerpc_drsuapi_DsBind failed - %s\n", errstr); ret = false; } else if (!W_ERROR_IS_OK(b->req.out.result)) { diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index c7910862f0..0e186b3ed9 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -209,9 +209,6 @@ static bool _test_DsBind(struct torture_context *tctx, status = dcerpc_drsuapi_DsBind_r(b->drs_handle, ctx, &b->req); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(ctx, b->drs_pipe->last_fault_code); - } printf("dcerpc_drsuapi_DsBind failed - %s\n", errstr); ret = false; } else if (!W_ERROR_IS_OK(b->req.out.result)) { @@ -349,9 +346,6 @@ static bool test_GetInfo(struct torture_context *tctx, struct DsSyncTest *ctx) status = dcerpc_drsuapi_DsCrackNames_r(ctx->admin.drsuapi.drs_handle, ctx, &r); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(ctx, ctx->admin.drsuapi.drs_pipe->last_fault_code); - } printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr); return false; } else if (!W_ERROR_IS_OK(r.out.result)) { diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index 1f9064e0de..cba9093022 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -176,9 +176,6 @@ struct test_join *torture_create_testuser(struct torture_context *torture, status = dcerpc_samr_Connect_r(b, join, &c); if (!NT_STATUS_IS_OK(status)) { const char *errstr = nt_errstr(status); - if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { - errstr = dcerpc_errstr(join, join->p->last_fault_code); - } printf("samr_Connect failed - %s\n", errstr); return NULL; } -- cgit