NTP_4_2_5P206

bk: 4a952274YrvPFSu2mC94iMWd37RU5Q

diff --git a/ChangeLog b/ChangeLog
index a0ffd4fda6b6b11a559a653d508aa98aabde227f..aebcf9be1c33331dc1396760de3cb4b6bac59b22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.5p206) 2009/08/26 Released by Harlan Stenn <stenn@ntp.org>
 * accopt.html typo fixes from Dave Mills.
 * [Bug 1283] default to remembering KoD in sntp.
 * clean up numerous sntp/kod_management.c bugs.

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 8e32616ac87fcffec68d98566392ff0b5f0975be..8c6b9aa7566528759ddd4f19ed09add95d6011ab 100644 (file)
--- 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  August 18, 2009 at 07:34:50 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:38:39 AM by AutoGen 5.9.9pre5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -918,7 +918,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPD";
 tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.5p205\n\
+"ntpd - NTP daemon program - Ver. 4.2.5p206\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 bd3266152909768c5aa8e7c42a7f7ce9eb82f7e4..c228c0b8c155ccde5d562f4e8c5ffdb86ef8cb46 100644 (file)
--- 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  August 18, 2009 at 07:34:49 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:38:38 AM by AutoGen 5.9.9pre5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -89,8 +89,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    34
-#define NTPD_VERSION       "4.2.5p205"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p205"
+#define NTPD_VERSION       "4.2.5p206"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p206"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 18c293b603aa4b89f5833bcea635e36c4931d5af..83b3e42fc8821b36d2958038098113276f161254 100644 (file)
--- 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  August 18, 2009 at 07:34:52 AM by AutoGen 5.9.9pre5
+# It has been AutoGen-ed  August 26, 2009 at 07:38:41 AM by AutoGen 5.9.9pre5
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index 2cd7f21634682dc07b9b2f9aa7f88fcdb2396c98..66c69f6e1d341630b32297ee0f1fdc5f41770118 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2009-08-18 "( 4.2.5p205)" "Programmer's Manual"
+.TH NTPD 1 2009-08-26 "( 4.2.5p206)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  August 18, 2009 at 07:34:51 AM by AutoGen 5.9.9pre5
+.\"  It has been AutoGen-ed  August 26, 2009 at 07:38:40 AM by AutoGen 5.9.9pre5
 .\"  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 82ddfe89e3522f9d00ab93f19276c952a8dbb42b..80eba80cc2b34c3ab919482c237c539652d8749e 100644 (file)
--- 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  August 18, 2009 at 07:41:31 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:45:39 AM by AutoGen 5.9.9pre5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -460,7 +460,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDC";
 tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p205\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p206\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 f4521662487fc777a51e4d5d34a46fcc2cd782c1..c0dc0ff053d54f4ea936380a5adb99ac6b8a25df 100644 (file)
--- 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  August 18, 2009 at 07:41:30 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:45:38 AM by AutoGen 5.9.9pre5
  *  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.5p205"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p205"
+#define NTPDC_VERSION       "4.2.5p206"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p206"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 043113e73912eb71a0aaf76c64a93d5493a7da4c..32d0ef399ac268391a00e934b90191323313c28e 100644 (file)
--- 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  August 18, 2009 at 07:41:33 AM by AutoGen 5.9.9pre5
+# It has been AutoGen-ed  August 26, 2009 at 07:45:41 AM by AutoGen 5.9.9pre5
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index 566c86b2bf818b43847b84d31df74e2854999c1b..176ec970e7e3bca947d05364f629b781c37ce2e3 100644 (file)
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2009-08-18 "( 4.2.5p205)" "Programmer's Manual"
+.TH NTPDC 1 2009-08-26 "( 4.2.5p206)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  August 18, 2009 at 07:41:33 AM by AutoGen 5.9.9pre5
+.\"  It has been AutoGen-ed  August 26, 2009 at 07:45:40 AM by AutoGen 5.9.9pre5
 .\"  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 20adde22e101d53af1c4bb51fe1cad5837ae20cf..79090385d5e7b37c8551519d59e837f8c5d59fd1 100644 (file)
--- 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  August 18, 2009 at 07:42:02 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:46:11 AM by AutoGen 5.9.9pre5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -408,7 +408,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPQ";
 tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.5p205\n\
+"ntpq - standard NTP query program - Ver. 4.2.5p206\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 61bb595f26a5e759cec4d2fe3f3184e57d552a1b..eeef9f2d0884f703923e9452582050a4d295284f 100644 (file)
--- 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  August 18, 2009 at 07:42:01 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:46:10 AM by AutoGen 5.9.9pre5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -68,8 +68,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    13
-#define NTPQ_VERSION       "4.2.5p205"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.5p205"
+#define NTPQ_VERSION       "4.2.5p206"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.5p206"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 362b16f38632055501cbc4904d9a084560387451..03bfc0a0a399bb8cfff3aeebc9f054c93f737918 100644 (file)
--- 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  August 18, 2009 at 07:42:04 AM by AutoGen 5.9.9pre5
+# It has been AutoGen-ed  August 26, 2009 at 07:46:13 AM by AutoGen 5.9.9pre5
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 40f94db527163a7dc4afaf04327e0d9a484883bf..7f11cb1758e49bd26b340864cea4d631d01f58c8 100644 (file)
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2009-08-18 "( 4.2.5p205)" "Programmer's Manual"
+.TH NTPQ 1 2009-08-26 "( 4.2.5p206)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  August 18, 2009 at 07:42:03 AM by AutoGen 5.9.9pre5
+.\"  It has been AutoGen-ed  August 26, 2009 at 07:46:12 AM by AutoGen 5.9.9pre5
 .\"  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 35ea38645a1a163182e06776e0a7175188f77018..b5a7cd673d2e9bccce8594fd7fba23d89bd4835e 100644 (file)
--- 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  August 18, 2009 at 07:42:47 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:46:57 AM by AutoGen 5.9.9pre5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -226,7 +226,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPSNMPD";
 tSCC   zUsageTitle[] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p205\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p206\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 0d2b58b8eaf801420852dc67858c0b8a0d87cd24..8b1f8d3342337a8d1ae3ade1ab7a4ac34bc5477a 100644 (file)
--- 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  August 18, 2009 at 07:42:47 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:46:57 AM by AutoGen 5.9.9pre5
  *  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.5p205"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p205"
+#define NTPSNMPD_VERSION       "4.2.5p206"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p206"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 232fe31b1a69cf4cf9632535dd1ded447494ce54..280cc5f9815d6b04fb74b675ba0c120d70271628 100644 (file)
--- 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  August 18, 2009 at 07:42:49 AM by AutoGen 5.9.9pre5
+# It has been AutoGen-ed  August 26, 2009 at 07:46:59 AM by AutoGen 5.9.9pre5
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index c84c0671e928d9f347cdf307e3341c122c8855a9..9b5926fee8db8520d4e9f4ae7940f27dfa348bc0 100644 (file)
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2009-08-18 "( 4.2.5p205)" "Programmer's Manual"
+.TH NTPSNMPD 1 2009-08-26 "( 4.2.5p206)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  August 18, 2009 at 07:42:48 AM by AutoGen 5.9.9pre5
+.\"  It has been AutoGen-ed  August 26, 2009 at 07:46:59 AM by AutoGen 5.9.9pre5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/packageinfo.sh b/packageinfo.sh
index 17c9d4e3a3a58866e268650aa3bb974e2e29902a..28b21820d44389af8333ac83e02e239effcbefe5 100644 (file)
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -9,7 +9,7 @@ version=${proto}.${major}.${minor}
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=205
+point=206
 # Special.  Normally unused.  A suffix.
 #special=ag
 special=

diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 0ae8d3046926be115eb799bbcc0a9c9af1fc2cdc..ace34bb8111e3a28622ad38ab45bae4a49857e04 100644 (file)
--- 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  August 18, 2009 at 07:47:59 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:52:14 AM by AutoGen 5.9.9pre5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -19,9 +19,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * sntp copyright (c) 2008 ntp.org - all rights reserved
+ * sntp copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
  *
- * 
+ * see html/copyright.html
  */
 
 #include <sys/types.h>
@@ -39,11 +39,11 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "sntp copyright (c) 2008 ntp.org, all rights reserved"
-/* extracted from sntp-opts.def near line 17 */
+       "sntp copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
+/* extracted from ../include/copyright.def near line 8 */
 ;
-tSCC zCopyrightNotice[1] =
-"";
+tSCC zCopyrightNotice[24] =
+"see html/copyright.html";
 
 extern tUsageProc optionUsage;
 
@@ -87,7 +87,7 @@ tSCC    zNormalverbose_Name[]      = "normalverbose";
  *  Kod option description:
  */
 tSCC    zKodText[] =
-        "Specify a file for the KOD packet storage";
+        "KoD history filename";
 tSCC    zKod_NAME[]                = "KOD";
 tSCC    zKod_Name[]                = "kod";
 #define KOD_FLAGS       (OPTST_DISABLED \
@@ -150,7 +150,7 @@ static const int
  *  Broadcast option description:
  */
 tSCC    zBroadcastText[] =
-        "Use broadcast packages from the broadcast address specified for synchronisation";
+        "Use broadcasts to the address specified for synchronisation";
 tSCC    zBroadcast_NAME[]          = "BROADCAST";
 tSCC    zBroadcast_Name[]          = "broadcast";
 #define BROADCAST_FLAGS       (OPTST_DISABLED \
@@ -160,7 +160,7 @@ tSCC    zBroadcast_Name[]          = "broadcast";
  *  Timeout option description:
  */
 tSCC    zTimeoutText[] =
-        "Specify the number of seconds until SNTP times out when waiting for broadcast packets";
+        "Specify the number of seconds to wait for broadcasts";
 tSCC    zTimeout_NAME[]            = "TIMEOUT";
 tSCC    zTimeout_Name[]            = "timeout";
 #define TIMEOUT_FLAGS       (OPTST_DISABLED \
@@ -458,7 +458,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.5p204\n\
+"sntp - standard SNTP program - Ver. 4.2.5p206\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... ...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 2f830a2578cef69e590d8bb94389e5687c381e78..68880921f7df405c7c01de67243c28d359b18f98 100644 (file)
--- 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  August 18, 2009 at 07:47:58 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:52:13 AM by AutoGen 5.9.9pre5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -19,9 +19,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * sntp copyright (c) 2008 ntp.org - all rights reserved
+ * sntp copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
  *
- * 
+ * see html/copyright.html
  */
 /*
  *  This file contains the programmatic interface to the Automated
@@ -72,8 +72,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.5p204"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p204"
+#define SNTP_VERSION       "4.2.5p206"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p206"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -185,7 +185,7 @@ typedef enum {
 #define VALUE_OPT_KEYFILE        'k'
 #define VALUE_OPT_HELP          '?'
 #define VALUE_OPT_MORE_HELP     '!'
-#define VALUE_OPT_VERSION       'v'
+#define VALUE_OPT_VERSION       INDEX_OPT_VERSION
 #define VALUE_OPT_SAVE_OPTS     '>'
 #define VALUE_OPT_LOAD_OPTS     '<'
 #define SET_OPT_SAVE_OPTS(a)   STMTS( \

diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index b067a5514f54cee6b105cc1251f39820cb5d623e..f20d3e51b7fdb5dd005e11da608cadc9388ddd68 100644 (file)
--- 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  August 18, 2009 at 07:48:01 AM by AutoGen 5.9.9pre5
+# It has been AutoGen-ed  August 26, 2009 at 07:52:16 AM by AutoGen 5.9.9pre5
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -98,8 +98,10 @@ suspected problem with the server, network or the source.
 @subsection kod option (-K)
 @cindex sntp-kod
 
-This is the ``specify a file for the kod packet storage'' option.
-Specifies the file to be used to store KOD packaet information.
+This is the ``kod history filename'' option.
+Modifies the filename to be used to persist the history of KoD
+responses received from servers.  The default is
+/var/db/ntp-kod.
 
 @node sntp syslog
 @subsection syslog option (-p)
@@ -166,18 +168,18 @@ settod.
 @subsection broadcast option (-b)
 @cindex sntp-broadcast
 
-This is the ``use broadcast packages from the broadcast address specified for synchronisation'' option.
-If specified SNTP will wait 1 minute for broadcast packets
-from the broadcast address specified for synchronisation. 
-The amount of time SNTP waits can be specified with -t.
+This is the ``use broadcasts to the address specified for synchronisation'' option.
+If specified SNTP will listen for NTP broadcasts to the
+specified broadcast address.  The default maximum wait time,
+68 seconds, can be modified with -t.
 
 @node sntp timeout
 @subsection timeout option (-t)
 @cindex sntp-timeout
 
-This is the ``specify the number of seconds until sntp times out when waiting for broadcast packets'' option.
+This is the ``specify the number of seconds to wait for broadcasts'' option.
 When waiting for a broadcast packet SNTP will wait the number 
-of seconds specified and times out.
+of seconds specified before giving up.  Default 68 seconds.
 
 @node sntp authentication
 @subsection authentication option (-a)

diff --git a/sntp/sntp.1 b/sntp/sntp.1
index 4a122a4996a5c9345b5c079922c1a5e40b400393..41fb02d6b4a068eec36348cc2ce9603b2bcf0c04 100644 (file)
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2009-08-18 "( 4.2.5p204)" "Programmer's Manual"
+.TH SNTP 1 2009-08-26 "( 4.2.5p206)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  August 18, 2009 at 07:48:00 AM by AutoGen 5.9.9pre5
+.\"  It has been AutoGen-ed  August 26, 2009 at 07:52:15 AM by AutoGen 5.9.9pre5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -177,9 +177,11 @@ produce a diagnostic.  This option should be set when there is a
 suspected problem with the server, network or the source.
 .TP
 .BR \-K " \fIstring\fP, " \--kod "=" \fIstring\fP
-Specify a file for the KOD packet storage.
+KoD history filename.
 .sp
-Specifies the file to be used to store KOD packaet information.
+Modifies the filename to be used to persist the history of KoD
+responses received from servers.  The default is
+/var/db/ntp-kod.
 .TP
 .BR \-p ", " \--syslog
 Logging with syslog.
@@ -211,18 +213,18 @@ settod.
 
 .TP
 .BR \-b " \fIstring\fP, " \--broadcast "=" \fIstring\fP
-Use broadcast packages from the broadcast address specified for synchronisation.
+Use broadcasts to the address specified for synchronisation.
 .sp
-If specified SNTP will wait 1 minute for broadcast packets
-from the broadcast address specified for synchronisation. 
-The amount of time SNTP waits can be specified with \-t.
+If specified SNTP will listen for NTP broadcasts to the
+specified broadcast address.  The default maximum wait time,
+68 seconds, can be modified with \-t.
 .TP
 .BR \-t " \fInumber\fP, " \--timeout "=" \fInumber\fP
-Specify the number of seconds until SNTP times out when waiting for broadcast packets.
+Specify the number of seconds to wait for broadcasts.
 This option takes an integer number as its argument.
 .sp
 When waiting for a broadcast packet SNTP will wait the number 
-of seconds specified and times out.
+of seconds specified before giving up.  Default 68 seconds.
 .TP
 .BR \-a " \fInumber\fP, " \--authentication "=" \fInumber\fP
 Enable authentication with the key keyno. This option is used as \-a keyno.
@@ -265,7 +267,7 @@ The \fIno-load-opts\fP form will disable the loading
 of earlier RC/INI files.  \fI--no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \-v " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]"
+.BR \- " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -283,14 +285,14 @@ The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH AUTHOR
-ntp.org
+David L. Mills and/or others
 .br
 Please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
 .PP
 .nf
 .na
-
+see html/copyright.html
 .fi
 .ad
 .PP

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 736fd04b2553508d4ca964f5636ee9adfc2c96f8..a269d46f206c760a7e8de07176367ecbca0e933a 100644 (file)
--- 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  August 18, 2009 at 07:49:00 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:53:18 AM by AutoGen 5.9.9pre5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -769,7 +769,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p205\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p206\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 e736251cee625353eed1b30fae57750664bad22a..22885fa62f09054718bb4c1745f38c19cc1837ca 100644 (file)
--- 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  August 18, 2009 at 07:48:59 AM by AutoGen 5.9.9pre5
+ *  It has been AutoGen-ed  August 26, 2009 at 07:53:17 AM by AutoGen 5.9.9pre5
  *  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.5p205"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p205"
+#define NTP_KEYGEN_VERSION       "4.2.5p206"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p206"
 
 /*
  *  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 359e75fad8301883f95dac83128b019b0dc18df2..1501bf5e7b1253f1def80af851a913d343f97ba4 100644 (file)
--- 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  August 18, 2009 at 07:49:02 AM by AutoGen 5.9.9pre5
+# It has been AutoGen-ed  August 26, 2009 at 07:53:20 AM by AutoGen 5.9.9pre5
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 526d9673180067b53037da81602b8907cef49205..5d14c8aa95a994bc45bb47a751b28bf72f48cbe3 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2009-08-18 "(ntp 4.2.5p205)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2009-08-26 "(ntp 4.2.5p206)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  August 18, 2009 at 07:49:01 AM by AutoGen 5.9.9pre5
+.\"  It has been AutoGen-ed  August 26, 2009 at 07:53:19 AM by AutoGen 5.9.9pre5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"