diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2004-02-13 19:01:58 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2004-02-13 19:01:58 +0000 |
| commit | c3cefcd423e032e2d946ffd7bc220c2d1d105644 (patch) | |
| tree | e1cc5c3c15495cdd5304bfbf2c6656b222c6ac6e /sbin/pflogd | |
| parent | 3787401890ceda601ff7fd25496550030e3d2dd5 (diff) | |
cleanup signal handling; close descriptors.
ok avsm@ millert@ canacar@
Diffstat (limited to 'sbin/pflogd')
| -rw-r--r-- | sbin/pflogd/pflogd.c | 4 | ||||
| -rw-r--r-- | sbin/pflogd/privsep.c | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sbin/pflogd/pflogd.c b/sbin/pflogd/pflogd.c index b3fa13af13a..7e19ae66ebd 100644 --- a/sbin/pflogd/pflogd.c +++ b/sbin/pflogd/pflogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pflogd.c,v 1.26 2004/01/16 10:45:49 jmc Exp $ */ +/* $OpenBSD: pflogd.c,v 1.27 2004/02/13 19:01:57 otto Exp $ */ /* * Copyright (c) 2001 Theo de Raadt @@ -503,6 +503,8 @@ main(int argc, char **argv) int ch, np, Xflag = 0; pcap_handler phandler = dump_packet; + closefrom(STDERR_FILENO + 1); + while ((ch = getopt(argc, argv, "Dxd:s:f:")) != -1) { switch (ch) { case 'D': diff --git a/sbin/pflogd/privsep.c b/sbin/pflogd/privsep.c index 158255d3272..bcb242e0ff0 100644 --- a/sbin/pflogd/privsep.c +++ b/sbin/pflogd/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.6 2004/01/18 14:21:52 canacar Exp $ */ +/* $OpenBSD: privsep.c,v 1.7 2004/02/13 19:01:57 otto Exp $ */ /* * Copyright (c) 2003 Can Erkin Acar @@ -45,7 +45,7 @@ enum cmd_types { }; static int priv_fd = -1; -static pid_t child_pid = -1; +static volatile pid_t child_pid = -1; volatile sig_atomic_t gotsig_chld = 0; @@ -70,6 +70,9 @@ priv_init(void) int snaplen, ret; struct passwd *pw; + for (i = 1; i < _NSIG; i++) + signal(i, SIG_DFL); + /* Create sockets */ if (socketpair(AF_LOCAL, SOCK_STREAM, PF_UNSPEC, socks) == -1) err(1, "socketpair() failed"); @@ -77,6 +80,7 @@ priv_init(void) pw = getpwnam("_pflogd"); if (pw == NULL) errx(1, "unknown user _pflogd"); + endpwent(); child_pid = fork(); if (child_pid < 0) @@ -107,9 +111,6 @@ priv_init(void) } /* Father */ - for (i = 1; i <= _NSIG; i++) - signal(i, SIG_DFL); - /* Pass ALRM/TERM/HUP through to child, and accept CHLD */ signal(SIGALRM, sig_pass_to_chld); signal(SIGTERM, sig_pass_to_chld); @@ -222,8 +223,11 @@ priv_open_log(void) static void sig_pass_to_chld(int sig) { + int oerrno = errno; + if (child_pid != -1) kill(child_pid, sig); + errno = oerrno; } /* if parent gets a SIGCHLD, it will exit */ |