s3: Lift the server_messaging_context from print_job_end

diff --git a/source3/include/printing.h b/source3/include/printing.h
index 35590a30d29d55f617c9decaf8622eb6a66e8a90..8cb12e093870cb5693d733f7ea398989d5a685e6 100644 (file)
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -141,7 +141,8 @@ WERROR print_job_start(struct auth_serversupplied_info *server_info,
                       int snum, const char *docname, const char *filename,
                       struct spoolss_DeviceMode *devmode, uint32_t *_jobid);
 void print_job_endpage(int snum, uint32 jobid);
-NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type);
+NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
+                      uint32 jobid, enum file_close_type close_type);
 int print_queue_status(int snum,
                       print_queue_struct **ppqueue,
                       print_status_struct *status);

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 91ea09b28f0e668ff46bcb68c24b9abf5b836d9b..581783997bf3864992fcc8c82e66c8385bfc0df9 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2749,7 +2749,8 @@ void print_job_endpage(int snum, uint32 jobid)
  error.
 ****************************************************************************/
 
-NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type)
+NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
+                      uint32 jobid, enum file_close_type close_type)
 {
        const char* sharename = lp_const_servicename(snum);
        struct printjob *pjob;
@@ -2834,7 +2835,7 @@ NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type)
 
        /* make sure the database is up to date */
        if (print_cache_expired(lp_const_servicename(snum), True))
-               print_queue_update(server_messaging_context(), snum, False);
+               print_queue_update(msg_ctx, snum, False);
 
        return NT_STATUS_OK;
 

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index aaa88f584d75e8648c9312ff006d7296a5a426cc..b7fb70d6b845ac15db76b8509ba6aac90b26665c 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5290,7 +5290,7 @@ WERROR _spoolss_EndDocPrinter(struct pipes_struct *p,
        }
 
        Printer->document_started = false;
-       status = print_job_end(snum, Printer->jobid, NORMAL_CLOSE);
+       status = print_job_end(p->msg_ctx, snum, Printer->jobid, NORMAL_CLOSE);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(2, ("_spoolss_EndDocPrinter: "
                          "print_job_end failed [%s]\n",