s3: Lift the server_messaging_context from notify_printer_sharename

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0716c4f042ba806c34c75141528951247048af9e..5c4f1fb178a57e6429768902fc5090faa5ab202b 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4448,7 +4448,9 @@ void notify_printer_driver(struct tevent_context *ev,
 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_sharename(struct tevent_context *ev,
+                             struct messaging_context *msg_ctx,
+                             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);
 void notify_printer_location(int snum, const char *location);

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 2cbe4f5061fe0c256626c4a6827cd08aa08a65b3..890a20f5a4121ede8d1fb34a8151c1c80795cdef 100644 (file)
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -529,12 +529,14 @@ void notify_printer_comment(struct tevent_context *ev,
                snum, strlen(comment) + 1, comment);
 }
 
-void notify_printer_sharename(int snum, const char *share_name)
+void notify_printer_sharename(struct tevent_context *ev,
+                             struct messaging_context *msg_ctx,
+                             int snum, const char *share_name)
 {
        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_SHARE_NAME,
                snum, strlen(share_name) + 1, share_name);
 }

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index acae8fc6f59fff2a0173e2fbeb8ceb6f1de69dd2..911d6b9b17a570acdc4402b0baa0d1faddda89b8 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5775,7 +5775,9 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
                                          buffer.length);
 
                if (!force_update) {
-                       notify_printer_sharename(snum, printer->sharename);
+                       notify_printer_sharename(server_event_context(),
+                                                msg_ctx,
+                                                snum, printer->sharename);
                }
        }