diff options
| author |   bluhm <bluhm@openbsd.org> | 2014-10-06 19:36:34 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2014-10-06 19:36:34 +0000 |
| commit | 79b5f6c1accbb091f06d3978edbc222a28ec60c1 (patch) | |
| tree | db5acf15d93fa2fb8916fc772fe62ef6ff0de1bc /usr.sbin/syslogd/syslogd.c | |
| parent | In case of invalid syntax like "chmod -Pr -w tf" (trailing mode letter (diff) | |
| download | wireguard-openbsd-79b5f6c1accbb091f06d3978edbc222a28ec60c1.tar.xz wireguard-openbsd-79b5f6c1accbb091f06d3978edbc222a28ec60c1.zip | |
As libevent provides safe signal callbacks instead of signal handlers,
the sigprocmask(2) protection is not necessary and can be removed.
OK nicm@ deraadt@
Diffstat (limited to 'usr.sbin/syslogd/syslogd.c')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index ae02b9382d4..5f35d0374b0 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syslogd.c,v 1.128 2014/10/05 18:14:01 bluhm Exp $ */ +/* $OpenBSD: syslogd.c,v 1.129 2014/10/06 19:36:34 bluhm Exp $ */ /* * Copyright (c) 1983, 1988, 1993, 1994 @@ -759,18 +759,12 @@ logmsg(int pri, char *msg, char *from, int flags) { struct filed *f; int fac, msglen, prilev, i; - sigset_t mask, omask; char *timestamp; char prog[NAME_MAX+1]; dprintf("logmsg: pri 0%o, flags 0x%x, from %s, msg %s\n", pri, flags, from, msg); - sigemptyset(&mask); - sigaddset(&mask, SIGALRM); - sigaddset(&mask, SIGHUP); - sigprocmask(SIG_BLOCK, &mask, &omask); - /* * Check to see if msg looks non-standard. */ @@ -818,7 +812,6 @@ logmsg(int pri, char *msg, char *from, int flags) (void)close(f->f_file); f->f_file = -1; } - (void)sigprocmask(SIG_SETMASK, &omask, NULL); return; } for (f = Files; f; f = f->f_next) { @@ -883,7 +876,6 @@ logmsg(int pri, char *msg, char *from, int flags) if (f->f_quick) break; } - (void)sigprocmask(SIG_SETMASK, &omask, NULL); } void |