diff options
author | roberto <roberto@FreeBSD.org> | 2009-12-15 14:58:10 +0000 |
---|---|---|
committer | roberto <roberto@FreeBSD.org> | 2009-12-15 14:58:10 +0000 |
commit | 230e76b5380d386df4ba9fee065378a39a10e8b5 (patch) | |
tree | 2928c8428ba1c1401c7dcd5d3c3c610fbb90b794 /contrib/ntp/ntpd/ntpd-opts.h | |
parent | 2bc44b96096e82af8f7720c1883039f28c130aa0 (diff) | |
parent | ecc42837d301a8d8e257020b30492277ad558d30 (diff) | |
download | FreeBSD-src-230e76b5380d386df4ba9fee065378a39a10e8b5.zip FreeBSD-src-230e76b5380d386df4ba9fee065378a39a10e8b5.tar.gz |
Merge 4.2.4p8 into contrib (r200452 & r200454).
Subversion is being difficult here so take a hammer and get it in.
MFC after: 2 weeks
Security: CVE-2009-3563
Diffstat (limited to 'contrib/ntp/ntpd/ntpd-opts.h')
-rw-r--r-- | contrib/ntp/ntpd/ntpd-opts.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/ntp/ntpd/ntpd-opts.h b/contrib/ntp/ntpd/ntpd-opts.h index 45d0de5..0347f33 100644 --- a/contrib/ntp/ntpd/ntpd-opts.h +++ b/contrib/ntp/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed Sunday August 17, 2008 at 05:20:09 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 08:13:09 AM EST * From the definitions ntpd-opts.def * and the template file options * @@ -19,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpd copyright 1970-2008 David L. Mills and/or others - all rights reserved + * ntpd copyright 1970-2009 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -87,8 +87,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 32 -#define NTPD_VERSION "4.2.4p5" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p5" +#define NTPD_VERSION "4.2.4p8" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p8" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -319,7 +319,7 @@ typedef enum { ntpdOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdOptions.pUsageProc)( &ntpdOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/opthead.tpl near line 360 */ /* * * * * * * |