summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 17:19:12 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:38 +0200
commit1b60ead64add4920bf92b73a0e57e0a7e320e99f (patch)
tree7d0b258d28c38029ff22332c02d299870edbd150
parentef208c5571bb20a0701f1da845c07f38f84c26e1 (diff)
downloadsamba-1b60ead64add4920bf92b73a0e57e0a7e320e99f.tar.gz
samba-1b60ead64add4920bf92b73a0e57e0a7e320e99f.tar.bz2
samba-1b60ead64add4920bf92b73a0e57e0a7e320e99f.zip
s3: Lift the server_messaging_context from update_monitored_printq_cache
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c5
-rw-r--r--source3/smbd/process.c2
3 files changed, 4 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index fb18dff5fd..63a1095b04 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4777,7 +4777,7 @@ void do_drv_upgrade_printer(struct messaging_context *msg,
uint32_t msg_type,
struct server_id server_id,
DATA_BLOB *data);
-void update_monitored_printq_cache( void );
+void update_monitored_printq_cache(struct messaging_context *msg_ctx);
void reset_all_printerdata(struct messaging_context *msg,
void *private_data,
uint32_t msg_type,
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 5d3a0964ac..c7a234c5aa 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1390,7 +1390,7 @@ done:
connection
********************************************************************/
-void update_monitored_printq_cache( void )
+void update_monitored_printq_cache(struct messaging_context *msg_ctx)
{
Printer_entry *printer = printers_list;
int snum;
@@ -1403,8 +1403,7 @@ void update_monitored_printq_cache( void )
&& printer->notify.client_connected )
{
snum = print_queue_snum(printer->sharename);
- print_queue_status(server_messaging_context(), snum,
- NULL, NULL );
+ print_queue_status(msg_ctx, snum, NULL, NULL );
}
printer = printer->next;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index a512224585..d5f4340d4d 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2469,7 +2469,7 @@ static bool housekeeping_fn(const struct timeval *now, void *private_data)
change_to_root_user();
/* update printer queue caches if necessary */
- update_monitored_printq_cache();
+ update_monitored_printq_cache(smbd_messaging_context());
/* check if we need to reload services */
check_reload(time(NULL));