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

bk: 55909c7cyTbGsWbiPWv8dn0Njt_LMQ

diff --git a/ChangeLog b/ChangeLog
index bbd73d7d090fdedf9ccf1b06c0414078814e5c0d..527dcb7457d95713b6a899cc3d1a9dd1bf4bb622 100644 (file)
--- 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 900c98d022bdbedfdc3d59870315fa637faefb5d..83d05e5b0781e2f613297ef16a620f644b1cfafc 100644 (file)
--- 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 69282e33170976454253de47eb538b17ccbfacdd..c6478701eb2736536018028128379c469f404fdc 100644 (file)
--- 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);