summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/ntpq/ntpq-opts.h
diff options
context:
space:
mode:
authorroberto <roberto@FreeBSD.org>2009-12-15 14:58:10 +0000
committerroberto <roberto@FreeBSD.org>2009-12-15 14:58:10 +0000
commit230e76b5380d386df4ba9fee065378a39a10e8b5 (patch)
tree2928c8428ba1c1401c7dcd5d3c3c610fbb90b794 /contrib/ntp/ntpq/ntpq-opts.h
parent2bc44b96096e82af8f7720c1883039f28c130aa0 (diff)
parentecc42837d301a8d8e257020b30492277ad558d30 (diff)
downloadFreeBSD-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/ntpq/ntpq-opts.h')
-rw-r--r--contrib/ntp/ntpq/ntpq-opts.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/ntp/ntpq/ntpq-opts.h b/contrib/ntp/ntpq/ntpq-opts.h
index bbd35ca..2badce7 100644
--- a/contrib/ntp/ntpq/ntpq-opts.h
+++ b/contrib/ntp/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
/*
* EDIT THIS FILE WITH CAUTION (ntpq-opts.h)
*
- * It has been AutoGen-ed Sunday August 17, 2008 at 05:26:55 AM EDT
+ * It has been AutoGen-ed Tuesday December 8, 2009 at 08:14:26 AM EST
* From the definitions ntpq-opts.def
* and the template file options
*
@@ -19,7 +19,7 @@
*
* This source file is copyrighted and licensed under the following terms:
*
- * ntpq copyright 1970-2008 David L. Mills and/or others - all rights reserved
+ * ntpq copyright 1970-2009 David L. Mills and/or others - all rights reserved
*
* see html/copyright.html
*/
@@ -68,8 +68,8 @@ typedef enum {
} teOptIndex;
#define OPTION_CT 13
-#define NTPQ_VERSION "4.2.4p5"
-#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p5"
+#define NTPQ_VERSION "4.2.4p8"
+#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p8"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
@@ -176,7 +176,7 @@ typedef enum {
ntpqOptions.pzCurOpt = NULL )
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*ntpqOptions.pUsageProc)( &ntpqOptions, 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 */
/* * * * * *
*
OpenPOWER on IntegriCloud