From: Kay Sievers <kay@vrfy.org>
Date: Tue, 2 Sep 2014 12:33:59 +0000 (+0200)
Subject: timesyncd: don't reset polling interval when reselecting server
X-Git-Tag: v217~674
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=80cd2606b91ce2735a0609c6f964917cf12685aa;p=elogind.git

timesyncd: don't reset polling interval when reselecting server

Original patch from: Miroslav Lichvar <mlichvar@redhat.com>
---

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index a66852d7d..3261bc1fb 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -721,7 +721,8 @@ static int manager_begin(Manager *m) {
         assert_return(m->current_server_address, -EHOSTUNREACH);
 
         m->missed_replies = NTP_MAX_MISSED_REPLIES;
-        m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
+        if (m->poll_interval_usec == 0)
+                m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
 
         server_address_pretty(m->current_server_address, &pretty);
         log_info("Using NTP server %s (%s).", strna(pretty), m->current_server_name->string);