Merge branch 'logger-format-fix' of https://github.com/rgerhards/util-linux

* 'logger-format-fix' of https://github.com/rgerhards/util-linux:
  logger: fix inconsistent format regression when logging locally

1 files changed, 6 insertions, 8 deletions

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 1e7e2dc100..6b7ce1b83b 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -481,14 +481,12 @@ static void logger_open(struct logger_ctl *ctl)
 			ctl->syslogfp = syslog_rfc5424;
 		return;
 	}
-	if (ctl->unix_socket) {
-		ctl->fd = unix_socket(ctl, ctl->unix_socket, ctl->socket_type);
-		if (!ctl->syslogfp)
-			ctl->syslogfp = syslog_rfc5424;
-		return;
-	}
-	ctl->fd = unix_socket(ctl, _PATH_DEVLOG, ctl->socket_type);
-	ctl->syslogfp = syslog_local;
+	if (!ctl->unix_socket)
+		ctl->unix_socket = _PATH_DEVLOG;
+
+	ctl->fd = unix_socket(ctl, ctl->unix_socket, ctl->socket_type);
+	if (!ctl->syslogfp)
+		ctl->syslogfp = syslog_local;
 }
 
 static void logger_command_line(const struct logger_ctl *ctl, char **argv)