From: Juergen Perlinger <perlinger@ntp.org>
Date: Wed, 12 Sep 2018 20:52:00 +0000 (+0200)
Subject: [Bug 3526] Incorrect poll interval in packet
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8fd8fe1582be17b92b41d980e4732059d9917d1;p=thirdparty%2Fntp.git

[Bug 3526] Incorrect poll interval in packet

bk: 5b997c70P9SnAWw3cqMakK4sNo-wHA
---

diff --git a/ChangeLog b/ChangeLog
index f381a093c..d33997215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+* [Bug 3526] Incorrect poll interval in packet <perlinger@ntp.org>
+  - applied patch by Gerry Garvey
+
 ---
 (4.2.8p12) 2018/08/14 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 73ada6b44..eb663515b 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -387,9 +387,9 @@ transmit(
 	 */
 	if (peer->cast_flags & (MDF_BCAST | MDF_MCAST)) {
 		peer->outdate = current_time;
+		poll_update(peer, hpoll);
 		if (sys_leap != LEAP_NOTINSYNC)
 			peer_xmit(peer);
-		poll_update(peer, hpoll);
 		return;
 	}
 
@@ -408,6 +408,7 @@ transmit(
 	 */
 	if (peer->cast_flags & MDF_ACAST) {
 		peer->outdate = current_time;
+		poll_update(peer, hpoll);
 		if (peer->unreach > sys_beacon) {
 			peer->unreach = 0;
 			peer->ttl = 0;
@@ -419,7 +420,6 @@ transmit(
 			peer_xmit(peer);
 		}
 		peer->unreach++;
-		poll_update(peer, hpoll);
 		return;
 	}
 
@@ -437,11 +437,11 @@ transmit(
 	 */
 	if (peer->cast_flags & MDF_POOL) {
 		peer->outdate = current_time;
+		poll_update(peer, hpoll);
 		if (   (peer_associations <= 2 * sys_maxclock)
 		    && (   peer_associations < sys_maxclock
 			|| sys_survivors < sys_minclock))
 			pool_xmit(peer);
-		poll_update(peer, hpoll);
 		return;
 	}
 
@@ -549,9 +549,9 @@ transmit(
 	/*
 	 * Do not transmit if in broadcast client mode.
 	 */
+	poll_update(peer, hpoll);
 	if (peer->hmode != MODE_BCLIENT)
 		peer_xmit(peer);
-	poll_update(peer, hpoll);
 
 	return;
 }
diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index b477a7180..1dbb2f549 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -665,8 +665,7 @@ getuser:
  * Map group name/number to group ID
 */
 static int
-map_group(
-	)
+map_group(void)
 {
 	char *endp;
 
@@ -691,9 +690,10 @@ getgroup:
 /*
  * Change (effective) user and group IDs, also initialize the supplementary group access list
  */
+extern int set_user_group_ids(void);
+
 int
-set_user_group_ids(
-	)
+set_user_group_ids(void)
 {
 	/* If the the user was already mapped, no need to map it again */
 	if ((NULL != user) && (0 == sw_uid)) {
diff --git a/sntp/main.c b/sntp/main.c
index f0a7650ac..204d6a8de 100644
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -1609,9 +1609,8 @@ gettimeofday_cached(
 }
 
 /* Dummy function to satisfy libntp/work_fork.c */
-int
-set_user_group_ids(
-	)
+extern int set_user_group_ids(void);
+int set_user_group_ids(void)
 {
     return 1;
 }