Merge bk://bk.ntp.org/ntp-stable

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

bk: 551debeaXC7o4t13NDhE2vi2VXL1Ow

diff --cc ChangeLog
Simple merge

diff --cc ntpd/ntp_proto.c
index 356d2ca04061c9c073ef6bc993558681b5b179da,a1733944a725236dfd5ae294828e76cc7e19a7af..577b5fb0af5a2d418138c0b876a29fcd30ebe8ec
--- 1/ntpd/ntp_proto.c
--- 2/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@@ -1274,9 -1284,8 +1274,9 @@@ receive
  #endif        /* AUTOKEY */
                return;
  
-       /* 
+       /*
 -       * If the digest fails, the client cannot authenticate a server
 +       * If the digest fails or it's missing for authenticated
 +       * associations, the client cannot authenticate a server
         * reply to a client packet previously sent. The loopback check
         * is designed to avoid a bait-and-switch attack, which was
         * possible in past versions. If symmetric modes, return a