From: Karel Zak <kzak@redhat.com>
Date: Mon, 8 Apr 2013 14:39:59 +0000 (+0200)
Subject: logger: make socket initialization in main() more readable
X-Git-Tag: v2.23-rc2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2885c533fd11cb91ddd5dae17ed93b4de363496b;p=thirdparty%2Futil-linux.git

logger: make socket initialization in main() more readable

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 7bb93abbf6..c83c0b817f 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -320,12 +320,12 @@ main(int argc, char **argv) {
 	argv += optind;
 
 	/* setup for logging */
-	if (!usock && !server)
-		openlog(tag ? tag : getlogin(), logflags, 0);
-	else if (server)
+	if (server)
 		LogSock = inet_socket(server, port, socket_type);
-	else
+	else if (usock)
 		LogSock = unix_socket(usock, socket_type);
+	else
+		openlog(tag ? tag : getlogin(), logflags, 0);
 
 	/* log input line if appropriate */
 	if (argc > 0) {