s3: Lift the server_messaging_context from notify_printer_port

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0b577762b0a45f28ff4d84980564456d9cc7f209..0a797c90f18e3d33ef705ad394e07eb17ce875cb 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4454,7 +4454,9 @@ void notify_printer_sharename(struct tevent_context *ev,
 void notify_printer_printername(struct tevent_context *ev,
                                struct messaging_context *msg_ctx,
                                int snum, const char *printername);
-void notify_printer_port(int snum, const char *port_name);
+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_byname( const char *printername, uint32 change, const char *value );
 

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index b1373311373893822c46dd53514dd5afe3928901..fae93463df67ad78d69811b239a9bea7c24b64b6 100644 (file)
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -553,12 +553,14 @@ void notify_printer_printername(struct tevent_context *ev,
                snum, strlen(printername) + 1, printername);
 }
 
-void notify_printer_port(int snum, const char *port_name)
+void notify_printer_port(struct tevent_context *ev,
+                        struct messaging_context *msg_ctx,
+                        int snum, const char *port_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_PORT_NAME,
                snum, strlen(port_name) + 1, port_name);
 }

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 1c0a69d3fb710c497a12aaa1be94510c262a31a0..e950abdbbdf169091b3696d5af73cb65be4567ee 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5821,7 +5821,8 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
                                          buffer.length);
 
                if (!force_update) {
-                       notify_printer_port(snum, printer->portname);
+                       notify_printer_port(server_event_context(),
+                                           msg_ctx, snum, printer->portname);
                }
        }