summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-14 11:12:49 +0100
committerStefan Metzmacher <metze@samba.org>2011-12-15 11:08:52 +0100
commit5061dd26d314baf38c7e8b3f8e495579baba49de (patch)
tree93586533933d60ef6a0ace6f2ffc113bc954a6ae
parent06c1c338e3fcaf6460f4e462c7f881ce2abc9ac7 (diff)
downloadsamba-5061dd26d314baf38c7e8b3f8e495579baba49de.tar.gz
samba-5061dd26d314baf38c7e8b3f8e495579baba49de.tar.bz2
samba-5061dd26d314baf38c7e8b3f8e495579baba49de.zip
s3:printing/spoolssd: pass event and messaging context to check_updater_child()
metze
-rw-r--r--source3/printing/spoolssd.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index 06ce61b9cd..fa722e216d 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -489,7 +489,8 @@ static void spoolss_handle_client(struct tevent_req *req)
extern pid_t background_lpq_updater_pid;
static char *bq_logfile;
-static void check_updater_child(void)
+static void check_updater_child(struct tevent_context *ev_ctx,
+ struct messaging_context *msg_ctx)
{
int status;
pid_t pid;
@@ -501,9 +502,7 @@ static void check_updater_child(void)
pid = sys_waitpid(background_lpq_updater_pid, &status, WNOHANG);
if (pid > 0) {
DEBUG(2, ("The background queue child died... Restarting!\n"));
- pid = start_background_queue(server_event_context(),
- server_messaging_context(),
- bq_logfile);
+ pid = start_background_queue(ev_ctx, msg_ctx, bq_logfile);
background_lpq_updater_pid = pid;
}
}
@@ -543,7 +542,7 @@ static void spoolssd_sigchld_handler(struct tevent_context *ev_ctx,
pfh_manage_pool(ev_ctx, msg_ctx, &pf_spoolss_cfg, spoolss_pool);
/* also check if the updater child is alive and well */
- check_updater_child();
+ check_updater_child(ev_ctx, msg_ctx);
}
static bool spoolssd_setup_children_monitor(struct tevent_context *ev_ctx,