s3: Lift the smbd_messaging_context from print_queue_purge

diff --git a/source3/include/printing.h b/source3/include/printing.h
index fd57acec399d2fca479b01890d30aab5c8c0808a..95b0ec62790508145d2ed977cc2c11f298a396db 100644 (file)
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -148,6 +148,7 @@ 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,
                          struct messaging_context *msg_ctx, int snum);
-WERROR print_queue_purge(struct auth_serversupplied_info *server_info, int snum);
+WERROR print_queue_purge(struct auth_serversupplied_info *server_info,
+                        struct messaging_context *msg_ctx, int snum);
 
 #endif /* PRINTING_H_ */

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 26679110f6bce731df0279493093075592104411..9d98d5dff19a6774efc5ac8b2222ba1921474187 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -3107,7 +3107,8 @@ WERROR print_queue_resume(struct auth_serversupplied_info *server_info,
  Purge a queue - implemented by deleting all jobs that we can delete.
 ****************************************************************************/
 
-WERROR print_queue_purge(struct auth_serversupplied_info *server_info, int snum)
+WERROR print_queue_purge(struct auth_serversupplied_info *server_info,
+                        struct messaging_context *msg_ctx, int snum)
 {
        print_queue_struct *queue;
        print_status_struct status;
@@ -3118,7 +3119,7 @@ WERROR print_queue_purge(struct auth_serversupplied_info *server_info, int snum)
        print_queue_update(snum, True);
 
        can_job_admin = print_access_check(server_info,
-                                          smbd_messaging_context(),
+                                          msg_ctx,
                                           snum,
                                           JOB_ACCESS_ADMINISTER);
        njobs = print_queue_status(snum, &queue, &status);

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 6d6463876af3ea93fa6cf9623f650e0fdde28835..ac95486d562969ddfa86f9d10c10574035bb9f2c 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5369,7 +5369,7 @@ static WERROR control_printer(struct policy_handle *handle, uint32_t command,
                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);
+               errcode = print_queue_purge(p->server_info, p->msg_ctx, snum);
                break;
        default:
                return WERR_UNKNOWN_LEVEL;