chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
881c742
)
timesyncd: accept NTP version 3 responses
author
Kay Sievers
<kay@vrfy.org>
Tue, 6 May 2014 10:29:20 +0000
(12:29 +0200)
committer
Kay Sievers
<kay@vrfy.org>
Tue, 6 May 2014 10:29:20 +0000
(12:29 +0200)
src/timesync/timesyncd.c
patch
|
blob
|
history
diff --git
a/src/timesync/timesyncd.c
b/src/timesync/timesyncd.c
index 4f4c3baa74796da02aaa1f766f629441e67eb35d..33afbce6b38081141de719fb3af50c0f63334131 100644
(file)
--- 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);
}
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);
}
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") {
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));
r = manager_add_server(m, x);
if (r < 0) {
log_error("Failed to add server %s: %s", x, strerror(-r));