From 7285e0d5dd3f6186a919bbf04a66469d5c1090ea Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Aug 2010 16:35:56 +0200 Subject: s3: Lift the server_messaging_context from notify_printer_comment --- source3/include/proto.h | 4 +++- source3/printing/notify.c | 6 ++++-- source3/rpc_server/srv_spoolss_nt.c | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index a484530a59..0716c4f042 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4445,7 +4445,9 @@ void notify_job_submitted(struct tevent_context *ev, void notify_printer_driver(struct tevent_context *ev, struct messaging_context *msg_ctx, int snum, const char *driver_name); -void notify_printer_comment(int snum, const char *comment); +void notify_printer_comment(struct tevent_context *ev, + struct messaging_context *msg_ctx, + int snum, const char *comment); void notify_printer_sharename(int snum, const char *share_name); void notify_printer_printername(int snum, const char *printername); void notify_printer_port(int snum, const char *port_name); diff --git a/source3/printing/notify.c b/source3/printing/notify.c index 8de79c4c60..2cbe4f5061 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -517,12 +517,14 @@ void notify_printer_driver(struct tevent_context *ev, snum, strlen(driver_name) + 1, driver_name); } -void notify_printer_comment(int snum, const char *comment) +void notify_printer_comment(struct tevent_context *ev, + struct messaging_context *msg_ctx, + int snum, const char *comment) { 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_COMMENT, snum, strlen(comment) + 1, comment); } diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index fbe769b396..acae8fc6f5 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -5757,7 +5757,8 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, buffer.length); if (!force_update) { - notify_printer_comment(snum, printer->comment); + notify_printer_comment(server_event_context(), msg_ctx, + snum, printer->comment); } } -- cgit