From: Hal Murray <murray@ntp.org>
Date: Tue, 30 Dec 2014 09:55:11 +0000 (-0500)
Subject: ChangeLog, ntp_control.c:
X-Git-Tag: NTP_4_2_8P1_BETA3~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d42413506613099377676550ec2f0e444e7afb7;p=thirdparty%2Fntp.git

ChangeLog, ntp_control.c:
  Fix for bug 2700

bk: 54a2767fkCXoTNEcPDenmqwU6oEYwA
---

diff --git a/ChangeLog b/ChangeLog
index e64650d48..30d28ada5 100644
--- 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 f5f326ca4..c1e4e8283 100644
--- 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;
 }