From: Kay Sievers <kay@vrfy.org>
Date: Tue, 15 Jul 2014 00:24:35 +0000 (+0200)
Subject: timesyncd: suppress resync at system time change when not connected
X-Git-Tag: v216~623
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=afc7b1b9c170b9d23a3d91367e00f33b2ee2e89e;p=elogind.git

timesyncd: suppress resync at system time change when not connected

Jul 04 17:46:03 orchid systemd[1]: Starting Network Time Synchronization...
Jul 04 17:46:03 orchid systemd[1]: Started Network Time Synchronization.
Jul 04 17:46:22 orchid systemd-timesyncd[301]: System time changed. Resyncing.
Jul 04 17:46:22 orchid systemd-timesyncd[301]: Assertion 'm->current_server_name'

https://bugs.freedesktop.org/show_bug.cgi?id=80932
---

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 0c50902d1..9f1e25c7c 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -331,6 +331,9 @@ static int manager_clock_watch(sd_event_source *source, int fd, uint32_t revents
         /* rearm timer */
         manager_clock_watch_setup(m);
 
+        if (!m->current_server_address)
+                return 0;
+
         /* skip our own jumps */
         if (m->jumped) {
                 m->jumped = false;