diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-02 11:51:51 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-02 11:51:51 +0000 |
| commit | a71eba83bff47c5e296f087fc0d3a9aa362bbfb5 (patch) | |
| tree | fcec88e2d493a2854b95cfd321726cb2901ec37a /usr.sbin/relayd/hce.c | |
| parent | e6e8d4ae80736a4441a87c35e6ea4743afe88f28 (diff) | |
Terminate relayd using the socket status instead of watching SIGCHLD
or killing child processes. - Based on rzalamena@'s diff for httpd.
OK deraadt@ rzalamena@
Diffstat (limited to 'usr.sbin/relayd/hce.c')
| -rw-r--r-- | usr.sbin/relayd/hce.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/relayd/hce.c b/usr.sbin/relayd/hce.c index 3772faa405d..84b81154574 100644 --- a/usr.sbin/relayd/hce.c +++ b/usr.sbin/relayd/hce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hce.c,v 1.72 2016/01/11 21:31:42 benno Exp $ */ +/* $OpenBSD: hce.c,v 1.73 2016/09/02 11:51:49 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -48,7 +48,7 @@ static struct privsep_proc procs[] = { { "relay", PROC_RELAY, hce_dispatch_relay }, }; -pid_t +void hce(struct privsep *ps, struct privsep_proc *p) { env = ps->ps_env; @@ -56,7 +56,7 @@ hce(struct privsep *ps, struct privsep_proc *p) /* this is needed for icmp tests */ icmp_init(env); - return (proc_run(ps, p, procs, nitems(procs), hce_init, NULL)); + proc_run(ps, p, procs, nitems(procs), hce_init, NULL); } void |