From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 12 Nov 2018 12:31:03 +0000 (+0100)
Subject: hostnamed,localed,timedate: properly propagate errors from sd_event_add_signal()
X-Git-Tag: v240~342^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b670f86886b81c08b1343a2e54a41005779833b;p=thirdparty%2Fsystemd.git

hostnamed,localed,timedate: properly propagate errors from sd_event_add_signal()

main() can't doesn't expect negative error codes as return.
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index d8074e6f5fb..a0535070b3f 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -732,12 +732,16 @@ int main(int argc, char *argv[]) {
         (void) sd_event_set_watchdog(event, true);
 
         r = sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGINT handler: %m");
+                goto finish;
+        }
 
         r = sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGTERM handler: %m");
+                goto finish;
+        }
 
         r = connect_bus(&context, event, &bus);
         if (r < 0)
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 1f0c3ac74fa..c949fa3831d 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -751,12 +751,16 @@ int main(int argc, char *argv[]) {
         (void) sd_event_set_watchdog(event, true);
 
         r = sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGINT handler: %m");
+                goto finish;
+        }
 
         r = sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGTERM handler: %m");
+                goto finish;
+        }
 
         r = connect_bus(&context, event, &bus);
         if (r < 0)
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 8cf5e8d48d0..71f2f6f69b4 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -987,12 +987,16 @@ int main(int argc, char *argv[]) {
         (void) sd_event_set_watchdog(event, true);
 
         r = sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGINT handler: %m");
+                goto finish;
+        }
 
         r = sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGTERM handler: %m");
+                goto finish;
+        }
 
         r = connect_bus(&context, event, &bus);
         if (r < 0)