s3: Lift the server_messaging_context from print_job_set_name
authorVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 15:11:23 +0000 (17:11 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 16:09:37 +0000 (18:09 +0200)
source3/include/printing.h
source3/printing/printing.c
source3/rpc_server/srv_spoolss_nt.c

index 3921b7c8fc2bbb5bfd6470e45a6f687759d1778b..66fdda6a597ef63d62344a80b98bca0f33b05f67 100644 (file)
@@ -121,7 +121,9 @@ bool print_notify_deregister_pid(int snum);
 bool print_job_exists(const char* sharename, uint32 jobid);
 char *print_job_fname(const char* sharename, uint32 jobid);
 struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid);
-bool print_job_set_name(const char *sharename, uint32 jobid, const char *name);
+bool print_job_set_name(struct tevent_context *ev,
+                       struct messaging_context *msg_ctx,
+                       const char *sharename, uint32 jobid, const char *name);
 bool print_job_get_name(TALLOC_CTX *mem_ctx, const char *sharename, uint32_t jobid, char **name);
 WERROR print_job_delete(struct auth_serversupplied_info *server_info,
                        struct messaging_context *msg_ctx,
index fe87b9bf6cebe755be06bc6b168d512722d39c0a..ff1394f02827c4899a37749790e2441d06a61c9e 100644 (file)
@@ -1974,7 +1974,9 @@ struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid
  Set the name of a job. Only possible for owner.
 ****************************************************************************/
 
-bool print_job_set_name(const char *sharename, uint32 jobid, const char *name)
+bool print_job_set_name(struct tevent_context *ev,
+                       struct messaging_context *msg_ctx,
+                       const char *sharename, uint32 jobid, const char *name)
 {
        struct printjob *pjob;
 
@@ -1983,8 +1985,7 @@ bool print_job_set_name(const char *sharename, uint32 jobid, const char *name)
                return False;
 
        fstrcpy(pjob->jobname, name);
-       return pjob_store(server_event_context(), server_messaging_context(),
-                         sharename, jobid, pjob);
+       return pjob_store(ev, msg_ctx, sharename, jobid, pjob);
 }
 
 /****************************************************************************
index 82d1795869c954fa20108e5ee93ac8f8a7b427b4..dd283caf46e6346f637896b97a0bf75e69fd673c 100644 (file)
@@ -6671,7 +6671,9 @@ static WERROR spoolss_setjob_1(TALLOC_CTX *mem_ctx,
                return WERR_OK;
        }
 
-       if (!print_job_set_name(printer_name, job_id, r->document_name)) {
+       if (!print_job_set_name(server_event_context(),
+                               server_messaging_context(),
+                               printer_name, job_id, r->document_name)) {
                return WERR_BADFID;
        }