diff options
| -rw-r--r-- | source4/torture/rpc/srvsvc.c | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index 4a60e600d6..6fa9d1b34b 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -99,7 +99,10 @@ static bool test_NetCharDevEnum(struct torture_context *tctx, torture_comment(tctx, "testing NetCharDevEnum level %u\n", r.in.level); status = dcerpc_srvsvc_NetCharDevEnum(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetCharDevEnum failed"); - torture_assert_werr_ok(tctx, r.out.result, "NetCharDevEnum failed"); + if (!W_ERROR_IS_OK(r.out.result)) { + torture_comment(tctx, "NetCharDevEnum failed: %s\n", win_errstr(r.out.result)); + continue; + } /* call test_NetCharDevGetInfo and test_NetCharDevControl for each returned share */ if (r.in.level == 1) { @@ -227,7 +230,10 @@ static bool test_NetCharDevQEnum(struct torture_context *tctx, torture_comment(tctx, "testing NetCharDevQEnum level %u\n", r.in.level); status = dcerpc_srvsvc_NetCharDevQEnum(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetCharDevQEnum failed"); - torture_assert_werr_ok(tctx, r.out.result, "NetCharDevQEnum failed"); + if (!W_ERROR_IS_OK(r.out.result)) { + torture_comment(tctx, "NetCharDevQEnum failed: %s\n", win_errstr(r.out.result)); + continue; + } /* call test_NetCharDevGetInfo and test_NetCharDevControl for each returned share */ if (r.in.level == 1) { @@ -270,7 +276,9 @@ static bool test_NetConnEnum(struct torture_context *tctx, torture_comment(tctx, "testing NetConnEnum level %u\n", r.in.level); status = dcerpc_srvsvc_NetConnEnum(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetConnEnum failed"); - torture_assert_werr_ok(tctx, r.out.result, "NetConnEnum failed"); + if (!W_ERROR_IS_OK(r.out.result)) { + torture_comment(tctx, "NetConnEnum failed: %s\n", win_errstr(r.out.result)); + } } return true; @@ -303,7 +311,9 @@ static bool test_NetFileEnum(struct torture_context *tctx, torture_comment(tctx, "testing NetFileEnum level %u\n", r.in.level); status = dcerpc_srvsvc_NetFileEnum(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetFileEnum failed"); - torture_assert_werr_ok(tctx, r.out.result, "NetFileEnum failed"); + if (!W_ERROR_IS_OK(r.out.result)) { + torture_comment(tctx, "NetFileEnum failed: %s\n", win_errstr(r.out.result)); + } } return true; @@ -336,7 +346,9 @@ static bool test_NetSessEnum(struct torture_context *tctx, torture_comment(tctx, "testing NetSessEnum level %u\n", r.in.level); status = dcerpc_srvsvc_NetSessEnum(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetSessEnum failed"); - torture_assert_werr_ok(tctx, r.out.result, "NetSessEnum failed"); + if (!W_ERROR_IS_OK(r.out.result)) { + torture_comment(tctx, "NetSessEnum failed: %s\n", win_errstr(r.out.result)); + } } return true; @@ -741,7 +753,7 @@ static bool test_NetShareEnumAnon(struct torture_context *tctx, /* srvsvc_NetSrv */ /**************************/ static bool test_NetSrvGetInfo(struct torture_context *tctx, - struct dcerpc_pipe *p) + struct dcerpc_pipe *p) { NTSTATUS status; struct srvsvc_NetSrvGetInfo r; @@ -761,7 +773,9 @@ static bool test_NetSrvGetInfo(struct torture_context *tctx, torture_comment(tctx, "testing NetSrvGetInfo level %u\n", r.in.level); status = dcerpc_srvsvc_NetSrvGetInfo(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetSrvGetInfo failed"); - torture_assert_werr_ok(tctx, r.out.result, "NetSrvGetInfo failed"); + if (!W_ERROR_IS_OK(r.out.result)) { + torture_comment(tctx, "NetSrvGetInfo failed: %s\n", win_errstr(r.out.result)); + } } return true; @@ -799,7 +813,7 @@ static bool test_NetDiskEnum(struct torture_context *tctx, /* srvsvc_NetTransport */ /**************************/ static bool test_NetTransportEnum(struct torture_context *tctx, - struct dcerpc_pipe *p) + struct dcerpc_pipe *p) { NTSTATUS status; struct srvsvc_NetTransportEnum r; @@ -807,7 +821,7 @@ static bool test_NetTransportEnum(struct torture_context *tctx, uint32_t levels[] = {0, 1}; int i; - r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p)); + r.in.server_unc = talloc_asprintf(tctx,"\\\\%s", dcerpc_server_name(p)); r.in.transports.ctr0 = &c0; r.in.transports.ctr0->count = 0; r.in.transports.ctr0->array = NULL; @@ -820,7 +834,9 @@ static bool test_NetTransportEnum(struct torture_context *tctx, torture_comment(tctx, "testing NetTransportEnum level %u\n", r.in.level); status = dcerpc_srvsvc_NetTransportEnum(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetTransportEnum failed"); - torture_assert_werr_ok(tctx, r.out.result, "NetTransportEnum failed"); + if (!W_ERROR_IS_OK(r.out.result)) { + torture_comment(tctx, "unexpected result: %s\n", win_errstr(r.out.result)); + } } return true; |