summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 17:17:05 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:38 +0200
commitef208c5571bb20a0701f1da845c07f38f84c26e1 (patch)
treef0b60dac31ed6da99a2192f79ff2a9d172035a36
parentd1f3a2efb7eef8372b7431cc5de3f8ab5d6ac981 (diff)
downloadsamba-ef208c5571bb20a0701f1da845c07f38f84c26e1.tar.gz
samba-ef208c5571bb20a0701f1da845c07f38f84c26e1.tar.bz2
samba-ef208c5571bb20a0701f1da845c07f38f84c26e1.zip
s3: Lift the server_messaging_context from print_job_endpage
-rw-r--r--source3/include/printing.h3
-rw-r--r--source3/printing/printing.c6
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/source3/include/printing.h b/source3/include/printing.h
index f68e7b27f2..334b7a1e71 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -144,7 +144,8 @@ WERROR print_job_start(struct auth_serversupplied_info *server_info,
struct messaging_context *msg_ctx,
int snum, const char *docname, const char *filename,
struct spoolss_DeviceMode *devmode, uint32_t *_jobid);
-void print_job_endpage(int snum, uint32 jobid);
+void print_job_endpage(struct messaging_context *msg_ctx,
+ int snum, uint32 jobid);
NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
uint32 jobid, enum file_close_type close_type);
int print_queue_status(struct messaging_context *msg_ctx, int snum,
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 0a14a3ad42..69191ef9a8 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2778,7 +2778,8 @@ fail:
Update the number of pages spooled to jobid
****************************************************************************/
-void print_job_endpage(int snum, uint32 jobid)
+void print_job_endpage(struct messaging_context *msg_ctx,
+ int snum, uint32 jobid)
{
const char* sharename = lp_const_servicename(snum);
struct printjob *pjob;
@@ -2791,8 +2792,7 @@ void print_job_endpage(int snum, uint32 jobid)
return;
pjob->page_count++;
- pjob_store(server_event_context(), server_messaging_context(),
- sharename, jobid, pjob);
+ pjob_store(server_event_context(), msg_ctx, sharename, jobid, pjob);
}
/****************************************************************************
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 367ac5931e..5d3a0964ac 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5196,7 +5196,7 @@ WERROR _spoolss_EndPagePrinter(struct pipes_struct *p,
return WERR_BADFID;
Printer->page_started = false;
- print_job_endpage(snum, Printer->jobid);
+ print_job_endpage(p->msg_ctx, snum, Printer->jobid);
return WERR_OK;
}