From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 3 Apr 2015 01:24:58 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54de20c7292657966e9f32dda21be58cb264aa60;p=thirdparty%2Fntp.git

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

bk: 551debeaXC7o4t13NDhE2vi2VXL1Ow
---

54de20c7292657966e9f32dda21be58cb264aa60
diff --cc ntpd/ntp_proto.c
index 356d2ca04,a1733944a..577b5fb0a
--- a/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