From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 31 Mar 2010 09:16:48 +0000 (+0000)
Subject: NTP_4_2_7P21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49f63fa5ce62f08e45be4e3c2d451e5a1e6f3bb0;p=thirdparty%2Fntp.git

NTP_4_2_7P21

bk: 4bb31300qGjNpApnaQh63rZn3LCXqQ
---

diff --git a/ChangeLog b/ChangeLog
index a618d0ad21..7b344d4a3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.7p21) 2010/03/31 Released by Harlan Stenn <stenn@ntp.org>
 * Include (4.2.6p1-RC6) - [Bug 1514] Typo in ntp_proto.c: fabs(foo < .4)
   should be fabs(foo) < .4.
 * Include (4.2.6p1-RC6) - [Bug 1464] synchronization source wrong for
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index c27a0efb5a..bf5c1fa21d 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  February 13, 2010 at 11:44:09 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:14:24 AM by AutoGen 5.10
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -956,7 +956,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPD";
 tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.7p20\n\
+"ntpd - NTP daemon program - Ver. 4.2.7p21\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 1a4b955742..96ec8ee99d 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  February 13, 2010 at 11:44:07 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:14:24 AM by AutoGen 5.10
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    35
-#define NTPD_VERSION       "4.2.7p20"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.7p20"
+#define NTPD_VERSION       "4.2.7p21"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.7p21"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 536bc04ec7..f10a511b04 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  February 13, 2010 at 11:46:39 AM by AutoGen 5.10
+# It has been AutoGen-ed  March 31, 2010 at 09:14:56 AM by AutoGen 5.10
 # 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.7p20
+ntpd - NTP daemon program - Ver. 4.2.7p21
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index 12ae9d578a..68c63bf434 100644
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2010-02-13 "( 4.2.7p20)" "Programmer's Manual"
+.TH NTPD 1 2010-03-31 "( 4.2.7p21)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  February 13, 2010 at 11:46:38 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  March 31, 2010 at 09:14:56 AM by AutoGen 5.10
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 53484cde52..39e4bc695f 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  February 13, 2010 at 11:47:12 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:15:01 AM by AutoGen 5.10
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -452,7 +452,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDC";
 tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p20\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p21\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 330b6da9fb..4c16d1d7de 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  February 13, 2010 at 11:47:11 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:15:01 AM by AutoGen 5.10
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p20"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p20"
+#define NTPDC_VERSION       "4.2.7p21"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p21"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index e2906c315d..3f9c9b33a2 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  February 13, 2010 at 11:48:00 AM by AutoGen 5.10
+# It has been AutoGen-ed  March 31, 2010 at 09:15:11 AM by AutoGen 5.10
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -58,7 +58,7 @@ This is the automatically generated usage text for ntpdc:
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTP query program - Ver. 4.2.7p20
+ntpdc - vendor-specific NTP query program - Ver. 4.2.7p21
 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.1 b/ntpdc/ntpdc.1
index 720721f697..83c11a9e3e 100644
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2010-02-13 "( 4.2.7p20)" "Programmer's Manual"
+.TH NTPDC 1 2010-03-31 "( 4.2.7p21)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  February 13, 2010 at 11:47:59 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  March 31, 2010 at 09:15:11 AM by AutoGen 5.10
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 02ce88bc10..d93f567213 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  February 13, 2010 at 11:48:02 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:15:12 AM by AutoGen 5.10
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -427,7 +427,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPQ";
 tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.7p20\n\
+"ntpq - standard NTP query program - Ver. 4.2.7p21\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 1f6d194917..67b4837a55 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  February 13, 2010 at 11:48:01 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:15:12 AM by AutoGen 5.10
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -69,8 +69,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p20"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.7p20"
+#define NTPQ_VERSION       "4.2.7p21"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.7p21"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index ba0ea4d678..ffcb749609 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  February 13, 2010 at 11:48:46 AM by AutoGen 5.10
+# It has been AutoGen-ed  March 31, 2010 at 09:15:20 AM by AutoGen 5.10
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,7 +47,7 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p20
+ntpq - standard NTP query program - Ver. 4.2.7p21
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 54dcb224c1..c855e10539 100644
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2010-02-13 "( 4.2.7p20)" "Programmer's Manual"
+.TH NTPQ 1 2010-03-31 "( 4.2.7p21)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  February 13, 2010 at 11:48:45 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  March 31, 2010 at 09:15:20 AM by AutoGen 5.10
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 8d4f74d78d..f61f949fa1 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  February 13, 2010 at 11:48:48 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:15:21 AM by AutoGen 5.10
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -233,7 +233,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPSNMPD";
 tSCC   zUsageTitle[] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p20\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p21\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 0c6a782b88..90d06deef8 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  February 13, 2010 at 11:48:47 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:15:21 AM by AutoGen 5.10
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -62,8 +62,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    7
-#define NTPSNMPD_VERSION       "4.2.7p20"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p20"
+#define NTPSNMPD_VERSION       "4.2.7p21"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p21"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 60a6189ec3..609afa0f8d 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  February 13, 2010 at 11:49:20 AM by AutoGen 5.10
+# It has been AutoGen-ed  March 31, 2010 at 09:15:21 AM by AutoGen 5.10
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -33,28 +33,7 @@ This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p20
-USAGE:  ntpsnmpd [ -<flag> | --<name> ]...
-  Flg Arg Option-Name    Description
-   -n no  nofork         Do not fork
-   -p no  syslog         Log to syslog()
-      opt version        Output version information and exit
-   -? no  help           Display extended usage information and exit
-   -! no  more-help      Extended usage information passed thru pager
-   -> opt save-opts      Save the option state to a config file
-   -< Str load-opts      Load options from a config file
-                                - disabled as --no-load-opts
-                                - may appear multiple times
-
-Options are specified by doubled hyphens and their name
-or by a single hyphen and the flag character.
-
-The following option preset mechanisms are supported:
- - reading file /deacon/users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpsnmpd/.ntprc
- - examining environment variables named NTPSNMPD_*
-
-please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
+ntpsnmpd is unavailable - no --help
 @end example
 @exampleindent 4
 
diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index f92dbeee6a..ee382ccce1 100644
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2010-02-13 "( 4.2.7p20)" "Programmer's Manual"
+.TH NTPSNMPD 1 2010-03-31 "( 4.2.7p21)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  February 13, 2010 at 11:49:19 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  March 31, 2010 at 09:15:21 AM by AutoGen 5.10
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/packageinfo.sh b/packageinfo.sh
index 36efccd3b5..26f9d2b536 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -57,7 +57,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=20
+point=21
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index a07ff6f05a..71987b6066 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  February 13, 2010 at 11:54:48 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:16:27 AM by AutoGen 5.10
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -474,7 +474,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.7p20\n\
+"sntp - standard SNTP program - Ver. 4.2.7p21\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index b8e6a15279..67df83ce3b 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  February 13, 2010 at 11:54:47 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:16:27 AM by AutoGen 5.10
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -72,8 +72,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.7p20"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.7p20"
+#define SNTP_VERSION       "4.2.7p21"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.7p21"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 3684093675..d81d16b403 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  February 13, 2010 at 11:55:08 AM by AutoGen 5.10
+# It has been AutoGen-ed  March 31, 2010 at 09:16:31 AM by AutoGen 5.10
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -56,7 +56,7 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard SNTP program - Ver. 4.2.7p20
+sntp - standard SNTP program - Ver. 4.2.7p21
 USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... hostname-or-IP ...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/sntp/sntp.1 b/sntp/sntp.1
index ecedb0a3af..ec71d4e304 100644
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2010-02-13 "( 4.2.7p20)" "Programmer's Manual"
+.TH SNTP 1 2010-03-31 "( 4.2.7p21)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  February 13, 2010 at 11:55:07 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  March 31, 2010 at 09:16:30 AM by AutoGen 5.10
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/sntp/sntp.html b/sntp/sntp.html
index e2d7d30024..d7d85203a5 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -3,7 +3,7 @@
 <title>Sntp User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="Sntp User's Manual">
-<meta name="generator" content="makeinfo 4.13">
+<meta name="generator" content="makeinfo 4.7">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">Sntp User's Manual</h1>
 <div class="node">
-<a name="Top"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Description">sntp Description</a>,
+<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Description">sntp Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-
+<br>
 </div>
 
 <h2 class="unnumbered">Simple Network Time Protocol User Manual</h2>
@@ -38,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.
 
-  <p>This document applies to version 4.2.7p20 of <code>sntp</code>.
+  <p>This document applies to version 4.2.7p21 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by the draft NTPv4
 IETF specification.
@@ -57,12 +55,11 @@ IETF specification.
 </ul>
 
 <div class="node">
-<a name="sntp-Description"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Usage">Usage</a>,
+<a name="sntp-Description"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#Usage">Usage</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#Top">Top</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-
+<br>
 </div>
 
 <!-- node-name,  next,  previous,  up -->
@@ -78,11 +75,10 @@ error bound of the system clock relative to the server clock.
 
 <!-- @include sntp-opts.texi -->
 <div class="node">
-<a name="Usage"></a>
 <p><hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-Description">sntp Description</a>,
+<a name="Usage"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-Description">sntp Description</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-
+<br>
 </div>
 
 <!-- node-name,  next,  previous,  up -->
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 2a68a5ab82..6187b20783 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  February 13, 2010 at 11:55:11 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:16:31 AM by AutoGen 5.10
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -738,7 +738,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p20\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p21\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index f7804e17d6..297a362e7c 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  February 13, 2010 at 11:55:11 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  March 31, 2010 at 09:16:31 AM by AutoGen 5.10
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -78,8 +78,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define NTP_KEYGEN_VERSION       "4.2.7p20"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p20"
+#define NTP_KEYGEN_VERSION       "4.2.7p21"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p21"
 
 /*
  *  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 e247ef3d3f..bbd8f606a1 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  February 13, 2010 at 11:55:38 AM by AutoGen 5.10
+# It has been AutoGen-ed  March 31, 2010 at 09:16:40 AM by AutoGen 5.10
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -51,7 +51,7 @@ This is the automatically generated usage text for ntp-keygen:
 @exampleindent 0
 @example
 Using OpenSSL version 90704f
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p20
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p21
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 5454a40c0f..62df1752c7 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2010-02-13 "(ntp 4.2.7p20)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2010-03-31 "(ntp 4.2.7p21)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  February 13, 2010 at 11:55:37 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  March 31, 2010 at 09:16:39 AM by AutoGen 5.10
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"