From: Harlan Stenn Date: Thu, 29 Sep 2011 08:06:54 +0000 (+0000) Subject: NTP_4_2_7P217 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfa1e581e351b304a4b9dfc50db4e86daf43876a;p=thirdparty%2Fntp.git NTP_4_2_7P217 bk: 4e84271ef2DHbHw0w2zhIG4kXFh9Fg --- diff --git a/ChangeLog b/ChangeLog index 67d5ada56f..9c0c4f4e17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p217) 2011/09/29 Released by Harlan Stenn * [Bug 2020] ntp-keygen -s no longer sets host in cert file name. * [Backward Incompatible] ntp-keygen -i option long name changed from misleading --issuer-name to --ident. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 6411e0b06f..f5782655e6 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 27, 2011 at 10:35:41 AM by AutoGen 5.12 + * It has been AutoGen-ed September 29, 2011 at 08:05:21 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.7p216\n\ +"ntpd 4.2.7p217\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.7p216\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p217\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n"; #define zRcName NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 25ac59facc..1abef906f3 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 27, 2011 at 10:35:40 AM by AutoGen 5.12 + * It has been AutoGen-ed September 29, 2011 at 08:05:21 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.7p216" -#define NTPD_FULL_VERSION "ntpd 4.2.7p216" +#define NTPD_VERSION "4.2.7p217" +#define NTPD_FULL_VERSION "ntpd 4.2.7p217" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 03cd216050..5c4fa2e717 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 27, 2011 at 10:36:54 AM by AutoGen 5.12 +# It has been AutoGen-ed September 29, 2011 at 08:05:36 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.7p216 +ntpd - NTP daemon program - Ver. 4.2.7p217 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 4e54908438..bad0020ee0 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "27 Sep 2011" "4.2.7p216" "User Commands" +.TH ntpd 1ntpdman "29 Sep 2011" "4.2.7p217" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed September 27, 2011 at 10:36:48 AM by AutoGen 5.12 +.\" It has been AutoGen-ed September 29, 2011 at 08:05:33 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 00fff83b23..3d74826676 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd September 27 2011 +.Dd September 29 2011 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed September 27, 2011 at 10:36:56 AM by AutoGen 5.12 +.\" It has been AutoGen-ed September 29, 2011 at 08:05:37 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 a7da89e7f0..39df8e0748 100644 --- a/ntpd/ntpd.man.in +++ b/ntpd/ntpd.man.in @@ -1,8 +1,8 @@ -.TH ntpd @NTPD_MS@ "27 Sep 2011" "4.2.7p216" "User Commands" +.TH ntpd @NTPD_MS@ "29 Sep 2011" "4.2.7p217" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed September 27, 2011 at 10:36:48 AM by AutoGen 5.12 +.\" It has been AutoGen-ed September 29, 2011 at 08:05:33 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 1e8bd46c37..8c296313a8 100644 --- a/ntpd/ntpd.mdoc.in +++ b/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd September 27 2011 +.Dd September 29 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 27, 2011 at 10:36:56 AM by AutoGen 5.12 +.\" It has been AutoGen-ed September 29, 2011 at 08:05:37 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 bfc31df2d5..adaaccb5c7 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 27, 2011 at 10:37:42 AM by AutoGen 5.12 + * It has been AutoGen-ed September 29, 2011 at 08:05:43 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.7p216\n\ +"ntpdc 4.2.7p217\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.7p216\n\ +"ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p217\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 cba2d52dc6..96e7676fea 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 27, 2011 at 10:37:41 AM by AutoGen 5.12 + * It has been AutoGen-ed September 29, 2011 at 08:05:43 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.7p216" -#define NTPDC_FULL_VERSION "ntpdc 4.2.7p216" +#define NTPDC_VERSION "4.2.7p217" +#define NTPDC_FULL_VERSION "ntpdc 4.2.7p217" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 6624c9cc2c..e7dd8172e6 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 27, 2011 at 10:38:02 AM by AutoGen 5.12 +# It has been AutoGen-ed September 29, 2011 at 08:05:54 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.7p216 +ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p217 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 2678d674bc..75d6c6bbff 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -1,8 +1,8 @@ -.TH ntpdc 1ntpdcman "27 Sep 2011" "4.2.7p216" "User Commands" +.TH ntpdc 1ntpdcman "29 Sep 2011" "4.2.7p217" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed September 27, 2011 at 10:37:58 AM by AutoGen 5.12 +.\" It has been AutoGen-ed September 29, 2011 at 08:05:51 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 21a4799c9a..a9e3686052 100644 --- a/ntpdc/ntpdc.1ntpdcmdoc +++ b/ntpdc/ntpdc.1ntpdcmdoc @@ -1,9 +1,9 @@ -.Dd September 27 2011 +.Dd September 29 2011 .Dt NTPDC 1ntpdcmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed September 27, 2011 at 10:38:03 AM by AutoGen 5.12 +.\" It has been AutoGen-ed September 29, 2011 at 08:05:55 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 7ebfde636c..c22196f188 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.7p216 of ntpdc. +

This document applies to version 4.2.7p217 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.7p216
+
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p217
 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 e1ba734f83..a5b8b27c95 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
+.TH ntpdc @NTPDC_MS@ "29 Sep 2011" "4.2.7p217" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:37:58 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:51 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 b1cb3dd714..667a3a4011 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 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 27, 2011 at 10:38:03 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:55 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 379ffd7ef2..78d77a3787 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 27, 2011 at 10:38:08 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 29, 2011 at 08:05:56 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.7p216\n\
+"ntpq 4.2.7p217\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.7p216\n\
+"ntpq - standard NTP query program - Ver. 4.2.7p217\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 44ace66b6d..df42d491ba 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 27, 2011 at 10:38:08 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 29, 2011 at 08:05:56 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.7p216"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p216"
+#define NTPQ_VERSION       "4.2.7p217"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p217"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 6f3da9089d..4e3c217fe1 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 27, 2011 at 10:38:24 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 29, 2011 at 08:06:08 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.7p216
+ntpq - standard NTP query program - Ver. 4.2.7p217
 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 68bc899330..b8b3e4c8e7 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "27 Sep 2011" "4.2.7p216" "User Commands"
+.TH ntpq 1ntpqman "29 Sep 2011" "4.2.7p217" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:21 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:06 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 00b29d82d1..e3056498a6 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 2011
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:24 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:09 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 e26c301ca5..7c6fa5d624 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
+.TH ntpq @NTPQ_MS@ "29 Sep 2011" "4.2.7p217" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:21 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:06 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 825341315c..7ef505fa9b 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 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 27, 2011 at 10:38:24 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:09 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 79277b8e94..bab0058926 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 27, 2011 at 10:38:27 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 29, 2011 at 08:06:10 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.7p216\n\
+"ntpsnmpd 4.2.7p217\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.7p216\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p217\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 28628d230c..12175161ca 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 27, 2011 at 10:38:27 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 29, 2011 at 08:06:10 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.7p216"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p216"
+#define NTPSNMPD_VERSION       "4.2.7p217"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p217"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 0f7b22f0ba..68c7791aca 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 27, 2011 at 10:39:12 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 29, 2011 at 08:06:15 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.7p216
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p217
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 37273f6c9f..a660ebde56 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "27 Sep 2011" "4.2.7p216" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "29 Sep 2011" "4.2.7p217" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:09 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:13 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 7657053252..48a56e4731 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 2011
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:14 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:15 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 eb2c9ae113..9e92aae130 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "29 Sep 2011" "4.2.7p217" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:09 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:13 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 950e2a5d67..7c21a41eaa 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 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 27, 2011 at 10:39:14 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:15 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 55442e0e32..c4b21137ce 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=216
+point=217
 
 ### 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 9888923f59..c10d26ef5f 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 27, 2011 at 10:35:13 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 29, 2011 at 08:05:12 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 ad64951b67..9638e2194d 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "27 Sep 2011" "ntp (4.2.7p216)" "User Commands"
+.TH ntp-wait 1ntp-waitman "29 Sep 2011" "ntp (4.2.7p217)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:35:10 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:09 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 49d5c936f7..fb26adb33e 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 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 27, 2011 at 10:35:19 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:18 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 8e871955ac..f491620f82 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.7p216 of ntp-wait.
+  
This document applies to version 4.2.7p217 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 ca083096b6..94719853ed 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "27 Sep 2011" "ntp (4.2.7p216)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "29 Sep 2011" "ntp (4.2.7p217)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:35:10 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:09 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 3652fd24ee..ddfccc00d2 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 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 27, 2011 at 10:35:19 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:05:18 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 07b2d12e8b..72311d04b9 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 27, 2011 at 10:24:20 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 29, 2011 at 08:06:30 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.7p216\n\
+"sntp 4.2.7p217\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.7p216\n\
+"sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p217\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 68a56c82ce..bf5997758f 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 27, 2011 at 10:24:17 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 29, 2011 at 08:06:30 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.7p216"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p216"
+#define SNTP_VERSION       "4.2.7p217"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p217"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 0a2f0eb05b..58f71b1ff8 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 27, 2011 at 10:40:00 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 29, 2011 at 08:06:39 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.7p216
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p217
 USAGE:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 5948cb1d3e..e9532d5e32 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "27 Sep 2011" "4.2.7p216" "User Commands"
+.TH sntp 1sntpman "29 Sep 2011" "4.2.7p217" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:57 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:37 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 064c896c52..501156e206 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 2011
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:40:01 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:40 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 7a568e1e05..cad3b55705 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.7p216 of sntp.
+  
This document applies to version 4.2.7p217 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.7p216
+
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p217
 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 16ab36d98c..a1a3481ec7 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
+.TH sntp @SNTP_MS@ "29 Sep 2011" "4.2.7p217" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:57 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:37 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 d07d8e6f8a..c73902e585 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 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 27, 2011 at 10:40:01 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:40 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 4ac824eaab..b986fa8821 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  September 29, 2011 at 05:16:27 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 29, 2011 at 08:06:17 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.7p216\n\
+"ntp-keygen (ntp) 4.2.7p217\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\
@@ -778,7 +778,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.7p216\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p217\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 906db73b9a..2d92e0d0c8 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  September 29, 2011 at 05:16:27 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 29, 2011 at 08:06:17 AM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p216"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p216"
+#define NTP_KEYGEN_VERSION       "4.2.7p217"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p217"
 
 /*
  *  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 15a9b7fb6e..e01fafbb65 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 27, 2011 at 10:39:32 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 29, 2011 at 08:06:29 AM by AutoGen 5.12
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -26,8 +26,8 @@ This software is released under a specialized copyright license.
 * ntp-keygen gq-params::             gq-params option (-G)
 * ntp-keygen host-key::              host-key option (-H)
 * ntp-keygen id-key::                id-key option (-e)
+* ntp-keygen ident::                 ident option (-i)
 * ntp-keygen iffkey::                iffkey option (-I)
-* ntp-keygen issuer-name::           issuer-name option (-i)
 * ntp-keygen lifetime::              lifetime option (-l)
 * ntp-keygen md5key::                md5key option (-M)
 * ntp-keygen modulus::               modulus option (-m)
@@ -49,7 +49,7 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p216
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p217
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
@@ -61,7 +61,7 @@ USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
    -G no  gq-params      Generate GQ parameters and keys
    -H no  host-key       generate RSA host key
    -I no  iffkey         generate IFF parameters
-   -i Str issuer-name    set issuer name
+   -i Str ident          set Autokey group name
    -l Num lifetime       set certificate lifetime
    -M no  md5key         generate MD5 keys
    -m Num modulus        modulus
@@ -71,7 +71,7 @@ USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
    -p Str pvt-passwd     output private password
    -q Str get-pvt-passwd input private password
    -S Str sign-key       generate sign key (RSA or DSA)
-   -s Str subject-name   set subject name
+   -s Str subject-name   set host and optionally group name
    -T no  trusted-cert   trusted certificate (TC scheme)
    -V Num mv-params      generate  MV parameters
    -v Num mv-keys        update  MV keys
@@ -190,11 +190,11 @@ must be compiled in by defining @code{AUTOKEY} during the compilation.
 Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail.
 
-@node ntp-keygen iffkey
-@subsection iffkey option (-I)
-@cindex ntp-keygen-iffkey
+@node ntp-keygen ident
+@subsection ident option (-i)
+@cindex ntp-keygen-ident
 
-This is the ``generate iff parameters'' option.
+This is the ``set autokey group name'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -202,14 +202,20 @@ This option has some usage constraints.  It:
 must be compiled in by defining @code{AUTOKEY} during the compilation.
 @end itemize
 
-Generate parameters for the IFF identification scheme, obsoleting
-any that may exist.
+Set the optional Autokey group name to name.  This is used in
+the file name of IFF, GQ, and MV client parameters files.  In
+that role, the default is the host name if this option is not
+provided.  The group name, if specified using -i/--ident or
+using -s/--subject-name following an '@' character, is also a
+part of the self-signed host certificate's subject and issuer
+names in the form host@group and should match the 'crypto ident'
+or 'server ident' configuration in ntpd's configuration file. 
 
-@node ntp-keygen issuer-name
-@subsection issuer-name option (-i)
-@cindex ntp-keygen-issuer-name
+@node ntp-keygen iffkey
+@subsection iffkey option (-I)
+@cindex ntp-keygen-iffkey
 
-This is the ``set issuer name'' option.
+This is the ``generate iff parameters'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -217,8 +223,8 @@ This option has some usage constraints.  It:
 must be compiled in by defining @code{AUTOKEY} during the compilation.
 @end itemize
 
-Set the issuer name to name.  This is used for the issuer field
-in certificates and in the file name for host and sign keys.
+Generate parameters for the IFF identification scheme, obsoleting
+any that may exist.
 
 @node ntp-keygen lifetime
 @subsection lifetime option (-l)
@@ -348,7 +354,7 @@ sign key.
 @subsection subject-name option (-s)
 @cindex ntp-keygen-subject-name
 
-This is the ``set subject name'' option.
+This is the ``set host and optionally group name'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -356,8 +362,16 @@ This option has some usage constraints.  It:
 must be compiled in by defining @code{AUTOKEY} during the compilation.
 @end itemize
 
-Set the subject name to name.  This is used as the subject field
-in certificates and in the file name for identity files.
+Set the Autokey host name, and optionally, group name specified
+following an '@' character.  The host name is used in the file
+name of generated host and signing certificates, without the
+group name.  The host name, and if provided, group name are used
+in host@group form for the host certificate's subject and issuer
+fields.  Specifying '-s @group' is allowed, and results in
+leaving the host name unchanged while appending @group to the
+subject and issuer fields, as with -i group.  The group name, or
+if not provided, the host name are also used in the file names
+of IFF, GQ, and MV client parameter files.
 
 @node ntp-keygen trusted-cert
 @subsection trusted-cert option (-T)
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index 3069ff1fe9..e0dd1efb76 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "27 Sep 2011" "ntp (4.2.7p216)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "29 Sep 2011" "ntp (4.2.7p217)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:28 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:25 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -761,11 +761,17 @@ generate IFF parameters.
 Generate parameters for the IFF identification scheme, obsoleting
 any that may exist.
 .TP
-.BR \-i " \fIissuer\-name\fP, " \-\-issuer\-name "=" \fIissuer\-name\fP
-set issuer name.
+.BR \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
+set Autokey group name.
 .sp
-Set the issuer name to name.  This is used for the issuer field
-in certificates and in the file name for host and sign keys.
+Set the optional Autokey group name to name.  This is used in
+the file name of IFF, GQ, and MV client parameters files.  In
+that role, the default is the host name if this option is not
+provided.  The group name, if specified using -i/--ident or
+using -s/--subject-name following an '@' character, is also a
+part of the self-signed host certificate's subject and issuer
+names in the form host@group and should match the 'crypto ident'
+or 'server ident' configuration in ntpd's configuration file. 
 .TP
 .BR \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
@@ -815,11 +821,19 @@ Generate a new sign key of the designated type, obsoleting any
 that may exist.  By default, the program uses the host key as the
 sign key.
 .TP
-.BR \-s " \fIhost\fP, " \-\-subject\-name "=" \fIhost\fP
-set subject name.
+.BR \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
+set host and optionally group name.
 .sp
-Set the subject name to name.  This is used as the subject field
-in certificates and in the file name for identity files.
+Set the Autokey host name, and optionally, group name specified
+following an '@' character.  The host name is used in the file
+name of generated host and signing certificates, without the
+group name.  The host name, and if provided, group name are used
+in host@group form for the host certificate's subject and issuer
+fields.  Specifying '-s @group' is allowed, and results in
+leaving the host name unchanged while appending @group to the
+subject and issuer fields, as with -i group.  The group name, or
+if not provided, the host name are also used in the file names
+of IFF, GQ, and MV client parameter files.
 .TP
 .BR \-T ", " -\-trusted\-cert
 trusted certificate (TC scheme).
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 06e96611ea..927db105d8 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 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 27, 2011 at 10:39:32 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:29 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -743,11 +743,17 @@ generate IFF parameters.
 .sp
 Generate parameters for the IFF identification scheme, obsoleting
 any that may exist.
-.It  \-i " \fIissuer\-name\fP, " \-\-issuer\-name "=" \fIissuer\-name\fP
-set issuer name.
+.It  \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
+set Autokey group name.
 .sp
-Set the issuer name to name.  This is used for the issuer field
-in certificates and in the file name for host and sign keys.
+Set the optional Autokey group name to name.  This is used in
+the file name of IFF, GQ, and MV client parameters files.  In
+that role, the default is the host name if this option is not
+provided.  The group name, if specified using -i/--ident or
+using -s/--subject-name following an '@' character, is also a
+part of the self-signed host certificate's subject and issuer
+names in the form host@group and should match the 'crypto ident'
+or 'server ident' configuration in ntpd's configuration file. 
 .It  \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
 This option takes an integer number as its argument.
@@ -789,11 +795,19 @@ generate sign key (RSA or DSA).
 Generate a new sign key of the designated type, obsoleting any
 that may exist.  By default, the program uses the host key as the
 sign key.
-.It  \-s " \fIhost\fP, " \-\-subject\-name "=" \fIhost\fP
-set subject name.
+.It  \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
+set host and optionally group name.
 .sp
-Set the subject name to name.  This is used as the subject field
-in certificates and in the file name for identity files.
+Set the Autokey host name, and optionally, group name specified
+following an '@' character.  The host name is used in the file
+name of generated host and signing certificates, without the
+group name.  The host name, and if provided, group name are used
+in host@group form for the host certificate's subject and issuer
+fields.  Specifying '-s @group' is allowed, and results in
+leaving the host name unchanged while appending @group to the
+subject and issuer fields, as with -i group.  The group name, or
+if not provided, the host name are also used in the file names
+of IFF, GQ, and MV client parameter files.
 .It  \-T ", " -\-trusted\-cert
 trusted certificate (TC scheme).
 .sp
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 4680648c4e..5decd9ca83 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "27 Sep 2011" "ntp (4.2.7p216)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "29 Sep 2011" "ntp (4.2.7p217)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:28 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:25 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -761,11 +761,17 @@ generate IFF parameters.
 Generate parameters for the IFF identification scheme, obsoleting
 any that may exist.
 .TP
-.BR \-i " \fIissuer\-name\fP, " \-\-issuer\-name "=" \fIissuer\-name\fP
-set issuer name.
+.BR \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
+set Autokey group name.
 .sp
-Set the issuer name to name.  This is used for the issuer field
-in certificates and in the file name for host and sign keys.
+Set the optional Autokey group name to name.  This is used in
+the file name of IFF, GQ, and MV client parameters files.  In
+that role, the default is the host name if this option is not
+provided.  The group name, if specified using -i/--ident or
+using -s/--subject-name following an '@' character, is also a
+part of the self-signed host certificate's subject and issuer
+names in the form host@group and should match the 'crypto ident'
+or 'server ident' configuration in ntpd's configuration file. 
 .TP
 .BR \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
@@ -815,11 +821,19 @@ Generate a new sign key of the designated type, obsoleting any
 that may exist.  By default, the program uses the host key as the
 sign key.
 .TP
-.BR \-s " \fIhost\fP, " \-\-subject\-name "=" \fIhost\fP
-set subject name.
+.BR \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
+set host and optionally group name.
 .sp
-Set the subject name to name.  This is used as the subject field
-in certificates and in the file name for identity files.
+Set the Autokey host name, and optionally, group name specified
+following an '@' character.  The host name is used in the file
+name of generated host and signing certificates, without the
+group name.  The host name, and if provided, group name are used
+in host@group form for the host certificate's subject and issuer
+fields.  Specifying '-s @group' is allowed, and results in
+leaving the host name unchanged while appending @group to the
+subject and issuer fields, as with -i group.  The group name, or
+if not provided, the host name are also used in the file names
+of IFF, GQ, and MV client parameter files.
 .TP
 .BR \-T ", " -\-trusted\-cert
 trusted certificate (TC scheme).
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index fdf0092434..afb8ecccf2 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 27 2011
+.Dd September 29 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 27, 2011 at 10:39:32 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 29, 2011 at 08:06:29 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -743,11 +743,17 @@ generate IFF parameters.
 .sp
 Generate parameters for the IFF identification scheme, obsoleting
 any that may exist.
-.It  \-i " \fIissuer\-name\fP, " \-\-issuer\-name "=" \fIissuer\-name\fP
-set issuer name.
+.It  \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
+set Autokey group name.
 .sp
-Set the issuer name to name.  This is used for the issuer field
-in certificates and in the file name for host and sign keys.
+Set the optional Autokey group name to name.  This is used in
+the file name of IFF, GQ, and MV client parameters files.  In
+that role, the default is the host name if this option is not
+provided.  The group name, if specified using -i/--ident or
+using -s/--subject-name following an '@' character, is also a
+part of the self-signed host certificate's subject and issuer
+names in the form host@group and should match the 'crypto ident'
+or 'server ident' configuration in ntpd's configuration file. 
 .It  \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
 This option takes an integer number as its argument.
@@ -789,11 +795,19 @@ generate sign key (RSA or DSA).
 Generate a new sign key of the designated type, obsoleting any
 that may exist.  By default, the program uses the host key as the
 sign key.
-.It  \-s " \fIhost\fP, " \-\-subject\-name "=" \fIhost\fP
-set subject name.
+.It  \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
+set host and optionally group name.
 .sp
-Set the subject name to name.  This is used as the subject field
-in certificates and in the file name for identity files.
+Set the Autokey host name, and optionally, group name specified
+following an '@' character.  The host name is used in the file
+name of generated host and signing certificates, without the
+group name.  The host name, and if provided, group name are used
+in host@group form for the host certificate's subject and issuer
+fields.  Specifying '-s @group' is allowed, and results in
+leaving the host name unchanged while appending @group to the
+subject and issuer fields, as with -i group.  The group name, or
+if not provided, the host name are also used in the file names
+of IFF, GQ, and MV client parameter files.
 .It  \-T ", " -\-trusted\-cert
 trusted certificate (TC scheme).
 .sp