From ef208c5571bb20a0701f1da845c07f38f84c26e1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Aug 2010 17:17:05 +0200 Subject: [PATCH] s3: Lift the server_messaging_context from print_job_endpage --- source3/include/printing.h | 3 ++- source3/printing/printing.c | 6 +++--- source3/rpc_server/srv_spoolss_nt.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source3/include/printing.h b/source3/include/printing.h index f68e7b27f20..334b7a1e71f 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 0a14a3ad424..69191ef9a84 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 367ac5931ef..5d3a0964ac7 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; } -- 2.34.1