From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 21 Apr 2016 09:27:40 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P7~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=651fcb6d33015d327b6a4148b9cf09620e816205;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 57189d0c8zgl0Do2zFBSRvBm7b6XDg
---

651fcb6d33015d327b6a4148b9cf09620e816205
diff --cc ChangeLog
index 259ebd380,95eda28c8..c45087e4d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -49,9 -27,8 +49,10 @@@
    - Check the initial delay calculation and reject/unpeer the broadcast
      server if the delay exceeds 50ms. Retry again after the next
      broadcast packet.
+ * [Bug 3036] autokey trips an INSIST in authistrustedip().  Harlan Stenn.
  * Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Update html/xleave.html documentation.  Harlan Stenn.
 +* Update ntp.conf documentation.  Harlan Stenn.
  * Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
  * Fix typo in html/monopt.html.  Harlan Stenn.
  * Add README.pullrequests.  Harlan Stenn.
diff --cc ntpd/ntp_proto.c
index 199063347,f076f6c33..7eaf738a2
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@@ -1777,8 -1618,10 +1779,11 @@@ receive
  	    case MODE_SERVER:		/* server mode */
  	    case MODE_BROADCAST:	/* broadcast mode */
  	    case MODE_ACTIVE:		/* symmetric active mode */
 +	    case MODE_PASSIVE:		/* symmetric passive mode */
+ 		DEBUG_INSIST((is_authentic == AUTH_OK) && !skeyid);
  		if (   is_authentic == AUTH_OK
+ 		    && skeyid
+ 		    && skeyid <= NTP_MAXKEY
  		    && !authistrustedip(skeyid, &peer->srcadr)) {
  			report_event(PEVNT_AUTH, peer, "authIP");
  			peer->badauth++;