summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 22:47:45 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 23:37:47 +0200
commit83045b1ba9fb8aa211d94b66453e2a2a61cae7ed (patch)
treee495f6a7c78057f34abb9c7118dff3b6f852ed9c /source3
parentd0ac5c69fb0460e8ae2882a75df3415fd4d95323 (diff)
downloadsamba-83045b1ba9fb8aa211d94b66453e2a2a61cae7ed.tar.gz
samba-83045b1ba9fb8aa211d94b66453e2a2a61cae7ed.tar.bz2
samba-83045b1ba9fb8aa211d94b66453e2a2a61cae7ed.zip
s3: Remove the smbd_messaging_context from cups_pcap_load_async
Diffstat (limited to 'source3')
-rw-r--r--source3/printing/print_cups.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index cbefa07a33..0ce11ae6f8 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -393,7 +393,9 @@ static bool cups_cache_reload_async(int fd)
static struct pcap_cache *local_pcap_copy;
struct fd_event *cache_fd_event;
-static bool cups_pcap_load_async(int *pfd)
+static bool cups_pcap_load_async(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ int *pfd)
{
int fds[2];
pid_t pid;
@@ -435,9 +437,7 @@ static bool cups_pcap_load_async(int *pfd)
close_all_print_db();
- status = reinit_after_fork(server_messaging_context(),
- server_event_context(), procid_self(),
- true);
+ status = reinit_after_fork(msg_ctx, ev, procid_self(), true);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("cups_pcap_load_async: reinit_after_fork() failed\n"));
smb_panic("cups_pcap_load_async: reinit_after_fork() failed");
@@ -569,7 +569,9 @@ bool cups_cache_reload(void)
*p_pipe_fd = -1;
/* Set up an async refresh. */
- if (!cups_pcap_load_async(p_pipe_fd)) {
+ if (!cups_pcap_load_async(server_event_context(),
+ server_messaging_context(),
+ p_pipe_fd)) {
return false;
}
if (!local_pcap_copy) {