sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

s3-smbd: Pass ev_ctx to remove_child_pid().

Browse Source
This commit is contained in:
Andreas Schneider 2011-06-21 14:46:16 +02:00
parent 7da54eab64
commit 68520ec02c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/smbd/server.c
View File

@ -237,7 +237,9 @@ static void cleanup_timeout_fn(struct event_context *event_ctx,
(*cleanup_te) = NULL;
}
static void remove_child_pid(pid_t pid, bool unclean_shutdown)
static void remove_child_pid(struct tevent_context *ev_ctx,
pid_t pid,
bool unclean_shutdown)
{
struct child_pid *child;
static struct timed_event *cleanup_te;
@ -253,7 +255,7 @@ static void remove_child_pid(pid_t pid, bool unclean_shutdown)
if (!cleanup_te) {
/* call the cleanup timer, but not too often */
int cleanup_time = lp_parm_int(-1, "smbd", "cleanuptime", 20);
cleanup_te = event_add_timed(server_event_context(), NULL,
cleanup_te = event_add_timed(ev_ctx, NULL,
timeval_current_ofs(cleanup_time, 0),
cleanup_timeout_fn,
&cleanup_te);
@ -323,7 +325,7 @@ static void smbd_sig_chld_handler(struct tevent_context *ev,
if (WIFSIGNALED(status)) {
unclean_shutdown = True;
}
remove_child_pid(pid, unclean_shutdown);
remove_child_pid(ev, pid, unclean_shutdown);
}
}