summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-04-20 17:53:43 +0200
committerGünther Deschner <gd@samba.org>2011-04-20 17:54:11 +0200
commitc8f9515f193e634da2ef01c525e2a05a3d519862 (patch)
tree5e3e699112a6adb5a0f4889fcdb02a5165409d59
parent0cf9b47725b50fd916a7ca56ca3f7e9c9263411a (diff)
downloadsamba-c8f9515f193e634da2ef01c525e2a05a3d519862.tar.gz
samba-c8f9515f193e634da2ef01c525e2a05a3d519862.tar.xz
samba-c8f9515f193e634da2ef01c525e2a05a3d519862.zip
s4-smbtorture: restructure documentname handling in spoolss test a bit.
Guenther
-rw-r--r--source4/torture/rpc/spoolss.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 6ba1c3d40d..3809136a35 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3256,6 +3256,7 @@ static bool test_EnumJobs_args(struct torture_context *tctx,
static bool test_DoPrintTest_add_one_job(struct torture_context *tctx,
struct dcerpc_binding_handle *b,
struct policy_handle *handle,
+ const char *document_name,
uint32_t *job_id)
{
NTSTATUS status;
@@ -3274,7 +3275,7 @@ static bool test_DoPrintTest_add_one_job(struct torture_context *tctx,
s.in.level = 1;
s.in.info.info1 = &info1;
s.out.job_id = job_id;
- info1.document_name = "TorturePrintJob";
+ info1.document_name = document_name;
info1.output_file = NULL;
info1.datatype = "RAW";
@@ -3417,7 +3418,7 @@ static bool test_DoPrintTest(struct torture_context *tctx,
job_ids = talloc_zero_array(tctx, uint32_t, num_jobs);
for (i=0; i < num_jobs; i++) {
- ret &= test_DoPrintTest_add_one_job(tctx, b, handle, &job_ids[i]);
+ ret &= test_DoPrintTest_add_one_job(tctx, b, handle, "TorturePrintJob", &job_ids[i]);
}
for (i=0; i < num_jobs; i++) {
@@ -3444,7 +3445,7 @@ static bool test_DoPrintTest_extended(struct torture_context *tctx,
job_ids = talloc_zero_array(tctx, uint32_t, num_jobs);
for (i=0; i < num_jobs; i++) {
- ret &= test_DoPrintTest_add_one_job(tctx, b, handle, &job_ids[i]);
+ ret &= test_DoPrintTest_add_one_job(tctx, b, handle, "TorturePrintJob", &job_ids[i]);
}
ret &= test_DoPrintTest_check_jobs(tctx, b, handle, num_jobs, job_ids);