summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 16:35:56 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:36 +0200
commit7285e0d5dd3f6186a919bbf04a66469d5c1090ea (patch)
tree600a6ebf34413243e5b75a65b68e2c0b5861c9c4
parent4e4bf13e704f8e2af77cbc5099953380dc0758dc (diff)
downloadsamba-7285e0d5dd3f6186a919bbf04a66469d5c1090ea.tar.gz
samba-7285e0d5dd3f6186a919bbf04a66469d5c1090ea.tar.bz2
samba-7285e0d5dd3f6186a919bbf04a66469d5c1090ea.zip
s3: Lift the server_messaging_context from notify_printer_comment
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/printing/notify.c6
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c3
3 files changed, 9 insertions, 4 deletions
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);
}
}