From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 4 Mar 2019 06:18:06 +0000 (+0900)
Subject: log: make log_syntax() assign correct errno and show valid error cause
X-Git-Tag: v242-rc1~212^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee96382fdb754c88b894d61f0ad3f12da1db94d0;p=thirdparty%2Fsystemd.git

log: make log_syntax() assign correct errno and show valid error cause
---

diff --git a/src/basic/log.c b/src/basic/log.c
index 0486027296d..84621932db4 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1223,7 +1223,7 @@ int log_syntax_internal(
             log_target == LOG_TARGET_NULL)
                 return -ERRNO_VALUE(error);
 
-        errno = error;
+        errno = ERRNO_VALUE(error);
 
         va_start(ap, format);
         (void) vsnprintf(buffer, sizeof buffer, format, ap);
diff --git a/src/basic/log.h b/src/basic/log.h
index 17438d7ff7e..113e0dedee7 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -308,7 +308,7 @@ int log_syntax_invalid_utf8_internal(
                 int _level = (level), _e = (error);                     \
                 (log_get_max_level() >= LOG_PRI(_level))                \
                         ? log_syntax_internal(unit, _level, config_file, config_line, _e, __FILE__, __LINE__, __func__, __VA_ARGS__) \
-                        : -abs(_e);                                     \
+                        : -ERRNO_VALUE(_e);                             \
         })
 
 #define log_syntax_invalid_utf8(unit, level, config_file, config_line, rvalue) \