30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
From b7841cf7b919b16d1bd4619154bf7cb4c22b4ccd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Paul Marks <paul@pmarks.net>
|
||
|
|
Date: Mon, 14 Jan 2013 01:39:10 +0000
|
||
|
|
Subject: ntpd: fix incorrect m_status field in outgoing packets. Closes 5120
|
||
|
|
|
||
|
|
When using busybox ntpd with an NTPv3 client and NTPv4 server (or vice
|
||
|
|
versa), the version numbers can be incorrectly ORed together, yielding
|
||
|
|
the bogus value of "NTPv7". This makes ntpd unusable with clients
|
||
|
|
such as Chrony and Windows "Internet Time".
|
||
|
|
|
||
|
|
This patch avoids the version mangling, by copying only the Leap
|
||
|
|
Indicator bits from the server's status field.
|
||
|
|
|
||
|
|
Signed-off-by: Paul Marks <paul@pmarks.net>
|
||
|
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
||
|
|
---
|
||
|
|
(limited to 'networking/ntpd.c')
|
||
|
|
|
||
|
|
--- a/networking/ntpd.c
|
||
|
|
+++ b/networking/ntpd.c
|
||
|
|
@@ -1794,7 +1794,7 @@ recv_and_process_client_pkt(void /*int f
|
||
|
|
|
||
|
|
/* Build a reply packet */
|
||
|
|
memset(&msg, 0, sizeof(msg));
|
||
|
|
- msg.m_status = G.stratum < MAXSTRAT ? G.ntp_status : LI_ALARM;
|
||
|
|
+ msg.m_status = G.stratum < MAXSTRAT ? (G.ntp_status & LI_MASK) : LI_ALARM;
|
||
|
|
msg.m_status |= (query_status & VERSION_MASK);
|
||
|
|
msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ?
|
||
|
|
MODE_SERVER : MODE_SYM_PAS;
|