[src/trunk]: src/usr.sbin/syslogd syslogd: in die(), don't call die() again r...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5aac9b02e48
branches:  trunk
changeset: 942421:b5aac9b02e48
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Nov 08 01:12:46 2020 +0000

description:
syslogd: in die(), don't call die() again recursively.

Particularly not for something as immaterial as close failing.

PR 55795

diffstat:

 usr.sbin/syslogd/syslogd.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r 12311e2e3858 -r b5aac9b02e48 usr.sbin/syslogd/syslogd.c
--- a/usr.sbin/syslogd/syslogd.c        Sun Nov 08 01:07:00 2020 +0000
+++ b/usr.sbin/syslogd/syslogd.c        Sun Nov 08 01:12:46 2020 +0000
@@ -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 @@
 #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 @@
         */
        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);
                }