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

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

bk: 56134a7aA0xp1HLiSbgJ2sB8nYOkPg

diff --cc ChangeLog
index 6e37042500e31559b6c2c9763e37e6cc4f4b0ec8,49e08b1ddef320ff6a62d677f2fb56a6ab87e6c7..8c77d247a3e66c3d946b032bb82e258f02362562
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,5 +1,22 @@@
+ * [Bug 2901] Drop invalid packet before checking KoD. Check for all KoD's
  ---
 +* [Sec 2899] CVE-2014-9297  perlinger@ntp.org
 +* [Sec 2902] configuration directives "pidfile" and "driftfile"
 +  should be local-only. perlinger@ntp.org (patch by Miroslav Lichvar)
 +* [Sec 2909] added missing call to 'free()' in ntp_crypto.c. perlinger@ntp.org
 +* [Sec 2913] TALOS-CAN-0052: crash by loop counter underrun. perlinger@ntp.org
 +* [Sec 2916] TALOS-CAN-0054: memory corruption in password store. JPerlinger
 +* [Sec 2917] TALOS-CAN-0055: Infinite loop if extended logging enabled and
 +  the logfile and keyfile are the same. perlinger@ntp.org
 +* [Sec 1918] TALOS-CAN-0062: prevent directory traversal for VMS, too, when
 +  using 'saveconfig' command.  perlinger@ntp.org
 +* [Bug 2919] TALOS-CAN-0063: avoid buffer overrun in ntpq. perlinger@ntp.org
 +* [Sec 2020] TALOS-CAN-0064: signed/unsiged clash could lead to buffer overun
 +  and memory corruption. perlinger@ntp.org
 +* [Sec 2921] TALOS-CAN-0065: password length memory corruption. JPerlinger.
 +* [Bug 2332] (reopened) Exercise thread cancellation once before dropping
 +  privileges and limiting resources in NTPD removes the need to link
 +  forcefully against 'libgcc_s' which does not always work. J.Perlinger
  * [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.
  * [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
  * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.