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

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

bk: 57189d0c8zgl0Do2zFBSRvBm7b6XDg

diff --cc ChangeLog
index 259ebd3800edf1c95823b4e1783fa25ab58c43ec,95eda28c82054d80aef4ae1b063a2af0d8dfd940..c45087e4d331ca49c38df4bcdebfaf30f4893530
--- 1/ChangeLog
--- 2/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 199063347de57aa8247e56f7ff1eb53b2136b563,f076f6c3352b64e9dfef7b64d4363689f3b60bd3..7eaf738a23f8bdaf235ee1195b6db525d636a27e
--- 1/ntpd/ntp_proto.c
--- 2/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++;