diff options
| -rw-r--r-- | source4/librpc/idl/spoolss.idl | 47 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_spoolss_buf.c | 17 | ||||
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 137 |
3 files changed, 198 insertions, 3 deletions
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl index 2d70372125..f8afdfd84e 100644 --- a/source4/librpc/idl/spoolss.idl +++ b/source4/librpc/idl/spoolss.idl @@ -151,14 +151,55 @@ /******************/ /* Function: 0x02 */ - WERROR spoolss_02( + WERROR spoolss_SetJob( + [in,ref] policy_handle *handle, + [in] uint32 job_id, + [in] uint32 level, + [in] uint32 command ); /******************/ /* Function: 0x03 */ - WERROR spoolss_03( + WERROR spoolss_GetJob( + [in,ref] policy_handle *handle, + [in] uint32 job_id, + [in] uint32 level, + [in] DATA_BLOB *buffer, + [out,subcontext(4),switch_is(level)] spoolss_JobInfo *info, + [in,out,ref] uint32 *buf_size ); + typedef struct { + uint16 year; + uint16 month; + uint16 day_of_week; + uint16 day; + uint16 hour; + uint16 minute; + uint16 second; + uint16 millisecond; + } spoolss_Time; + + typedef struct { + uint32 job_id; + [relative] nstring printer_name; + [relative] nstring server_name; + [relative] nstring user_name; + [relative] nstring document_name; + [relative] nstring data_type; + [relative] nstring text_status; + uint32 status; + uint32 priority; + uint32 position; + uint32 total_pages; + uint32 pages_printed; + spoolss_Time time; + } spoolss_JobInfo1; + + typedef [nodiscriminant,public] union { + [case(1)] spoolss_JobInfo1 info1; + } spoolss_JobInfo; + /******************/ /* Function: 0x04 */ WERROR spoolss_EnumJobs( @@ -168,7 +209,7 @@ [in] uint32 level, [in,out] DATA_BLOB *buffer, [in,out,ref] uint32 *buf_size, - [out] uint32 numjobs + [out] uint32 count ); /******************/ diff --git a/source4/librpc/ndr/ndr_spoolss_buf.c b/source4/librpc/ndr/ndr_spoolss_buf.c index 6c12ab2ae5..cd251112c0 100644 --- a/source4/librpc/ndr/ndr_spoolss_buf.c +++ b/source4/librpc/ndr/ndr_spoolss_buf.c @@ -57,3 +57,20 @@ NTSTATUS pull_spoolss_FormInfoArray(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, } return NT_STATUS_OK; } + +NTSTATUS pull_spoolss_JobInfoArray(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, + uint32 level, uint32 count, + union spoolss_JobInfo **info) +{ + int i; + struct ndr_pull *ndr; + ndr = ndr_pull_init_blob(blob, mem_ctx); + if (!ndr) { + return NT_STATUS_NO_MEMORY; + } + NDR_ALLOC_N(ndr, *info, count); + for (i=0;i<count;i++) { + NDR_CHECK(ndr_pull_spoolss_JobInfo(ndr, NDR_SCALARS|NDR_BUFFERS, level, &(*info)[i])); + } + return NT_STATUS_OK; +} diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index c355b8d9bc..b32250f22e 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -270,6 +270,139 @@ BOOL test_AddForm(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, return ret; } +BOOL test_GetJob(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, + struct policy_handle *handle, uint32 job_id) +{ + NTSTATUS status; + struct spoolss_GetJob r; + uint32 buf_size; + + r.in.handle = handle; + r.in.job_id = job_id; + r.in.level = 1; + r.in.buffer = NULL; + buf_size = 0; + r.in.buf_size = r.out.buf_size = &buf_size; + + printf("Testing GetJob\n"); + + status = dcerpc_spoolss_GetJob(p, mem_ctx, &r); + + if (!NT_STATUS_IS_OK(status)) { + printf("GetJob failed - %s\n", nt_errstr(status)); + return False; + } + + if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) { + DATA_BLOB blob = data_blob_talloc(mem_ctx, NULL, buf_size); + + data_blob_clear(&blob); + r.in.buffer = &blob; + + status = dcerpc_spoolss_GetJob(p, mem_ctx, &r); + + if (!r.out.info) { + printf("No job info returned"); + return False; + } + } + + return True; +} + +BOOL test_SetJob(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, + struct policy_handle *handle, uint32 job_id, uint32 command) +{ + NTSTATUS status; + struct spoolss_SetJob r; + + r.in.handle = handle; + r.in.job_id = job_id; + r.in.level = 0; + r.in.command = command; + + printf("Testing SetJob\n"); + + status = dcerpc_spoolss_SetJob(p, mem_ctx, &r); + + if (!NT_STATUS_IS_OK(status)) { + printf("SetJob failed - %s\n", nt_errstr(status)); + return False; + } + + return True; +} + +BOOL test_EnumJobs(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, + struct policy_handle *handle) +{ + NTSTATUS status; + struct spoolss_EnumJobs r; + uint32 buf_size; + + r.in.handle = handle; + r.in.firstjob = 0; + r.in.numjobs = 0xffffffff; + r.in.level = 1; + r.in.buffer = NULL; + buf_size = 0; + r.in.buf_size = &buf_size; + r.out.buf_size = &buf_size; + + printf("Testing EnumJobs\n"); + + status = dcerpc_spoolss_EnumJobs(p, mem_ctx, &r); + + if (!NT_STATUS_IS_OK(status)) { + printf("EnumJobs failed - %s\n", nt_errstr(status)); + return False; + } + + if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) { + DATA_BLOB blob = data_blob_talloc(mem_ctx, NULL, buf_size); + union spoolss_JobInfo *info; + int j; + + data_blob_clear(&blob); + r.in.buffer = &blob; + + status = dcerpc_spoolss_EnumJobs(p, mem_ctx, &r); + + if (!r.out.buffer) { + printf("No jobs returned"); + return True; + } + + status = pull_spoolss_JobInfoArray( + r.out.buffer, mem_ctx, r.in.level, r.out.count, + &info); + + if (!NT_STATUS_IS_OK(status)) { + printf("EnumJobsArray parse failed - %s\n", + nt_errstr(status)); + return False; + } + + for (j = 0; j < r.out.count; j++) { + printf("Job %d\n", j); + NDR_PRINT_UNION_DEBUG( + spoolss_JobInfo, r.in.level, &info[j]); + } + + for (j = 0; j < r.out.count; j++) { + test_GetJob(p, mem_ctx, handle, info[j].info1.job_id); + test_SetJob( + p, mem_ctx, handle, info[j].info1.job_id, 1); + } + + } else if (!W_ERROR_IS_OK(r.out.result)) { + printf("EnumJobs failed - %s\n", win_errstr(r.out.result)); + return False; + } + + return True; +} + BOOL test_EnumPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *handle) { @@ -407,6 +540,10 @@ static BOOL test_OpenPrinterEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, ret = False; } + if (!test_EnumJobs(p, mem_ctx, &handle)) { + ret = False; + } + if (!test_ClosePrinter(p, mem_ctx, &handle)) { ret = False; } |