From: Harlan Stenn Date: Mon, 3 Oct 2011 05:00:26 +0000 (+0000) Subject: NTP_4_2_7P218 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03bb2a99f5001e8bf2b71bd83d72cedff247263b;p=thirdparty%2Fntp.git NTP_4_2_7P218 bk: 4e89416a5ELAwVs89QuVIjCrYV9VBA --- diff --git a/ChangeLog b/ChangeLog index 237eb38ff0..b00088af45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p218) 2011/10/03 Released by Harlan Stenn * [Bug 2019] Allow selection of cipher for private key files. * Documentation updates from Dave Mills. * ntp-keygen private key cipher default now triple-key triple DES CBC. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index f5782655e6..e3fae1c7d8 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed September 29, 2011 at 08:05:21 AM by AutoGen 5.12 + * It has been AutoGen-ed October 3, 2011 at 04:58:29 AM by AutoGen 5.12 * From the definitions ntpd-opts.def * and the template file options * @@ -52,7 +52,7 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ static char const zCopyright[333] = -"ntpd 4.2.7p217\n\ +"ntpd 4.2.7p218\n\ Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1028,7 +1028,7 @@ static tOptDesc optDesc[OPTION_CT] = { */ static char const zPROGNAME[5] = "NTPD"; static char const zUsageTitle[133] = -"ntpd - NTP daemon program - Ver. 4.2.7p217\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p218\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n"; #define zRcName NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 1abef906f3..2718d90233 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed September 29, 2011 at 08:05:21 AM by AutoGen 5.12 + * It has been AutoGen-ed October 3, 2011 at 04:58:29 AM by AutoGen 5.12 * From the definitions ntpd-opts.def * and the template file options * @@ -102,8 +102,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define NTPD_VERSION "4.2.7p217" -#define NTPD_FULL_VERSION "ntpd 4.2.7p217" +#define NTPD_VERSION "4.2.7p218" +#define NTPD_FULL_VERSION "ntpd 4.2.7p218" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 5c4fa2e717..abbb7eddd4 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed September 29, 2011 at 08:05:36 AM by AutoGen 5.12 +# It has been AutoGen-ed October 3, 2011 at 04:59:03 AM by AutoGen 5.12 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -63,7 +63,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p217 +ntpd - NTP daemon program - Ver. 4.2.7p218 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index bad0020ee0..a6451eaa95 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "29 Sep 2011" "4.2.7p217" "User Commands" +.TH ntpd 1ntpdman "03 Oct 2011" "4.2.7p218" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed September 29, 2011 at 08:05:33 AM by AutoGen 5.12 +.\" It has been AutoGen-ed October 3, 2011 at 04:58:59 AM by AutoGen 5.12 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 3d74826676..056506db55 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd September 29 2011 +.Dd October 3 2011 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed September 29, 2011 at 08:05:37 AM by AutoGen 5.12 +.\" It has been AutoGen-ed October 3, 2011 at 04:59:03 AM by AutoGen 5.12 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in index 39df8e0748..ab25800da9 100644 --- a/ntpd/ntpd.man.in +++ b/ntpd/ntpd.man.in @@ -1,8 +1,8 @@ -.TH ntpd @NTPD_MS@ "29 Sep 2011" "4.2.7p217" "User Commands" +.TH ntpd @NTPD_MS@ "03 Oct 2011" "4.2.7p218" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed September 29, 2011 at 08:05:33 AM by AutoGen 5.12 +.\" It has been AutoGen-ed October 3, 2011 at 04:58:59 AM by AutoGen 5.12 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in index 8c296313a8..d0793b4735 100644 --- a/ntpd/ntpd.mdoc.in +++ b/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd September 29 2011 +.Dd October 3 2011 .Dt NTPD @NTPD_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed September 29, 2011 at 08:05:37 AM by AutoGen 5.12 +.\" It has been AutoGen-ed October 3, 2011 at 04:59:03 AM by AutoGen 5.12 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index adaaccb5c7..824a5c8cbb 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed September 29, 2011 at 08:05:43 AM by AutoGen 5.12 + * It has been AutoGen-ed October 3, 2011 at 04:59:08 AM by AutoGen 5.12 * From the definitions ntpdc-opts.def * and the template file options * @@ -52,7 +52,7 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ static char const zCopyright[334] = -"ntpdc 4.2.7p217\n\ +"ntpdc 4.2.7p218\n\ Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -473,7 +473,7 @@ static tOptDesc optDesc[OPTION_CT] = { */ static char const zPROGNAME[6] = "NTPDC"; static char const zUsageTitle[132] = -"ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p217\n\ +"ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p218\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 96e7676fea..c57a4d4d33 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed September 29, 2011 at 08:05:43 AM by AutoGen 5.12 + * It has been AutoGen-ed October 3, 2011 at 04:59:07 AM by AutoGen 5.12 * From the definitions ntpdc-opts.def * and the template file options * @@ -81,8 +81,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.7p217" -#define NTPDC_FULL_VERSION "ntpdc 4.2.7p217" +#define NTPDC_VERSION "4.2.7p218" +#define NTPDC_FULL_VERSION "ntpdc 4.2.7p218" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index e7dd8172e6..f481e4b5f1 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed September 29, 2011 at 08:05:54 AM by AutoGen 5.12 +# It has been AutoGen-ed October 3, 2011 at 04:59:19 AM by AutoGen 5.12 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -40,7 +40,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p217 +ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p218 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman index 75d6c6bbff..dac8268c15 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -1,8 +1,8 @@ -.TH ntpdc 1ntpdcman "29 Sep 2011" "4.2.7p217" "User Commands" +.TH ntpdc 1ntpdcman "03 Oct 2011" "4.2.7p218" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed September 29, 2011 at 08:05:51 AM by AutoGen 5.12 +.\" It has been AutoGen-ed October 3, 2011 at 04:59:16 AM by AutoGen 5.12 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc index a9e3686052..d960fd6752 100644 --- a/ntpdc/ntpdc.1ntpdcmdoc +++ b/ntpdc/ntpdc.1ntpdcmdoc @@ -1,9 +1,9 @@ -.Dd September 29 2011 +.Dd October 3 2011 .Dt NTPDC 1ntpdcmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed September 29, 2011 at 08:05:55 AM by AutoGen 5.12 +.\" It has been AutoGen-ed October 3, 2011 at 04:59:20 AM by AutoGen 5.12 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html index c22196f188..218df2651f 100644 --- a/ntpdc/ntpdc.html +++ b/ntpdc/ntpdc.html @@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.7p217 of ntpdc. +

This document applies to version 4.2.7p218 of ntpdc.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -116,7 +116,7 @@ Up: ntpdc Invocation

This is the automatically generated usage text for ntpdc: -

ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p217
+
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p218
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index a5b8b27c95..824b06741a 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "29 Sep 2011" "4.2.7p217" "User Commands"
+.TH ntpdc @NTPDC_MS@ "03 Oct 2011" "4.2.7p218" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:51 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:16 AM by AutoGen 5.12
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 667a3a4011..b2f8de84e5 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:55 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:20 AM by AutoGen 5.12
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 78d77a3787..db39060fa2 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  September 29, 2011 at 08:05:56 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  October  3, 2011 at 04:59:21 AM by AutoGen 5.12
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[333] =
-"ntpq 4.2.7p217\n\
+"ntpq 4.2.7p218\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -450,7 +450,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[5] = "NTPQ";
 static char const zUsageTitle[121] =
-"ntpq - standard NTP query program - Ver. 4.2.7p217\n\
+"ntpq - standard NTP query program - Ver. 4.2.7p218\n\
 USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index df42d491ba..93fa4a3490 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  September 29, 2011 at 08:05:56 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  October  3, 2011 at 04:59:20 AM by AutoGen 5.12
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -80,8 +80,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p217"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p217"
+#define NTPQ_VERSION       "4.2.7p218"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p218"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 4e3c217fe1..085f52df87 100644
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  September 29, 2011 at 08:06:08 AM by AutoGen 5.12
+# It has been AutoGen-ed  October  3, 2011 at 04:59:34 AM by AutoGen 5.12
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -40,7 +40,7 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p217
+ntpq - standard NTP query program - Ver. 4.2.7p218
 USAGE:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index b8b3e4c8e7..d01b07da1a 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "29 Sep 2011" "4.2.7p217" "User Commands"
+.TH ntpq 1ntpqman "03 Oct 2011" "4.2.7p218" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:06 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:31 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index e3056498a6..ed7a1ea28d 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:09 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:34 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 7c6fa5d624..3cce0ad33e 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "29 Sep 2011" "4.2.7p217" "User Commands"
+.TH ntpq @NTPQ_MS@ "03 Oct 2011" "4.2.7p218" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:06 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:31 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 7ef505fa9b..c1e82cb000 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:09 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:34 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index bab0058926..a8386cf424 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  September 29, 2011 at 08:06:10 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  October  3, 2011 at 04:59:35 AM by AutoGen 5.12
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[337] =
-"ntpsnmpd 4.2.7p217\n\
+"ntpsnmpd 4.2.7p218\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -277,7 +277,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[9] = "NTPSNMPD";
 static char const zUsageTitle[105] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p217\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p218\n\
 USAGE:  %s [ - [] | --[{=| }] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 12175161ca..37df7aad39 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  September 29, 2011 at 08:06:10 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  October  3, 2011 at 04:59:35 AM by AutoGen 5.12
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -74,8 +74,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p217"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p217"
+#define NTPSNMPD_VERSION       "4.2.7p218"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p218"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 68c7791aca..d16e47f02c 100644
--- a/ntpsnmpd/ntpsnmpd-opts.texi
+++ b/ntpsnmpd/ntpsnmpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.texi)
 # 
-# It has been AutoGen-ed  September 29, 2011 at 08:06:15 AM by AutoGen 5.12
+# It has been AutoGen-ed  October  3, 2011 at 04:59:41 AM by AutoGen 5.12
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -33,7 +33,7 @@ This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p217
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p218
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index a660ebde56..fd16aa5db3 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "29 Sep 2011" "4.2.7p217" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "03 Oct 2011" "4.2.7p218" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:13 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:38 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 48a56e4731..91240929f3 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:15 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:41 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 9e92aae130..6413cc59ea 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "29 Sep 2011" "4.2.7p217" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "03 Oct 2011" "4.2.7p218" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:13 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:38 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index 7c21a41eaa..fdea1c6c64 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:15 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:41 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/packageinfo.sh b/packageinfo.sh
index c4b21137ce..eeadebab75 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -70,7 +70,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=217
+point=218
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/ntp-wait-opts.texi b/scripts/ntp-wait-opts.texi
index c10d26ef5f..430ec2cf3b 100644
--- a/scripts/ntp-wait-opts.texi
+++ b/scripts/ntp-wait-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.texi)
 # 
-# It has been AutoGen-ed  September 29, 2011 at 08:05:12 AM by AutoGen 5.12
+# It has been AutoGen-ed  October  3, 2011 at 04:58:23 AM by AutoGen 5.12
 # From the definitions    ntp-wait-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index 9638e2194d..e014ad8f00 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "29 Sep 2011" "ntp (4.2.7p217)" "User Commands"
+.TH ntp-wait 1ntp-waitman "03 Oct 2011" "ntp (4.2.7p218)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:09 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:58:20 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc
index fb26adb33e..5f61e6780f 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:18 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:58:28 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index f491620f82..eb47cb4a34 100644
--- a/scripts/ntp-wait.html
+++ b/scripts/ntp-wait.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
This document applies to version 4.2.7p217 of ntp-wait.
+  
This document applies to version 4.2.7p218 of ntp-wait.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index 94719853ed..2c39e7e14c 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "29 Sep 2011" "ntp (4.2.7p217)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "03 Oct 2011" "ntp (4.2.7p218)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:09 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:58:20 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index ddfccc00d2..a99b9f18ea 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:18 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:58:28 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 72311d04b9..c6b650f479 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  September 29, 2011 at 08:06:30 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  October  3, 2011 at 04:56:02 AM by AutoGen 5.12
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[333] =
-"sntp 4.2.7p217\n\
+"sntp 4.2.7p218\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -663,7 +663,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[5] = "SNTP";
 static char const zUsageTitle[161] =
-"sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p217\n\
+"sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p218\n\
 USAGE:  %s [ - [] | --[{=| }] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n";
 static char const zRcName[7] = ".ntprc";
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index bf5997758f..6a2c64ec21 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  September 29, 2011 at 08:06:30 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  October  3, 2011 at 04:56:01 AM by AutoGen 5.12
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define SNTP_VERSION       "4.2.7p217"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p217"
+#define SNTP_VERSION       "4.2.7p218"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p218"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 58f71b1ff8..5dd37f8d8b 100644
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  September 29, 2011 at 08:06:39 AM by AutoGen 5.12
+# It has been AutoGen-ed  October  3, 2011 at 05:00:06 AM by AutoGen 5.12
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -91,7 +91,7 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p217
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p218
 USAGE:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index e9532d5e32..cb4e166224 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "29 Sep 2011" "4.2.7p217" "User Commands"
+.TH sntp 1sntpman "03 Oct 2011" "4.2.7p218" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:37 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 05:00:01 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 501156e206..e3e1b12619 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:40 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 05:00:07 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp.html b/sntp/sntp.html
index cad3b55705..2a95511b6e 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
This document applies to version 4.2.7p217 of sntp.
+  
This document applies to version 4.2.7p218 of sntp.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -162,7 +162,7 @@ Up: sntp Invocation
 

 This is the automatically generated usage text for sntp:
 
-
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p217
+
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p218
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index a1a3481ec7..24fd64e5a9 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "29 Sep 2011" "4.2.7p217" "User Commands"
+.TH sntp @SNTP_MS@ "03 Oct 2011" "4.2.7p218" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:37 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 05:00:01 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index c73902e585..12bcb748ca 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt SNTP @SNTP_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:40 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 05:00:07 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 77a2b115ff..351e482dd0 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  October  2, 2011 at 07:26:43 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  October  3, 2011 at 04:59:42 AM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[345] =
-"ntp-keygen (ntp) 4.2.7p217\n\
+"ntp-keygen (ntp) 4.2.7p218\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -808,7 +808,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
 static char const zUsageTitle[116] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p217\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p218\n\
 USAGE:  %s [ - [] | --[{=| }] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index d56bae94fb..601b8a1258 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  October  2, 2011 at 07:26:43 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  October  3, 2011 at 04:59:42 AM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -91,8 +91,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    25
-#define NTP_KEYGEN_VERSION       "4.2.7p217"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p217"
+#define NTP_KEYGEN_VERSION       "4.2.7p218"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p218"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index e01fafbb65..ccbb082573 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  September 29, 2011 at 08:06:29 AM by AutoGen 5.12
+# It has been AutoGen-ed  October  3, 2011 at 04:59:52 AM by AutoGen 5.12
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -21,6 +21,7 @@ This software is released under a specialized copyright license.
 @menu
 * ntp-keygen usage::                  ntp-keygen usage help (-?)
 * ntp-keygen certificate::           certificate option (-c)
+* ntp-keygen cipher::                cipher option (-C)
 * ntp-keygen debug-level::           debug-level option (-d)
 * ntp-keygen get-pvt-passwd::        get-pvt-passwd option (-q)
 * ntp-keygen gq-params::             gq-params option (-G)
@@ -49,10 +50,11 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p217
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p218
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
+   -C Str cipher         privatekey cipher
    -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
    -D Str set-debug-level Set the debug verbosity level
@@ -118,6 +120,23 @@ Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
 
+@node ntp-keygen cipher
+@subsection cipher option (-C)
+@cindex ntp-keygen-cipher
+
+This is the ``privatekey cipher'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{AUTOKEY} during the compilation.
+@end itemize
+
+Select the cipher which is used to encrypt the files containing
+private keys.  The default is three-key triple DES in CBC mode,
+equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
+available in "openssl -h" output.
+
 @node ntp-keygen debug-level
 @subsection debug-level option (-d)
 @cindex ntp-keygen-debug-level
@@ -318,7 +337,7 @@ must be compiled in by defining @code{AUTOKEY} during the compilation.
 @end itemize
 
 Encrypt generated files containing private data with the specified
-password and the DES-CBC algorithm.
+password and the cipher selected with -C/--cipher.
 
 @node ntp-keygen set-debug-level
 @subsection set-debug-level option (-D)
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index e0dd1efb76..0be9c611f8 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "29 Sep 2011" "ntp (4.2.7p217)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "03 Oct 2011" "ntp (4.2.7p218)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:25 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:49 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -728,6 +728,14 @@ Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
 .TP
+.BR \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
+privatekey cipher.
+.sp
+Select the cipher which is used to encrypt the files containing
+private keys.  The default is three-key triple DES in CBC mode,
+equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
+available in "openssl -h" output.
+.TP
 .BR \-d ", " -\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
@@ -807,7 +815,7 @@ public certificates.
 output private password.
 .sp
 Encrypt generated files containing private data with the specified
-password and the DES-CBC algorithm.
+password and the cipher selected with -C/--cipher.
 .TP
 .BR \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
 input private password.
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 927db105d8..81e6f05e0e 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:29 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:53 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -716,6 +716,13 @@ Select the certificate message digest/signature encryption scheme.
 Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
+.It  \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
+privatekey cipher.
+.sp
+Select the cipher which is used to encrypt the files containing
+private keys.  The default is three-key triple DES in CBC mode,
+equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
+available in "openssl -h" output.
 .It  \-d ", " -\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
@@ -784,7 +791,7 @@ public certificates.
 output private password.
 .sp
 Encrypt generated files containing private data with the specified
-password and the DES-CBC algorithm.
+password and the cipher selected with -C/--cipher.
 .It  \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
 input private password.
 .sp
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 5decd9ca83..cf56addc42 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "29 Sep 2011" "ntp (4.2.7p217)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "03 Oct 2011" "ntp (4.2.7p218)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:25 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:49 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -728,6 +728,14 @@ Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
 .TP
+.BR \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
+privatekey cipher.
+.sp
+Select the cipher which is used to encrypt the files containing
+private keys.  The default is three-key triple DES in CBC mode,
+equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
+available in "openssl -h" output.
+.TP
 .BR \-d ", " -\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
@@ -807,7 +815,7 @@ public certificates.
 output private password.
 .sp
 Encrypt generated files containing private data with the specified
-password and the DES-CBC algorithm.
+password and the cipher selected with -C/--cipher.
 .TP
 .BR \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
 input private password.
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index afb8ecccf2..68fb8ff409 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 29 2011
+.Dd October 3 2011
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:29 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  October  3, 2011 at 04:59:53 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -716,6 +716,13 @@ Select the certificate message digest/signature encryption scheme.
 Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
+.It  \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
+privatekey cipher.
+.sp
+Select the cipher which is used to encrypt the files containing
+private keys.  The default is three-key triple DES in CBC mode,
+equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
+available in "openssl -h" output.
 .It  \-d ", " -\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
@@ -784,7 +791,7 @@ public certificates.
 output private password.
 .sp
 Encrypt generated files containing private data with the specified
-password and the DES-CBC algorithm.
+password and the cipher selected with -C/--cipher.
 .It  \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
 input private password.
 .sp