ChangeLog, ntp_control.c:

  Fix for bug 2700

bk: 54a2767fkCXoTNEcPDenmqwU6oEYwA

diff --git a/ChangeLog b/ChangeLog
index e64650d480c015406e8a002ca405cfb82aa628ad..30d28ada5efb620cbf28685ccaf1f7260ab404c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+
+* [bug 2700] mrulist stopped working in 4.2.8
 ---
 (4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index f5f326ca48113f24a5a03f5e3ff0bc1644081e25..c1e4e8283f4b2bfe9e88d6b2e11f49b028c449d9 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -783,6 +783,7 @@ static int  res_offset;     /* offset of payload in response */
 static u_char * datapt;
 static u_char * dataend;
 static int     datalinelen;
+static int     datasent;       /* flag to avoid initial ", " */
 static int     datanotbinflag;
 static sockaddr_u *rmt_addr;
 static struct interface *lcl_inter;
@@ -1067,6 +1068,7 @@ process_control(
        req_count = (int)ntohs(pkt->count);
        datanotbinflag = FALSE;
        datalinelen = 0;
+       datasent = 0;
        datapt = rpkt.u.data;
        dataend = &rpkt.u.data[CTL_MAX_DATA_LEN];
 
@@ -1326,7 +1328,7 @@ ctl_putdata(
        if (!bin) {
                datanotbinflag = TRUE;
                overhead = 3;
-               if (datapt != rpkt.u.data) {
+               if (datasent) {
                        *datapt++ = ',';
                        datalinelen++;
                        if ((dlen + datalinelen + 1) >= MAXDATALINELEN) {
@@ -1362,6 +1364,7 @@ ctl_putdata(
        memcpy(datapt, dp, dlen);
        datapt += dlen;
        datalinelen += dlen;
+       datasent = TRUE;
 }