Module Name: src
Committed By: dholland
Date: Sun Nov 8 01:12:46 UTC 2020
Modified Files:
src/usr.sbin/syslogd: syslogd.c
Log Message:
syslogd: in die(), don't call die() again recursively.
Particularly not for something as immaterial as close failing.
PR 55795
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/usr.sbin/syslogd/syslogd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.135 src/usr.sbin/syslogd/syslogd.c:1.136
--- src/usr.sbin/syslogd/syslogd.c:1.135 Sat Nov 7 17:46:56 2020
+++ src/usr.sbin/syslogd/syslogd.c Sun Nov 8 01:12:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.135 2020/11/07 17:46:56 christos Exp $ */
+/* $NetBSD: syslogd.c,v 1.136 2020/11/08 01:12:46 dholland Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.135 2020/11/07 17:46:56 christos Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.136 2020/11/08 01:12:46 dholland Exp $");
#endif
#endif /* not lint */
@@ -3012,10 +3012,7 @@ die(int fd, short event, void *ev)
*/
if (finet) {
for (i = 0; i < finet->fd; i++) {
- if (close(finet[i+1].fd) < 0) {
- logerror("close() failed");
- die(0, 0, NULL);
- }
+ (void)close(finet[i+1].fd);
DEL_EVENT(finet[i+1].ev);
FREEPTR(finet[i+1].ev);
}
