s4-smbtorture: restructure documentname handling in spoolss test a bit.

Guenther

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 6ba1c3d40d921c9c75b8636e45017db644d0a584..3809136a351cbe9d9494df3b6833b59dd61d4639 100644 (file)
--- 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);