From: Stefan Metzmacher Date: Tue, 13 Dec 2011 14:21:12 +0000 (+0100) Subject: s3:smbd/server: pass smbd_parent_context to smbd_setup_sig_chld_handler() X-Git-Url: http://git.samba.org/?p=kai%2Fsamba.git;a=commitdiff_plain;h=dddaa52552d2e1288fa13f5c2206b183a4c4c032 s3:smbd/server: pass smbd_parent_context to smbd_setup_sig_chld_handler() metze --- diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 779bbba1fa0..38e3f876178 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -344,15 +344,15 @@ static void smbd_sig_chld_handler(struct tevent_context *ev, } } -static void smbd_setup_sig_chld_handler(struct tevent_context *ev_ctx) +static void smbd_setup_sig_chld_handler(struct smbd_parent_context *parent) { struct tevent_signal *se; - se = tevent_add_signal(ev_ctx, - ev_ctx, /* mem_ctx */ + se = tevent_add_signal(parent->ev_ctx, + parent, /* mem_ctx */ SIGCHLD, 0, smbd_sig_chld_handler, - NULL); + parent); if (!se) { exit_server("failed to setup SIGCHLD handler"); } @@ -599,7 +599,7 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, #endif /* Stop zombies */ - smbd_setup_sig_chld_handler(ev_ctx); + smbd_setup_sig_chld_handler(parent); /* use a reasonable default set of ports - listing on 445 and 139 */ if (!smb_ports) { @@ -1311,7 +1311,7 @@ extern void build_options(bool screen); #endif /* Stop zombies */ - smbd_setup_sig_chld_handler(ev_ctx); + smbd_setup_sig_chld_handler(parent); smbd_process(ev_ctx, smbd_server_conn);