[ntpsec commit] Forward-port fix for [Bug 2860] ntpq ifstats sanity check is too stringent.

Eric S. Raymond esr at ntpsec.org
Thu Oct 22 20:55:58 UTC 2015


Module:    ntpsec
Branch:    master
Commit:    d5d2ef09a232bd3c78d8f595130df1bf823fa43b
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=d5d2ef09a232bd3c78d8f595130df1bf823fa43b

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Thu Oct 22 16:55:12 2015 -0400

Forward-port fix for [Bug 2860] ntpq ifstats sanity check is too stringent.

---

 NEWS             | 1 +
 ntpq/ntpq-subs.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 3193d4e..7d3f985 100644
--- a/NEWS
+++ b/NEWS
@@ -16,5 +16,6 @@ on user-visible changes.
 * [Bug 2855] Implement conditional leap smear feature; includes
   later fixes for parser support and reporting leap smear in the REFID.
 * [Bug 2859] Improve raw DCF77 robustness decoding.  Frank Kardel.
+* [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
 
 // end
diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 3eef1b1..b83757a 100644
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -3087,7 +3087,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);



More information about the vc mailing list