From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 26 Jan 2008 08:41:54 +0000 (-0500)
Subject: ntp_config.c: ntp_minpoll fixes from Dave Mills
X-Git-Tag: NTP_4_2_5P110~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2af4f31db6e3acb59240fb6d586db52ec508f11;p=thirdparty%2Fntp.git

ntp_config.c: ntp_minpoll fixes from Dave Mills

bk: 479af252lKNjbHU6yNX6kkm-XnmJ5w
---

diff --git a/ChangeLog b/ChangeLog
index 52f60a66f..c05574187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* ntp_config.c: ntp_minpoll fixes from Dave Mills.
 * ntp-keygen updates from Dave Mills.
 * refresh epoch, throttle, and leap cleanup from Dave Mills.
 * Documentation cleanup from Dave Mills.
diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 6f507db52..b5f0856f7 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -467,11 +467,11 @@ create_peer_node(
 		/* Check the kind of option being set */
 		switch(my_val->attr) {
 		    case T_Minpoll:
-			if (my_val->value.i < NTP_MINPOLL) {
+			if (my_val->value.i < ntp_minpoll) {
 				msyslog(LOG_INFO,
 					"minpoll: provided value (%d) is below minimum (%d)",
-					my_val->value.i, NTP_MINPOLL);
-				my_node->minpoll = NTP_MINPOLL;
+					my_val->value.i, ntp_minpoll);
+				my_node->minpoll = ntp_minpoll;
 			}
 			else
 				my_node->minpoll = my_val->value.i;
@@ -1183,7 +1183,7 @@ config_access(void)
 		    dequeue(my_config.discard_opts);
 		switch(my_opt->attr) {
 		    case T_Average:
-			res_avg_interval = 1 << my_opt->value.i;
+			ntp_minpoll = my_opt->value.i;
 			break;
 		    case T_Minimum:
 			res_min_interval = 1 << my_opt->value.i;