X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=blobdiff_plain;f=source4%2Ftorture%2Frpc%2Fspoolss.c;h=242b3053937ad04288efb2df580fb3ecdb8ba355;hp=5303c942ce557f7eb65f17372432b5c426ea22f3;hb=a6192d766fad88cf1425d77c303d977e08fba208;hpb=cdf2f6b672a17c34e7c16cc22c179e01d8281bcf;ds=sidebyside

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 5303c942ce5..242b3053937 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -951,7 +951,7 @@ static bool test_SetPrinter(struct torture_context *tctx,
 	r.in.secdesc_ctr = secdesc_ctr;
 	r.in.command = command;
 
-	torture_comment(tctx, "Testing SetPrinter Level %d\n", r.in.info_ctr->level);
+	torture_comment(tctx, "Testing SetPrinter level %d\n", r.in.info_ctr->level);
 
 	torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx, &r),
 		"failed to call SetPrinter");
@@ -1578,7 +1578,6 @@ static bool test_sd_set_level(struct torture_context *tctx,
 			      uint32_t level,
 			      struct security_descriptor *sd)
 {
-	struct spoolss_SetPrinter r;
 	struct spoolss_SetPrinterInfoCtr info_ctr;
 	struct spoolss_DevmodeContainer devmode_ctr;
 	struct sec_desc_buf secdesc_ctr;
@@ -1635,14 +1634,8 @@ static bool test_sd_set_level(struct torture_context *tctx,
 
 	secdesc_ctr.sd = sd;
 
-	r.in.handle = handle;
-	r.in.info_ctr = &info_ctr;
-	r.in.devmode_ctr = &devmode_ctr;
-	r.in.secdesc_ctr = &secdesc_ctr;
-	r.in.command = 0;
-
-	torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx, &r), "SetPrinter failed");
-	torture_assert_werr_ok(tctx, r.out.result, "SetPrinter failed");
+	torture_assert(tctx,
+		test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0), "");
 
 	return true;
 }
@@ -1709,7 +1702,6 @@ static bool test_PrinterInfo_SD(struct torture_context *tctx,
 				struct policy_handle *handle)
 {
 	union spoolss_PrinterInfo info;
-	struct spoolss_SetPrinter r;
 	struct spoolss_SetPrinterInfo3 info3;
 	struct spoolss_SetPrinterInfoCtr info_ctr;
 	struct spoolss_DevmodeContainer devmode_ctr;
@@ -1739,14 +1731,8 @@ static bool test_PrinterInfo_SD(struct torture_context *tctx,
 
 	secdesc_ctr.sd = sd;
 
-	r.in.handle = handle;
-	r.in.info_ctr = &info_ctr;
-	r.in.devmode_ctr = &devmode_ctr;
-	r.in.secdesc_ctr = &secdesc_ctr;
-	r.in.command = 0;
-
-	torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx, &r), "SetPrinter failed");
-	torture_assert_werr_ok(tctx, r.out.result, "SetPrinter failed");
+	torture_assert(tctx,
+		test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0), "");
 
 	return ret;
 }