From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Jul 2024 09:44:31 +0000 (+0200)
Subject: exec-invoke: handle errno log message writing in write_confirm_error_fd() like we... 
X-Git-Tag: v257-rc1~873^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85f3957072071f0135f335d1631d2e2fc26e2659;p=thirdparty%2Fsystemd.git

exec-invoke: handle errno log message writing in write_confirm_error_fd() like we usually do
---

diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index 5a47c336c0b..7d8270bc1c8 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -694,15 +694,16 @@ static int setup_confirm_stdio(
 }
 
 static void write_confirm_error_fd(int err, int fd, const char *unit_id) {
-        assert(err < 0);
+        assert(err != 0);
+        assert(fd >= 0);
         assert(unit_id);
 
-        if (err == -ETIMEDOUT)
+        errno = abs(err);
+
+        if (errno == ETIMEDOUT)
                 dprintf(fd, "Confirmation question timed out for %s, assuming positive response.\n", unit_id);
-        else {
-                errno = -err;
-                dprintf(fd, "Couldn't ask confirmation for %s: %m, assuming positive response.\n", unit_id);
-        }
+        else
+                dprintf(fd, "Couldn't ask confirmation for %s, assuming positive response: %m\n", unit_id);
 }
 
 static void write_confirm_error(int err, const char *vc, const char *unit_id) {