From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 29 Jun 2015 01:16:44 +0000 (+0000)
Subject: [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
X-Git-Tag: NTP_4_2_8P3~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c2127e9a90459c9c4be816d972291948ef0989d;p=thirdparty%2Fntp.git

[Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.

bk: 55909c7cyTbGsWbiPWv8dn0Njt_LMQ
---

diff --git a/ChangeLog b/ChangeLog
index bbd73d7d0..527dcb745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 * [Bug 2846] Report 'unsynchronized' status during the leap second.
   Fixed in Martin's changes to Bug 2855.  Martin Burnicki.
 * [Bug 2859] Improve raw DCF77 robustness deconding.  Frank Kardel.
+* [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
 * README.leapsmear added.  Martin Burnicki.
 * README.leapsmear edited.  Harlan Stenn.
 ---
diff --git a/NEWS b/NEWS
index 900c98d02..83d05e5b0 100644
--- a/NEWS
+++ b/NEWS
@@ -94,6 +94,7 @@ Bug Fixes and Improvements:
 * [Bug 2856] ntpd should wait() on terminated child processes.  Paul Green.
 * [Bug 2857] Stratus VOS does not support SIGIO.  Paul Green.
 * [Bug 2859] Improve raw DCF77 robustness deconding.  Frank Kardel.
+* [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
 * html/drivers/driver22.html: typo fix.  Harlan Stenn.
 * refidsmear test cleanup.  Tomasz Flendrich.
 * refidsmear function support and tests.  Harlan Stenn.
diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 69282e331..c6478701e 100644
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -3238,7 +3238,7 @@ validate_ifnum(
 {
 	if (prow->ifnum == ifnum)
 		return;
-	if (prow->ifnum + 1 == ifnum) {
+	if (prow->ifnum + 1 <= ifnum) {
 		if (*pfields < IFSTATS_FIELDS)
 			fprintf(fp, "Warning: incomplete row with %d (of %d) fields",
 				*pfields, IFSTATS_FIELDS);