From: Dave Hart Date: Wed, 3 Feb 2010 06:26:56 +0000 (+0000) Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1455 X-Git-Tag: NTP_4_2_7P15~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c78c4c623d66b0624268022fd3bc23d2dc17affa;p=thirdparty%2Fntp.git Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1455 into shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1455 bk: 4b691730U0JFA4v3kSoFnwTs25qUHg --- c78c4c623d66b0624268022fd3bc23d2dc17affa diff --cc ChangeLog index ac013f2b6,7860c17ba..472fcfe87 --- a/ChangeLog +++ b/ChangeLog @@@ -1,70 -1,6 +1,78 @@@ ++* Include (4.2.6p1) - [Bug 1455] ntpd does not try /etc/ntp.audio. ++* Include (4.2.6p1) - Convert many sprintf() calls to snprintf(), also ++ strcpy(), strcat(). ++* Include (4.2.6p1) - Fix widely cut-n-pasted bug in refclock shutdown ++ after failed start. ++* Include (4.2.6p1) - Remove some dead code checking for emalloc() ++ returning NULL. +(4.2.7p14) 2010/02/02 Released by Harlan Stenn +* [Bug 1338] ntpq displays incorrect association type codes. +* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build. +* Include (4.2.6p1) - [Bug 1470] "make distdir" compiles keyword-gen. +* [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family. +* [Bug 1472] CID 116 CID 117 minor warnings in new DNS code. +* Include (4.2.6p1) - [Bug 1473] "make distcheck" version.m4 error. +(4.2.7p13) 2010/01/31 Released by Harlan Stenn +* Include (4.2.6p1) - [Bug 1467] Fix bogus rebuild of sntp/sntp.html. +(4.2.7p12) 2010/01/30 Released by Harlan Stenn +* [Bug 1468] 'make install' broken for root on default NFS mount. +(4.2.7p11) 2010/01/28 Released by Harlan Stenn +* [Bug 47] Debugging and logging do not work after a fork. +* [Bug 1010] getaddrinfo() could block and thus should not be called by + the main thread/process. +* New async DNS resolver in ntpd allows nonblocking queries anytime, + instead of only once at startup. +(4.2.7p10) 2010/01/24 Released by Harlan Stenn +* [Bug 1140] Clean up debug.html, decode.html, and ntpq.html. +* Include (4.2.6p1-RC3) - Use TZ=UTC instead of TZ= when calling date in + scripts/mkver.in . +* Include (4.2.6p1-RC3) - [Bug 1448] Some macros not correctly conditionally + or absolutely defined on Windows. +* Include (4.2.6p1-RC3) - [Bug 1449] ntpsim.h in ntp_config.c should be used + conditionally. +* Include (4.2.6p1-RC3) - [Bug 1450] Option to exclude warnings not + unconditionally defined on Windows. +(4.2.7p9) 2010/01/13 Released by Harlan Stenn +(4.2.7p8) 2010/01/12 Released by Harlan Stenn +* [Bug 702] ntpd service logic should use libopts to examine cmdline. +* Include (4.2.6p1-RC3) - [Bug 1451] sntp leaks KoD entry updating. +* Include (4.2.6p1-RC3) - [Bug 1453] Use $CC in config.cache filename. +(4.2.7p7) 2009/12/30 Released by Harlan Stenn +* [Bug 620] ntpdc getresponse() esize != *rsize s/b size != *rsize. +* [Bug 1446] 4.2.7p6 requires autogen, missing ntpd.1, *.texi, *.menu. +(4.2.7p6) 2009/12/28 Released by Harlan Stenn +* [Bug 1443] Remove unnecessary dependencies on ntp_io.h +* [Bug 1442] Move Windows functions into libntp files +* Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify(). +* Include (4.2.6p1-RC3) - [Bug 1439] .texi gen after binary is linked. +* Include (4.2.6p1-RC3) - [Bug 1440] Update configure.ac to support kfreebsd. +* Include (4.2.6p1-RC3) - [Bug 1445] IRIX does not have -lcap or support + linux capabilities. +(4.2.7p5) 2009/12/25 Released by Harlan Stenn +* Include (4.2.6p1-RC2) +(4.2.7p4) 2009/12/24 Released by Harlan Stenn +* [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution. +* [Bug 1431] System headers must come before ntp headers in ntp_intres.c . +(4.2.7p3) 2009/12/22 Released by Harlan Stenn +* [Bug 1426] scripts/VersionName needs . on the search path. +* [Bug 1427] quote missing in ./build - shows up on NetBSD. +* [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h +(4.2.7p2) 2009/12/20 Released by Harlan Stenn +* [Bug 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir. +* [Bug 1421] add util/tg2, a clone of tg that works on Linux, NetBSD, and + FreeBSD +(4.2.7p1) 2009/12/15 Released by Harlan Stenn +* [Bug 1348] ntpd Windows port should wait for sendto() completion. +* [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes. +* [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails. +(4.2.7p0) 2009/12/13 Released by Harlan Stenn +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC. +* [Bug 1414] Enable "make distcheck" success with BSD make. +(4.2.7) 2009/12/09 Released by Harlan Stenn +* [Bug 1407] configure.ac: recent GNU Make -v does not include "version". --- + * [Bug 1455] ntpd does not try /etc/ntp.audio as documented. * [Bug 1467] Fix bogus rebuild of sntp/sntp.html * [Bug 1470] "make distdir" in $srcdir builds keyword-gen, libntp.a. * [Bug 1473] "make distcheck" before build can't make sntp/version.m4. diff --cc ntpq/ntpq-subs.c index 2f501ec0f,9cad68895..8f6948690 --- a/ntpq/ntpq-subs.c +++ b/ntpq/ntpq-subs.c @@@ -1623,9 -1588,8 +1626,9 @@@ doprintpeers c = flash2[CTL_PEER_STATVAL(rstatus) & 0x3]; if (numhosts > 1) fprintf(fp, "%-*s ", maxhostlen, currenthost); -- if (af == 0 || AF(&srcadr) == af) { - strncpy(clock_name, nntohost(&srcadr), sizeof(clock_name)); ++ if (AF_UNSPEC == af || AF(&srcadr) == af) { + strncpy(clock_name, nntohost(&srcadr), sizeof(clock_name)); + fprintf(fp, "%c%-15.15s %-15.15s %2ld %c %4.4s %4.4s %3lo %7.7s %8.7s %7.7s\n", c, clock_name, dstadr_refid, stratum, type, diff --cc ports/winnt/vs2008/libntp/libntp.vcproj index b0c61783a,1fcdbeae8..1e415e775 --- a/ports/winnt/vs2008/libntp/libntp.vcproj +++ b/ports/winnt/vs2008/libntp/libntp.vcproj @@@ -856,6 -828,10 +860,10 @@@ RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h" > + +