Merge ntp 4.2.4p8
This commit is contained in:
parent
8d09e35dad
commit
142d831562
75
dist/ntp/config.h.in
vendored
75
dist/ntp/config.h.in
vendored
@ -1,5 +1,8 @@
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define if building universal (internal helper macro) */
|
||||
#undef AC_APPLE_UNIVERSAL_BUILD
|
||||
|
||||
/* Is adjtime() accurate? */
|
||||
#undef ADJTIME_IS_ACCURATE
|
||||
|
||||
@ -325,7 +328,7 @@
|
||||
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
|
||||
#undef HAVE_DOPRNT
|
||||
|
||||
/* [Can], [we], [drop], [root], [privileges?] */
|
||||
/* [Can we drop root privileges?] */
|
||||
#undef HAVE_DROPROOT
|
||||
|
||||
/* Define to 1 if you have the <errno.h> header file. */
|
||||
@ -445,7 +448,7 @@
|
||||
/* Define to 1 if you have the <limits.h> header file. */
|
||||
#undef HAVE_LIMITS_H
|
||||
|
||||
/* [Do], [we], [have], [Linux], [capabilities?] */
|
||||
/* [Do we have Linux capabilities?] */
|
||||
#undef HAVE_LINUX_CAPABILITIES
|
||||
|
||||
/* Define to 1 if you have the <machine/inline.h> header file. */
|
||||
@ -640,7 +643,7 @@
|
||||
/* Define to 1 if you have the `snprintf' function. */
|
||||
#undef HAVE_SNPRINTF
|
||||
|
||||
/* [Are], [Solaris], [privileges], [available?] */
|
||||
/* [Are Solaris privileges available?] */
|
||||
#undef HAVE_SOLARIS_PRIVS
|
||||
|
||||
/* Does struct sockaddr_storage have ss_family? */
|
||||
@ -688,7 +691,7 @@
|
||||
/* Do we have struct ntptimeval? */
|
||||
#undef HAVE_STRUCT_NTPTIMEVAL
|
||||
|
||||
/* Define to 1 if `time.tv_nsec' is member of `struct ntptimeval'. */
|
||||
/* Define to 1 if `time.tv_nsec' is a member of `struct ntptimeval'. */
|
||||
#undef HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC
|
||||
|
||||
/* Does a system header define struct ppsclockev? */
|
||||
@ -972,7 +975,7 @@
|
||||
/* Does struct sockaddr_storage have __ss_len? */
|
||||
#undef HAVE___SS_LEN_IN_SS
|
||||
|
||||
/* [Retry], [queries], [on], [_any_], [DNS], [error?] */
|
||||
/* [Retry queries on _any_ DNS error?] */
|
||||
#undef IGNORE_DNS_ERRORS
|
||||
|
||||
/* Should we use the IRIG sawtooth filter? */
|
||||
@ -1132,6 +1135,9 @@
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the home page for this package. */
|
||||
#undef PACKAGE_URL
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
@ -1174,22 +1180,22 @@
|
||||
/* Do we want the SCO clock hacks? */
|
||||
#undef SCO5_CLOCK
|
||||
|
||||
/* The size of a `char*', as computed by sizeof. */
|
||||
/* The size of `char*', as computed by sizeof. */
|
||||
#undef SIZEOF_CHARP
|
||||
|
||||
/* The size of a `int', as computed by sizeof. */
|
||||
/* The size of `int', as computed by sizeof. */
|
||||
#undef SIZEOF_INT
|
||||
|
||||
/* The size of a `long', as computed by sizeof. */
|
||||
/* The size of `long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG
|
||||
|
||||
/* The size of a `short', as computed by sizeof. */
|
||||
/* The size of `short', as computed by sizeof. */
|
||||
#undef SIZEOF_SHORT
|
||||
|
||||
/* The size of a `signed char', as computed by sizeof. */
|
||||
/* The size of `signed char', as computed by sizeof. */
|
||||
#undef SIZEOF_SIGNED_CHAR
|
||||
|
||||
/* The size of a `time_t', as computed by sizeof. */
|
||||
/* The size of `time_t', as computed by sizeof. */
|
||||
#undef SIZEOF_TIME_T
|
||||
|
||||
/* Does SIOCGIFCONF return size in the buffer? */
|
||||
@ -1252,6 +1258,28 @@ typedef unsigned int uintptr_t;
|
||||
/* Must we have a CTTY for fsetown? */
|
||||
#undef USE_FSETOWNCTTY
|
||||
|
||||
/* Enable extensions on AIX 3, Interix. */
|
||||
#ifndef _ALL_SOURCE
|
||||
# undef _ALL_SOURCE
|
||||
#endif
|
||||
/* Enable GNU extensions on systems that have them. */
|
||||
#ifndef _GNU_SOURCE
|
||||
# undef _GNU_SOURCE
|
||||
#endif
|
||||
/* Enable threading extensions on Solaris. */
|
||||
#ifndef _POSIX_PTHREAD_SEMANTICS
|
||||
# undef _POSIX_PTHREAD_SEMANTICS
|
||||
#endif
|
||||
/* Enable extensions on HP NonStop. */
|
||||
#ifndef _TANDEM_SOURCE
|
||||
# undef _TANDEM_SOURCE
|
||||
#endif
|
||||
/* Enable general extensions on Solaris. */
|
||||
#ifndef __EXTENSIONS__
|
||||
# undef __EXTENSIONS__
|
||||
#endif
|
||||
|
||||
|
||||
/* Can we use SIGPOLL for tty IO? */
|
||||
#undef USE_TTY_SIGPOLL
|
||||
|
||||
@ -1270,9 +1298,17 @@ typedef unsigned int uintptr_t;
|
||||
/* Define this if a working libregex can be found */
|
||||
#undef WITH_LIBREGEX
|
||||
|
||||
/* Define to 1 if your processor stores words with the most significant byte
|
||||
first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
#undef WORDS_BIGENDIAN
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
#if defined AC_APPLE_UNIVERSAL_BUILD
|
||||
# if defined __BIG_ENDIAN__
|
||||
# define WORDS_BIGENDIAN 1
|
||||
# endif
|
||||
#else
|
||||
# ifndef WORDS_BIGENDIAN
|
||||
# undef WORDS_BIGENDIAN
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Handle ss_family */
|
||||
#if !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE___SS_FAMILY_IN_SS)
|
||||
@ -1284,13 +1320,6 @@ typedef unsigned int uintptr_t;
|
||||
# define ss_len __ss_len
|
||||
#endif /* !defined(HAVE_SS_LEN_IN_SS) && defined(HAVE_SA_LEN_IN_SS) */
|
||||
|
||||
/* Define to 1 if on AIX 3.
|
||||
System headers sometimes define this.
|
||||
We just want to avoid a redefinition error message. */
|
||||
#ifndef _ALL_SOURCE
|
||||
# undef _ALL_SOURCE
|
||||
#endif
|
||||
|
||||
/* Define to 1 if on MINIX. */
|
||||
#undef _MINIX
|
||||
|
||||
@ -1321,10 +1350,10 @@ typedef unsigned int uintptr_t;
|
||||
#undef inline
|
||||
#endif
|
||||
|
||||
/* Define to `long' if <sys/types.h> does not define. */
|
||||
/* Define to `long int' if <sys/types.h> does not define. */
|
||||
#undef off_t
|
||||
|
||||
/* Define to `unsigned' if <sys/types.h> does not define. */
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
#undef size_t
|
||||
|
||||
/* Define to `long' if <sys/types.h> does not define. */
|
||||
|
39362
dist/ntp/configure
vendored
39362
dist/ntp/configure
vendored
File diff suppressed because it is too large
Load Diff
13
dist/ntp/ntpd/ntp_request.c
vendored
13
dist/ntp/ntpd/ntp_request.c
vendored
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ntp_request.c,v 1.9 2009/06/13 12:02:08 kardel Exp $ */
|
||||
/* $NetBSD: ntp_request.c,v 1.10 2009/12/08 21:52:06 kardel Exp $ */
|
||||
|
||||
/*
|
||||
* ntp_request.c - respond to information requests
|
||||
@ -411,6 +411,7 @@ process_private(
|
||||
int mod_okay
|
||||
)
|
||||
{
|
||||
static u_long quiet_until;
|
||||
struct req_pkt *inpkt;
|
||||
struct req_pkt_tail *tailinpkt;
|
||||
struct sockaddr_storage *srcadr;
|
||||
@ -446,8 +447,14 @@ process_private(
|
||||
|| (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
|
||||
|| (++ec, rbufp->recv_length < REQ_LEN_HDR)
|
||||
) {
|
||||
msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
|
||||
req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
|
||||
NLOG(NLOG_SYSEVENT)
|
||||
if (current_time >= quiet_until) {
|
||||
msyslog(LOG_ERR,
|
||||
"process_private: drop test %d"
|
||||
" failed, pkt from %s",
|
||||
ec, stoa(srcadr));
|
||||
quiet_until = current_time + 60;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1 +1 @@
|
||||
Sat Jun 13 11:04:03 UTC 2009 (import)
|
||||
Tue Dec 8 21:02:17 UTC 2009 (import)
|
||||
|
@ -1,7 +1,7 @@
|
||||
.TH NTP-KEYGEN 1 2009-05-18 "(ntp 4.2.4p7)" "Programmer's Manual"
|
||||
.TH NTP-KEYGEN 1 2009-12-08 "(ntp 4.2.4p8)" "Programmer's Manual"
|
||||
.\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1)
|
||||
.\"
|
||||
.\" It has been AutoGen-ed Monday May 18, 2009 at 05:03:36 AM EDT
|
||||
.\" It has been AutoGen-ed Tuesday December 8, 2009 at 08:14:57 AM EST
|
||||
.\" From the definitions ntp-keygen-opts.def
|
||||
.\" and the template file agman1.tpl
|
||||
.\"
|
||||
|
@ -1,7 +1,7 @@
|
||||
.TH NTPD 1 2009-05-18 "( 4.2.4p7)" "Programmer's Manual"
|
||||
.TH NTPD 1 2009-12-08 "( 4.2.4p8)" "Programmer's Manual"
|
||||
.\" EDIT THIS FILE WITH CAUTION (ntpd.1)
|
||||
.\"
|
||||
.\" It has been AutoGen-ed Monday May 18, 2009 at 04:56:05 AM EDT
|
||||
.\" It has been AutoGen-ed Tuesday December 8, 2009 at 08:13:11 AM EST
|
||||
.\" From the definitions ntpd-opts.def
|
||||
.\" and the template file agman1.tpl
|
||||
.\"
|
||||
|
@ -1,7 +1,7 @@
|
||||
.TH NTPDC 1 2009-05-18 "( 4.2.4p7)" "Programmer's Manual"
|
||||
.TH NTPDC 1 2009-12-08 "( 4.2.4p8)" "Programmer's Manual"
|
||||
.\" EDIT THIS FILE WITH CAUTION (ntpdc.1)
|
||||
.\"
|
||||
.\" It has been AutoGen-ed Monday May 18, 2009 at 05:02:29 AM EDT
|
||||
.\" It has been AutoGen-ed Tuesday December 8, 2009 at 08:14:01 AM EST
|
||||
.\" From the definitions ntpdc-opts.def
|
||||
.\" and the template file agman1.tpl
|
||||
.\"
|
||||
|
@ -1,7 +1,7 @@
|
||||
.TH NTPQ 1 2009-05-18 "( 4.2.4p7)" "Programmer's Manual"
|
||||
.TH NTPQ 1 2009-12-08 "( 4.2.4p8)" "Programmer's Manual"
|
||||
.\" EDIT THIS FILE WITH CAUTION (ntpq.1)
|
||||
.\"
|
||||
.\" It has been AutoGen-ed Monday May 18, 2009 at 05:03:00 AM EDT
|
||||
.\" It has been AutoGen-ed Tuesday December 8, 2009 at 08:14:27 AM EST
|
||||
.\" From the definitions ntpq-opts.def
|
||||
.\" and the template file agman1.tpl
|
||||
.\"
|
||||
|
@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
|
||||
|
||||
ConfStr="$PROG"
|
||||
|
||||
ConfStr="$ConfStr 4.2.4p7"
|
||||
ConfStr="$ConfStr 4.2.4p8"
|
||||
|
||||
case "$CSET" in
|
||||
'') ;;
|
||||
|
@ -1,7 +1,7 @@
|
||||
.TH SNTP 1 2009-05-18 "( 4.2.4p7)" "Programmer's Manual"
|
||||
.TH SNTP 1 2009-12-08 "( 4.2.4p8)" "Programmer's Manual"
|
||||
.\" EDIT THIS FILE WITH CAUTION (sntp.1)
|
||||
.\"
|
||||
.\" It has been AutoGen-ed Monday May 18, 2009 at 05:03:27 AM EDT
|
||||
.\" It has been AutoGen-ed Tuesday December 8, 2009 at 08:14:50 AM EST
|
||||
.\" From the definitions sntp-opts.def
|
||||
.\" and the template file agman1.tpl
|
||||
.\"
|
||||
|
Loading…
Reference in New Issue
Block a user