summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 16:41:31 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:36 +0200
commitd62c73b799baf908269835f2d69b1a2094ef23c6 (patch)
treeb63664d04e2ccbfd3d4f006a57ff761ea22afab3 /source3
parent83c4c04121addc39ae7b13001545ed303b8adf1c (diff)
downloadsamba-d62c73b799baf908269835f2d69b1a2094ef23c6.tar.gz
samba-d62c73b799baf908269835f2d69b1a2094ef23c6.tar.bz2
samba-d62c73b799baf908269835f2d69b1a2094ef23c6.zip
s3: Lift the server_messaging_context from notify_printer_location
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/printing/notify.c6
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c8
3 files changed, 13 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0a797c90f1..e4f2b7f125 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4457,7 +4457,9 @@ void notify_printer_printername(struct tevent_context *ev,
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_location(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ int snum, const char *location);
void notify_printer_byname( const char *printername, uint32 change, const char *value );
/* The following definitions come from printing/pcap.c */
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index fae93463df..0615bebb8c 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -565,12 +565,14 @@ void notify_printer_port(struct tevent_context *ev,
snum, strlen(port_name) + 1, port_name);
}
-void notify_printer_location(int snum, const char *location)
+void notify_printer_location(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ int snum, const char *location)
{
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_LOCATION,
snum, strlen(location) + 1, location);
}
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index e950abdbbd..82d1795869 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5839,7 +5839,9 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
buffer.length);
if (!force_update) {
- notify_printer_location(snum, printer->location);
+ notify_printer_location(server_event_context(),
+ msg_ctx, snum,
+ printer->location);
}
}
@@ -5856,7 +5858,9 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
buffer.length);
if (!force_update) {
- notify_printer_location(snum, printer->location);
+ notify_printer_location(server_event_context(),
+ msg_ctx, snum,
+ printer->location);
}
}