s3: Lift the smbd_messaging_context from print_queue_resume
authorVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 12:51:40 +0000 (14:51 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 14:03:27 +0000 (16:03 +0200)
source3/include/printing.h
source3/printing/printing.c
source3/rpc_server/srv_spoolss_nt.c

index 33a1d0ff2ab6c66fbffd40922d1f1a05a1f5cc3e..fd57acec399d2fca479b01890d30aab5c8c0808a 100644 (file)
@@ -146,7 +146,8 @@ int print_queue_status(int snum,
                       print_status_struct *status);
 WERROR print_queue_pause(struct auth_serversupplied_info *server_info,
                         struct messaging_context *msg_ctx, int snum);
-WERROR print_queue_resume(struct auth_serversupplied_info *server_info, int snum);
+WERROR print_queue_resume(struct auth_serversupplied_info *server_info,
+                         struct messaging_context *msg_ctx, int snum);
 WERROR print_queue_purge(struct auth_serversupplied_info *server_info, int snum);
 
 #endif /* PRINTING_H_ */
index fbe3bdf275e4ce828ca6680bb1bc2493fdda0bf6..26679110f6bce731df0279493093075592104411 100644 (file)
@@ -3071,12 +3071,13 @@ WERROR print_queue_pause(struct auth_serversupplied_info *server_info,
  Resume a queue.
 ****************************************************************************/
 
-WERROR print_queue_resume(struct auth_serversupplied_info *server_info, int snum)
+WERROR print_queue_resume(struct auth_serversupplied_info *server_info,
+                         struct messaging_context *msg_ctx, int snum)
 {
        int ret;
        struct printif *current_printif = get_printer_fns( snum );
 
-       if (!print_access_check(server_info, smbd_messaging_context(), snum,
+       if (!print_access_check(server_info, msg_ctx, snum,
                                PRINTER_ACCESS_ADMINISTER)) {
                return WERR_ACCESS_DENIED;
        }
index 48d7fbf5207f0df3a129a86ce157e4f4a567b2ba..6d6463876af3ea93fa6cf9623f650e0fdde28835 100644 (file)
@@ -5366,7 +5366,7 @@ static WERROR control_printer(struct policy_handle *handle, uint32_t command,
                break;
        case SPOOLSS_PRINTER_CONTROL_RESUME:
        case SPOOLSS_PRINTER_CONTROL_UNPAUSE:
-               errcode = print_queue_resume(p->server_info, snum);
+               errcode = print_queue_resume(p->server_info, p->msg_ctx, snum);
                break;
        case SPOOLSS_PRINTER_CONTROL_PURGE:
                errcode = print_queue_purge(p->server_info, snum);