summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-03-19 12:26:27 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-29 15:35:45 +0200
commit0590e7ef3685d629057971cf132838bf7e223ee3 (patch)
treefc202d384dd19a808f040ddab3b3bd84f5afc87f /source4
parentfd9495491d8cdefc4bdbd20d1881f43c119537c2 (diff)
downloadsamba-0590e7ef3685d629057971cf132838bf7e223ee3.tar.gz
samba-0590e7ef3685d629057971cf132838bf7e223ee3.tar.bz2
samba-0590e7ef3685d629057971cf132838bf7e223ee3.zip
s4:torture/rpc/atsvc.c: add explicit check for NTSTATUS r.out.result
Guenther Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/rpc/atsvc.c28
1 files changed, 12 insertions, 16 deletions
diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index 4b6f67cdab..52bb64b9d4 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -24,7 +24,6 @@
static bool test_JobGetInfo(struct dcerpc_pipe *p, struct torture_context *tctx, uint32_t job_id)
{
- NTSTATUS status;
struct dcerpc_binding_handle *b = p->binding_handle;
struct atsvc_JobGetInfo r;
struct atsvc_JobInfo *info = talloc(tctx, struct atsvc_JobInfo);
@@ -36,9 +35,9 @@ static bool test_JobGetInfo(struct dcerpc_pipe *p, struct torture_context *tctx,
r.in.job_id = job_id;
r.out.job_info = &info;
- status = dcerpc_atsvc_JobGetInfo_r(b, tctx, &r);
-
- torture_assert_ntstatus_ok(tctx, status, "JobGetInfo failed");
+ torture_assert_ntstatus_ok(tctx, dcerpc_atsvc_JobGetInfo_r(b, tctx, &r),
+ "JobGetInfo failed");
+ torture_assert_ntstatus_ok(tctx, r.out.result, "JobGetInfo failed");
return true;
}
@@ -46,7 +45,6 @@ static bool test_JobGetInfo(struct dcerpc_pipe *p, struct torture_context *tctx,
static bool test_JobDel(struct dcerpc_pipe *p, struct torture_context *tctx, uint32_t min_job_id,
uint32_t max_job_id)
{
- NTSTATUS status;
struct dcerpc_binding_handle *b = p->binding_handle;
struct atsvc_JobDel r;
@@ -54,16 +52,15 @@ static bool test_JobDel(struct dcerpc_pipe *p, struct torture_context *tctx, uin
r.in.min_job_id = min_job_id;
r.in.max_job_id = max_job_id;
- status = dcerpc_atsvc_JobDel_r(b, tctx, &r);
-
- torture_assert_ntstatus_ok(tctx, status, "JobDel failed");
+ torture_assert_ntstatus_ok(tctx, dcerpc_atsvc_JobDel_r(b, tctx, &r),
+ "JobDel failed");
+ torture_assert_ntstatus_ok(tctx, r.out.result, "JobDel failed");
return true;
}
static bool test_JobEnum(struct torture_context *tctx, struct dcerpc_pipe *p)
{
- NTSTATUS status;
struct dcerpc_binding_handle *b = p->binding_handle;
struct atsvc_JobEnum r;
struct atsvc_enum_ctr ctr;
@@ -79,9 +76,9 @@ static bool test_JobEnum(struct torture_context *tctx, struct dcerpc_pipe *p)
r.in.resume_handle = r.out.resume_handle = &resume_handle;
r.out.total_entries = &total_entries;
- status = dcerpc_atsvc_JobEnum_r(b, tctx, &r);
-
- torture_assert_ntstatus_ok(tctx, status, "JobEnum failed");
+ torture_assert_ntstatus_ok(tctx, dcerpc_atsvc_JobEnum_r(b, tctx, &r),
+ "JobEnum failed");
+ torture_assert_ntstatus_ok(tctx, r.out.result, "JobEnum failed");
for (i = 0; i < r.out.ctr->entries_read; i++) {
if (!test_JobGetInfo(p, tctx, r.out.ctr->first_entry[i].job_id)) {
@@ -94,7 +91,6 @@ static bool test_JobEnum(struct torture_context *tctx, struct dcerpc_pipe *p)
static bool test_JobAdd(struct torture_context *tctx, struct dcerpc_pipe *p)
{
- NTSTATUS status;
struct dcerpc_binding_handle *b = p->binding_handle;
struct atsvc_JobAdd r;
struct atsvc_JobInfo info;
@@ -107,9 +103,9 @@ static bool test_JobAdd(struct torture_context *tctx, struct dcerpc_pipe *p)
info.command = "foo.exe";
r.in.job_info = &info;
- status = dcerpc_atsvc_JobAdd_r(b, tctx, &r);
-
- torture_assert_ntstatus_ok(tctx, status, "JobAdd failed");
+ torture_assert_ntstatus_ok(tctx, dcerpc_atsvc_JobAdd_r(b, tctx, &r),
+ "JobAdd failed");
+ torture_assert_ntstatus_ok(tctx, r.out.result, "JobAdd failed");
/* Run EnumJobs again in case there were no jobs to begin with */