From: Sami Kerola Date: Sun, 19 Jul 2015 20:19:12 +0000 (+0100) Subject: logger: do not exit when socket errors are not enforced X-Git-Tag: v2.27-rc1~81 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b83e7a48d023b2822de930c9408a127654144f1;p=thirdparty%2Futil-linux.git logger: do not exit when socket errors are not enforced The libc openlog(3) does not have error detection whether unix socket could be opened. As a side effect that made it possible to use logger even if syslogd was not running. Of course user message in these cases were lost. This change makes the logger do behave similar way again, so that sysvinit scripts can successfully pipe messages to logger when ever. Addresses: https://bugs.debian.org/787864 Addresses: https://bugs.debian.org/790875 Reported-by: Andreas Beckmann Reported-by: Andreas Henriksson Tested-by: Robie Basak Signed-off-by: Sami Kerola --- diff --git a/misc-utils/logger.c b/misc-utils/logger.c index 8908dfcc10..9947b75e42 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -242,9 +242,10 @@ static int unix_socket(struct logger_ctl *ctl, const char *path, const int socke if (ctl->unix_socket_errors) err(EXIT_FAILURE, _("socket %s"), path); else - /* See --socket-errors manual page entry for - * explanation of this strange exit. */ - exit(EXIT_SUCCESS); + /* openlog(3) compatibility, socket errors are + * not reported, but ignored silently */ + ctl->noact = 1; + return -1; } return fd; } @@ -685,7 +686,7 @@ static void logger_stdin(struct logger_ctl *ctl) static void logger_close(const struct logger_ctl *ctl) { - if (close(ctl->fd) != 0) + if (ctl->fd != -1 && close(ctl->fd) != 0) err(EXIT_FAILURE, _("close failed")); free(ctl->hdr); }