From d62c73b799baf908269835f2d69b1a2094ef23c6 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Aug 2010 16:41:31 +0200 Subject: s3: Lift the server_messaging_context from notify_printer_location --- source3/include/proto.h | 4 +++- source3/printing/notify.c | 6 ++++-- source3/rpc_server/srv_spoolss_nt.c | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index 0a797c90f1..e4f2b7f125 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4457,7 +4457,9 @@ void notify_printer_printername(struct tevent_context *ev, void notify_printer_port(struct tevent_context *ev, struct messaging_context *msg_ctx, int snum, const char *port_name); -void notify_printer_location(int snum, const char *location); +void notify_printer_location(struct tevent_context *ev, + struct messaging_context *msg_ctx, + int snum, const char *location); void notify_printer_byname( const char *printername, uint32 change, const char *value ); /* The following definitions come from printing/pcap.c */ diff --git a/source3/printing/notify.c b/source3/printing/notify.c index fae93463df..0615bebb8c 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -565,12 +565,14 @@ void notify_printer_port(struct tevent_context *ev, snum, strlen(port_name) + 1, port_name); } -void notify_printer_location(int snum, const char *location) +void notify_printer_location(struct tevent_context *ev, + struct messaging_context *msg_ctx, + int snum, const char *location) { const char *sharename = lp_servicename(snum); send_notify_field_buffer( - server_event_context(), server_messaging_context(), + ev, msg_ctx, sharename, PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_FIELD_LOCATION, snum, strlen(location) + 1, location); } diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index e950abdbbd..82d1795869 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -5839,7 +5839,9 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, buffer.length); if (!force_update) { - notify_printer_location(snum, printer->location); + notify_printer_location(server_event_context(), + msg_ctx, snum, + printer->location); } } @@ -5856,7 +5858,9 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, buffer.length); if (!force_update) { - notify_printer_location(snum, printer->location); + notify_printer_location(server_event_context(), + msg_ctx, snum, + printer->location); } } -- cgit