From a4c27786ffe3b9513a0e64ce25f37dfe0ff0dc1b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Aug 2010 15:47:51 +0200 Subject: s3: Lift the server_messaging_context from print_queue_length --- source3/rpc_server/srv_spoolss_nt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index a58786ce61..aaa88f584d 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -2741,7 +2741,7 @@ static void spoolss_notify_status(int snum, { print_status_struct status; - print_queue_length(snum, &status); + print_queue_length(server_messaging_context(), snum, &status); SETUP_SPOOLSS_NOTIFY_DATA_INTEGER(data, status.status); } @@ -2755,7 +2755,9 @@ static void spoolss_notify_cjobs(int snum, struct spoolss_PrinterInfo2 *pinfo2, TALLOC_CTX *mem_ctx) { - SETUP_SPOOLSS_NOTIFY_DATA_INTEGER(data, print_queue_length(snum, NULL)); + SETUP_SPOOLSS_NOTIFY_DATA_INTEGER( + data, print_queue_length(server_messaging_context(), snum, + NULL)); } /******************************************************************* @@ -3478,7 +3480,7 @@ static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx, r->servername = talloc_strdup(mem_ctx, info2->servername); W_ERROR_HAVE_NO_MEMORY(r->servername); - count = print_queue_length(snum, &status); + count = print_queue_length(msg_ctx, snum, &status); /* check if we already have a counter for this printer */ for (session_counter = counter_list; session_counter; session_counter = session_counter->next) { @@ -3589,7 +3591,7 @@ static WERROR construct_printer_info2(TALLOC_CTX *mem_ctx, int count; print_status_struct status; - count = print_queue_length(snum, &status); + count = print_queue_length(server_messaging_context(), snum, &status); r->servername = talloc_strdup(mem_ctx, info2->servername); W_ERROR_HAVE_NO_MEMORY(r->servername); @@ -3727,7 +3729,7 @@ static WERROR construct_printer_info6(TALLOC_CTX *mem_ctx, int count; print_status_struct status; - count = print_queue_length(snum, &status); + count = print_queue_length(server_messaging_context(), snum, &status); r->status = nt_printq_status(status.status); -- cgit