summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-13 15:21:12 +0100
committerStefan Metzmacher <metze@samba.org>2011-12-14 08:14:54 +0100
commitdddaa52552d2e1288fa13f5c2206b183a4c4c032 (patch)
tree8b2722834c8c1f7da638f7f05f15d9471520124d
parent6d15ca3482bfdccd9eceef1874f88ec351e3f43f (diff)
downloadsamba-dddaa52552d2e1288fa13f5c2206b183a4c4c032.tar.gz
samba-dddaa52552d2e1288fa13f5c2206b183a4c4c032.tar.bz2
samba-dddaa52552d2e1288fa13f5c2206b183a4c4c032.zip
s3:smbd/server: pass smbd_parent_context to smbd_setup_sig_chld_handler()
metze
-rw-r--r--source3/smbd/server.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 779bbba1fa..38e3f87617 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);