[systemd-commits] src/timesync

Kay Sievers kay at kemper.freedesktop.org
Tue May 6 03:30:17 PDT 2014


 src/timesync/timesyncd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 136aa3b444ab5025ebb265b056c5c7ef55688774
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue May 6 12:29:20 2014 +0200

    timesyncd: accept NTP version 3 responses

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 4f4c3ba..33afbce 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -614,7 +614,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
                 return manager_connect(m);
         }
 
-        if (NTP_FIELD_VERSION(ntpmsg.field) != 4) {
+        if (NTP_FIELD_VERSION(ntpmsg.field) != 4 && NTP_FIELD_VERSION(ntpmsg.field) != 3) {
                 log_debug("Response NTPv%d. Disconnecting.", NTP_FIELD_VERSION(ntpmsg.field));
                 return manager_connect(m);
         }
@@ -1038,7 +1038,6 @@ int main(int argc, char *argv[]) {
         sd_notify(false, "READY=1");
 
         FOREACH_STRING(x, "time1.google.com", "time2.google.com", "time3.google.com", "time4.google.com", "0.fedora.pool.ntp.org") {
-
                 r = manager_add_server(m, x);
                 if (r < 0) {
                         log_error("Failed to add server %s: %s", x, strerror(-r));



More information about the systemd-commits mailing list