[Bug 2428] do_unconf() should reset 'items' before the 2nd loop

bk: 51e66291HAzW3NA3V5VmeMCQDj10dg

diff --git a/ChangeLog b/ChangeLog
index a80111b2d43696e663810037f858a3ac5f26fac6..3644b3e742229b3fcfb0a518b892ac0f223a6215 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 * [Bug 1466] Oncore should set FLAG_PPS.
 * [Bug 2375] AIX 7 doesn't like a libevent validation check.
 * [Bug 2423] Log command-line args at LOG_INFO.
+* [Bug 2428] do_unconf() should reset 'items' before the 2nd loop.
 (4.2.7p371) 2013/07/07 Released by Harlan Stenn <stenn@ntp.org>
 * CID 1042586: Check the return value of clock_gettime() in worker_sleep().
 * Upgrade to libopts-39.0.14 from 5.17.5pre10.

diff --git a/ntpd/ntp_request.c b/ntpd/ntp_request.c
index 5a961e7192b12dcd874ac630811a37feef844ac2..e11adc40220e6e2f4a9a7bab60dcc1e06cbe6808 100644 (file)
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@ -1449,6 +1449,7 @@ do_unconf(
         * Now do it in earnest.
         */
 
+       items = INFO_NITEMS(inpkt->err_nitems);
        datap = inpkt->u.data;
 
        while (items-- > 0) {