From: Michal Schmidt <mschmidt@redhat.com>
Date: Thu, 5 Nov 2015 12:44:14 +0000 (+0100)
Subject: timesync: return negative errno from manager_adjust_clock() on error
X-Git-Tag: v228~79^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ff6f4d851ba5b8e6f07a8e029986f13c2e63b9d;p=thirdparty%2Fsystemd.git

timesync: return negative errno from manager_adjust_clock() on error
---

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index b4995c30647..8dca538b3bb 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -370,7 +370,7 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) {
 
         r = clock_adjtime(CLOCK_REALTIME, &tmx);
         if (r < 0)
-                return r;
+                return -errno;
 
         touch("/var/lib/systemd/clock");
 
@@ -667,7 +667,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
                 m->sync = true;
                 r = manager_adjust_clock(m, offset, leap_sec);
                 if (r < 0)
-                        log_error_errno(errno, "Failed to call clock_adjtime(): %m");
+                        log_error_errno(r, "Failed to call clock_adjtime(): %m");
         }
 
         log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+ippm%s",