From: Harlan Stenn Date: Tue, 12 Apr 2016 07:56:46 +0000 (+0000) Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable X-Git-Tag: NTP_4_2_8P7~18^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81bc8cdfb1a6c9fb52af48514a4f96f6740befbf;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/home/stenn/ntp-stable into psp-deb1.ntp.org:/home/stenn/ntp-stable-3031 bk: 570caa3eDxDzuZwUa8tkqIaitgxIog --- 81bc8cdfb1a6c9fb52af48514a4f96f6740befbf diff --cc ChangeLog index 18ddc4603,c67a28f5e..a99c3a9fe --- a/ChangeLog +++ b/ChangeLog @@@ -1,31 -1,12 +1,36 @@@ --- +* [Bug 2960] async name resolution fixes for chroot() environments. + Reinhard Max. * [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org * [Bug 2995] Fixes to compile on Windows +* [Bug 2999] out-of-bounds access in 'is_safe_filename()'. perlinger@ntp.org +* [Bug 3010] remote configuration trustedkey/requestkey values + are not properly validated. perlinger@ntp.org + - sidekick: Ignore keys that have an unsupported MAC algorithm + but are otherwise well-formed +* [Bug 3013] Fix for ssl_init.c SHA1 test. perlinger@ntp.org + - Patch provided by Ch. Weisgerber +* [Bug 3015] ntpq: config-from-file: "request contains an unprintable character" + - A change related to [Bug 2853] forbids trailing white space in + remote config commands. perlinger@ntp.org +* [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - Overhaul of Windows IO completion port handling. perlinger@ntp.org +* [Bug 3022] authkeys.c should be refactored. perlinger@ntp.org + - fixed memory leak in access list (auth[read]keys.c) + - refactored handling of key access lists (auth[read]keys.c) + - reduced number of error branches (authreadkeys.c) +* [Bug 3023] ntpdate cannot correct dates in the future. perlinger@ntp.org +* [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + * [Bug 3031] ntp broadcastclient unable to synchronize to an server + when the time of server changed. perlinger@ntp.org + - Check the initial delay calculation and reject/unpeer the broadcast + server if the delay exceeds 50ms. Retry again after the next + broadcast packet. +* Document ntp.key's optional IP list in authenetic.html. 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. --- (4.2.8p6) 2016/01/20 Released by Harlan Stenn diff --cc ntpd/ntp_io.c index f68959d88,8050bb3af..e70ff535b --- a/ntpd/ntp_io.c +++ b/ntpd/ntp_io.c @@@ -1023,16 -1011,10 +1023,15 @@@ remove_interface msyslog(LOG_INFO, "stop listening for broadcasts to %s on interface #%d %s", stoa(&ep->bcast), ep->ifnum, ep->name); +# ifdef HAVE_IO_COMPLETION_PORT + io_completion_port_remove_socket(ep->bfd, ep); +# endif close_and_delete_fd_from_list(ep->bfd); ep->bfd = INVALID_SOCKET; - ep->flags &= ~INT_BCASTOPEN; } - ep->flags &= ~INT_BCASTOPEN; +# ifdef HAVE_IO_COMPLETION_PORT + io_completion_port_remove_interface(ep); +# endif ninterfaces--; mon_clearinterface(ep); @@@ -2655,13 -2655,10 +2672,13 @@@ io_unsetbclient(void msyslog(LOG_INFO, "stop listening for broadcasts to %s on interface #%d %s", stoa(&ep->bcast), ep->ifnum, ep->name); +# ifdef HAVE_IO_COMPLETION_PORT + io_completion_port_remove_socket(ep->bfd, ep); +# endif close_and_delete_fd_from_list(ep->bfd); ep->bfd = INVALID_SOCKET; - ep->flags &= ~INT_BCASTOPEN; } + ep->flags &= ~INT_BCASTOPEN; } broadcast_client_enabled = ISC_FALSE; }