summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 16:37:21 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:36 +0200
commitc427423aeecfc8c123a75079d4398b093ab9bc76 (patch)
treecdf9aafdece29caf233dc42b0fa7c432d22f8d76
parent7285e0d5dd3f6186a919bbf04a66469d5c1090ea (diff)
downloadsamba-c427423aeecfc8c123a75079d4398b093ab9bc76.tar.gz
samba-c427423aeecfc8c123a75079d4398b093ab9bc76.tar.bz2
samba-c427423aeecfc8c123a75079d4398b093ab9bc76.zip
s3: Lift the server_messaging_context from notify_printer_sharename
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/printing/notify.c6
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c4
3 files changed, 10 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0716c4f042..5c4f1fb178 100644
--- 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 2cbe4f5061..890a20f5a4 100644
--- 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 acae8fc6f5..911d6b9b17 100644
--- 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);
}
}