s3: Lift the server_messaging_context from notify_printer_printername

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5c4f1fb178a57e6429768902fc5090faa5ab202b..0b577762b0a45f28ff4d84980564456d9cc7f209 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4451,7 +4451,9 @@ void notify_printer_comment(struct tevent_context *ev,
 void notify_printer_sharename(struct tevent_context *ev,
                              struct messaging_context *msg_ctx,
                              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_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_location(int snum, const char *location);
 void notify_printer_byname( const char *printername, uint32 change, const char *value );
 void notify_printer_port(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 890a20f5a4121ede8d1fb34a8151c1c80795cdef..b1373311373893822c46dd53514dd5afe3928901 100644 (file)
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -541,12 +541,14 @@ void notify_printer_sharename(struct tevent_context *ev,
                snum, strlen(share_name) + 1, share_name);
 }
 
                snum, strlen(share_name) + 1, share_name);
 }
 

-void notify_printer_printername(int snum, const char *printername)
+void notify_printer_printername(struct tevent_context *ev,
+                               struct messaging_context *msg_ctx,
+                               int snum, const char *printername)

 {
        const char *sharename = lp_servicename(snum);
 
        send_notify_field_buffer(
 {
        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_PRINTER_NAME,
                snum, strlen(printername) + 1, printername);
 }
                sharename, PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_FIELD_PRINTER_NAME,
                snum, strlen(printername) + 1, printername);
 }

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 911d6b9b17a570acdc4402b0baa0d1faddda89b8..1c0a69d3fb710c497a12aaa1be94510c262a31a0 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5803,7 +5803,8 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
                                          buffer.length);
 
                if (!force_update) {
                                          buffer.length);
 
                if (!force_update) {

-                       notify_printer_printername(snum, p);
+                       notify_printer_printername(server_event_context(),
+                                                  msg_ctx, snum, p);

                }
        }
 
                }
        }