From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 26 Mar 2015 13:20:29 +0000 (+0100)
Subject: logger: --stderr and --no-act turn "auto-errors" on
X-Git-Tag: v2.27-rc1~266^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcf7e149393ee41af3e092a58dba643c8c091c28;p=thirdparty%2Futil-linux.git

logger: --stderr and --no-act turn "auto-errors" on

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 6316a76fc1..8908dfcc10 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -914,10 +914,9 @@ int main(int argc, char **argv)
 		ctl.unix_socket_errors = 1;
 		break;
 	case AF_UNIX_ERRORS_AUTO:
+		ctl.unix_socket_errors = ctl.noact || ctl.stderr_printout;
 #ifdef HAVE_LIBSYSTEMD
-		ctl.unix_socket_errors = sd_booted();
-#else
-		ctl.unix_socket_errors = 0;
+		ctl.unix_socket_errors |= !!sd_booted();
 #endif
 		break;
 	default: