NTP_4_2_7P104

bk: 4d19afc8hiHWcgBK2oGDxwK7v26iNw

diff --git a/ChangeLog b/ChangeLog
index 9a97da5df63425fb67ce3e2d1c973040edb01a87..b6a5f5cba95c027becd641f25c3e0c4595ace2aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.7p104) 2010/12/28 Released by Harlan Stenn <stenn@ntp.org>
 * from 4.2.6p3: Create and use scripts/check--help when generating
   .texi files.
 * from 4.2.6p3: Update bk triggers or the bk-5 release.

diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c
index f72877a7d2bb84ed701903edf85c4e9e0a341bd9..ade9d9cad5aa43f68fa63b96d170fb004f24b391 100644 (file)
--- a/clockstuff/clktest-opts.c
+++ b/clockstuff/clktest-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (clktest-opts.c)
  *  
- *  It has been AutoGen-ed  December 24, 2010 at 09:43:56 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:43 AM by AutoGen 5.11.6pre7
  *  From the definitions    clktest-opts.def
  *  and the template file   options
  *
@@ -325,7 +325,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 static char const zPROGNAME[8] = "CLKTEST";
 static char const zUsageTitle[129] =
-"clktest - test the clock line discipline - Ver. 4.2.7p103\n\
+"clktest - test the clock line discipline - Ver. 4.2.7p104\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... <tty_device>\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {

diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h
index ef264aece8268c35f6478f257c979491ba9e409a..4364918718b7fdb7744fa97c4eef16ad03d5464a 100644 (file)
--- a/clockstuff/clktest-opts.h
+++ b/clockstuff/clktest-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (clktest-opts.h)
  *  
- *  It has been AutoGen-ed  December 24, 2010 at 09:43:56 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:42 AM by AutoGen 5.11.6pre7
  *  From the definitions    clktest-opts.def
  *  and the template file   options
  *
@@ -63,8 +63,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    10
-#define CLKTEST_VERSION       "4.2.7p103"
-#define CLKTEST_FULL_VERSION  "clktest - test the clock line discipline - Ver. 4.2.7p103"
+#define CLKTEST_VERSION       "4.2.7p104"
+#define CLKTEST_FULL_VERSION  "clktest - test the clock line discipline - Ver. 4.2.7p104"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 46ccb6ea4565e7ee5e6e25b8354e9c257a17befc..d1224c8bdc5582127dc719ced7493bb261bc4945 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  December 24, 2010 at 09:42:58 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:21:26 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -1006,7 +1006,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 static char const zPROGNAME[5] = "NTPD";
 static char const zUsageTitle[133] =
-"ntpd - NTP daemon program - Ver. 4.2.7p103\n\
+"ntpd - NTP daemon program - Ver. 4.2.7p104\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ <server1> ... <serverN> ]\n";
 #define zRcName     NULL

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 22255acdefb5e64a30514b20c2304fc1d4e3d7bf..66514da9e53816f76d2951a3bf57556d61660a84 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  December 24, 2010 at 09:42:58 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:21:26 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -89,8 +89,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    36
-#define NTPD_VERSION       "4.2.7p103"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.7p103"
+#define NTPD_VERSION       "4.2.7p104"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.7p104"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index be9602c9d2c7bb8c7b134db24bdfc9e40462fa7f..1e291349a62996d8bb85afeeecb407e37023da80 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  December 24, 2010 at 09:43:22 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 28, 2010 at 04:32:10 AM by AutoGen 5.11.6pre7
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -64,7 +64,80 @@ This is the automatically generated usage text for ntpd:
 
 @exampleindent 0
 @example
-ntpd is unavailable - no --help
+ntpd - NTP daemon program - Ver. 4.2.7p104
+USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
+                [ <server1> ... <serverN> ]
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -a no  authreq        Require crypto authentication
+                                - prohibits these options:
+                                authnoreq
+   -A no  authnoreq      Do not require crypto authentication
+                                - prohibits these options:
+                                authreq
+   -b no  bcastsync      Allow us to sync to broadcast servers
+   -c Str configfile     configuration file name
+   -d no  debug-level    Increase output debug message level
+                                - may appear multiple times
+   -D Str set-debug-level Set the output debug message level
+                                - may appear multiple times
+   -f Str driftfile      frequency drift file name
+   -g no  panicgate      Allow the first adjustment to be Big
+                                - may appear multiple times
+   -i --- jaildir        built without --enable-clockctl or --enable-linuxcaps
+   -I Str interface      Listen on an interface name or address
+                                - may appear multiple times
+   -k Str keyfile        path to symmetric keys
+   -l Str logfile        path to the log file
+   -L no  novirtualips   Do not listen to virtual interfaces
+   -n no  nofork         Do not fork
+                                - prohibits these options:
+                                wait-sync
+   -N no  nice           Run at high priority
+   -p Str pidfile        path to the PID file
+   -P Num priority       Process priority
+   -q no  quit           Set the time and quit
+                                - prohibits these options:
+                                saveconfigquit
+                                wait-sync
+   -r Str propagationdelay Broadcast/propagation delay
+      Str saveconfigquit Save parsed configuration and quit
+                                - prohibits these options:
+                                quit
+                                wait-sync
+   -s Str statsdir       Statistics file location
+   -t Str trustedkey     Trusted key number
+                                - may appear multiple times
+   -u --- user           built without --enable-clockctl or --enable-linuxcaps
+   -U Num updateinterval interval in seconds between scans for new or dropped interfaces
+      Str var            make ARG an ntp variable (RW)
+                                - may appear multiple times
+      Str dvar           make ARG an ntp variable (RW|DEF)
+                                - may appear multiple times
+   -w Num wait-sync      Seconds to wait for first clock sync
+                                - prohibits these options:
+                                nofork
+                                quit
+                                saveconfigquit
+   -x no  slew           Slew up to 600 seconds
+   -! opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+
+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:
+ - examining environment variables named NTPD_*
+
+
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index 91fb2fe3d1e9808d91ea20d329cfee1fa6301426..9c777bbf853513890ba93a79f3437930308c9ac5 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2010-12-24 "( 4.2.7p103)" "Programmer's Manual"
+.TH NTPD 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 24, 2010 at 09:43:22 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 28, 2010 at 04:21:51 AM by AutoGen 5.11.6pre7
 .\"  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 1142b455ac04e85747562d88fe787ce7ae05de68..dde58379929e54c6c408a4f5cd337e6b0fed06b9 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  December 24, 2010 at 09:43:28 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:14 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -451,7 +451,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 static char const zPROGNAME[6] = "NTPDC";
 static char const zUsageTitle[129] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p103\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p104\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ 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 f6e621f7ff9729415bf5a865aa5955c08cb28d99..367c599147643bb7fae1a8ee2c12686a899eeac5 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  December 24, 2010 at 09:43:28 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:14 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -68,8 +68,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p103"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p103"
+#define NTPDC_VERSION       "4.2.7p104"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p104"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 394da728e1d4b35f5d224f01cece1fd79329031a..cae8fdcad2492f188a5b6c628db988d4ce52bea5 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  December 24, 2010 at 09:43:38 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 28, 2010 at 04:33:24 AM by AutoGen 5.11.6pre7
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -58,7 +58,71 @@ This is the automatically generated usage text for ntpdc:
 
 @exampleindent 0
 @example
-ntpdc is unavailable - no --help
+ntpdc - vendor-specific NTP query program - Ver. 4.2.7p104
+USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -c Str command        run a command and exit
+                                - may appear multiple times
+   -l no  listpeers      Print a list of the peers
+                                - prohibits these options:
+                                command
+   -p no  peers          Print a list of the peers
+                                - prohibits these options:
+                                command
+   -s no  showpeers      Show a list of the peers
+                                - prohibits these options:
+                                command
+   -i no  interactive    Force ntpq to operate in interactive mode
+                                - prohibits these options:
+                                command
+                                listpeers
+                                peers
+                                showpeers
+   -d no  debug-level    Increase output debug message level
+                                - may appear multiple times
+   -D Str set-debug-level Set the output debug message level
+                                - may appear multiple times
+   -n no  numeric        numeric host addresses
+      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 $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTPDC_*
+
+The
+[= prog-name =]
+utility program is used to query an NTP daemon about its
+current state and to request changes in that state.
+It uses NTP mode 7 control message formats described in the source code.
+The program may
+be run either in interactive mode or controlled using command line
+arguments.
+Extensive state and statistics information is available
+through the
+[= prog-name =]
+interface.
+In addition, nearly all the
+configuration options which can be specified at startup using
+ntpd's configuration file may also be specified at run time using
+[= prog-name =] .
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index aa4b52d0f830a9d9a5f159bbf39f66df436a0a8b..579d1aa8022abcc1f361fa539ca26aa3c8c5acd7 100644 (file)
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2010-12-24 "( 4.2.7p103)" "Programmer's Manual"
+.TH NTPDC 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  December 24, 2010 at 09:43:38 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 28, 2010 at 04:33:24 AM by AutoGen 5.11.6pre7
 .\"  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 110f15ce0851b8ce8197a742a43c60dc4b9930fa..35d8da600a8320b0798b1b61bc24fdc500a1b1e1 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  December 24, 2010 at 09:43:39 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:25 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -428,7 +428,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.7p103\n\
+"ntpq - standard NTP query program - Ver. 4.2.7p104\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ 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 2f8d40535a3d2c1287d1a826f45105391cb04177..e791c0d7c888a4267709729eadf0aaabf171cdcd 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  December 24, 2010 at 09:43:38 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:25 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -67,8 +67,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p103"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.7p103"
+#define NTPQ_VERSION       "4.2.7p104"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.7p104"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 50926f2842b3b1384780098293be426b55025f3b..63c8418e966d55664a7a7efcc13a0c4ffb636064 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  December 24, 2010 at 09:43:49 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 28, 2010 at 04:33:36 AM by AutoGen 5.11.6pre7
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,7 +47,56 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq is unavailable - no --help
+ntpq - standard NTP query program - Ver. 4.2.7p104
+USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -c Str command        run a command and exit
+                                - may appear multiple times
+   -d no  debug-level    Increase output debug message level
+                                - may appear multiple times
+   -D Str set-debug-level Set the output debug message level
+                                - may appear multiple times
+   -p no  peers          Print a list of the peers
+                                - prohibits these options:
+                                interactive
+   -i no  interactive    Force ntpq to operate in interactive mode
+                                - prohibits these options:
+                                command
+                                peers
+   -n no  numeric        numeric host addresses
+      no  old-rv         Always output status line with readvar
+      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 $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTPQ_*
+
+The
+[= prog-name =]
+utility program is used to query NTP servers which
+implement the standard NTP mode 6 control message formats defined
+in Appendix B of the NTPv3 specification RFC1305, requesting
+information about current state and/or changes in that state.
+The same formats are used in NTPv4, although some of the
+variables have changed and new ones added.
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 62b6e724ed4440c5f767f78a06dccccf937635d7..647a9fb6e27c8e04f2275d7c03253c572572628d 100644 (file)
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2010-12-24 "( 4.2.7p103)" "Programmer's Manual"
+.TH NTPQ 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  December 24, 2010 at 09:43:49 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 28, 2010 at 04:33:36 AM by AutoGen 5.11.6pre7
 .\"  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 79e003c6f5633aeffc10f611328bf2cd9806ca13..6599a6617d227175bb6058155e414e5c2f623132 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  December 24, 2010 at 09:43:50 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:37 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -255,7 +255,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.7p103\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p104\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\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 523b5979312033bd3b6bdf750ad67c16c003252c..301c38df7e3db1985f5e84196be6d4751ca701be 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  December 24, 2010 at 09:43:50 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:36 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -61,8 +61,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p103"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p103"
+#define NTPSNMPD_VERSION       "4.2.7p104"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p104"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index ffeb5ffc30f96d3a2b878ea37c152dc2e933f0c3..f86411900e0d53cfe4d2c2c4d3c3c10380fce7c4 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  December 24, 2010 at 09:43:55 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 28, 2010 at 04:33:42 AM by AutoGen 5.11.6pre7
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -34,7 +34,29 @@ This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd is unavailable - no --help
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p104
+USAGE:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+  Flg Arg Option-Name    Description
+   -n no  nofork         Do not fork
+   -p no  syslog         Log to syslog()
+      Str agentxsocket   The socket address ntpsnmpd uses to connect to net-snmpd
+      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 $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTPSNMPD_*
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index cca8a82536ad5640bcaa0346404c72d84e0826fb..864ab7ec29634b08bf1b07f5166d4b32c8aed66e 100644 (file)
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2010-12-24 "( 4.2.7p103)" "Programmer's Manual"
+.TH NTPSNMPD 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 24, 2010 at 09:43:55 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 28, 2010 at 04:33:41 AM by AutoGen 5.11.6pre7
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/packageinfo.sh b/packageinfo.sh
index badf2225c588af60903b30ec6ee576d9c69d7534..07c4b9539e66e0a3aac01e30b6434a17989ffeea 100644 (file)
--- 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=103
+point=104
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)

diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 8782b27d5e5782e3a395eb1dd3f61fabd2e50d94..7c92c0b655da8806558cb392a5515680a3ece0fa 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  December 24, 2010 at 09:42:52 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 09:09:47 AM by AutoGen 5.11.6pre7
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -473,7 +473,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 static char const zPROGNAME[5] = "SNTP";
 static char const zUsageTitle[123] =
-"sntp - standard SNTP program - Ver. 4.2.7p103\n\
+"sntp - standard SNTP program - Ver. 4.2.7p104\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {

diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 1fe8f65af0c1393c5fb4a00aa5910b3a068b02e7..cbc4a0c45a44aae787dc2a65d3a7c9d701510173 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  December 24, 2010 at 09:42:52 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 09:09:47 AM by AutoGen 5.11.6pre7
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.7p103"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.7p103"
+#define SNTP_VERSION       "4.2.7p104"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.7p104"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 9ff743d260ee8b4dac651404658ec0d80c05581a..4a6ea04268891a0a79bf14cc76181c271b7f9564 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  December 24, 2010 at 09:42:57 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 28, 2010 at 09:09:55 AM by AutoGen 5.11.6pre7
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/sntp/sntp.1 b/sntp/sntp.1
index 92c7e770d6ca64a5b7314e59064703c216b4b164..921c4811c29fed353ae6aac16b2a4042da3f4ffd 100644 (file)
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2010-12-24 "( 4.2.7p103)" "Programmer's Manual"
+.TH SNTP 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  December 24, 2010 at 09:42:57 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 28, 2010 at 09:09:55 AM by AutoGen 5.11.6pre7
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/sntp/sntp.html b/sntp/sntp.html
index a8237a533799112fbcc57ee686571b0b62ab0464..834291cdcb0b9287697fe83c5b9aef3517d75d3c 100644 (file)
--- 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.
 
-  <p>This document applies to version 4.2.7p103 of <code>sntp</code>.
+  <p>This document applies to version 4.2.7p104 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index ed1e2dfac82c55a2b52d4ea1c98539accfcb3ba4..27829d574640fb41482ca941b0a1e498be042bc9 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  December 24, 2010 at 09:43:59 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:45 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -757,7 +757,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.7p103\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p104\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\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 b7cbbaebc38002c747d5a693ad3965de4e514ca7..de4e0a70c54f483eb9f7b37134af174d94d330a3 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  December 24, 2010 at 09:43:59 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 28, 2010 at 04:33:45 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -77,8 +77,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p103"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p103"
+#define NTP_KEYGEN_VERSION       "4.2.7p104"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p104"
 
 /*
  *  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 4a9e7ac679b6dfc723d1c76815e9abd5f9ceca05..758afdc39c50b2484bc11b1a56190ede5c81faa0 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  December 24, 2010 at 09:44:08 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 28, 2010 at 04:33:53 AM by AutoGen 5.11.6pre7
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -51,7 +51,51 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen is unavailable - no --help
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p104
+USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+  Flg Arg Option-Name    Description
+   -c Str certificate    certificate scheme
+   -d no  debug-level    Increase output debug message level
+                                - may appear multiple times
+   -D Str set-debug-level Set the output debug message level
+                                - may appear multiple times
+   -e no  id-key         Write IFF or GQ identity keys
+   -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
+   -l Num lifetime       set certificate lifetime
+   -M no  md5key         generate MD5 keys
+   -m Num modulus        modulus
+                                - it must be:  256 to 2048
+   -P no  pvt-cert       generate PC private certificate
+   -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
+   -T no  trusted-cert   trusted certificate (TC scheme)
+   -V Num mv-params      generate <num> MV parameters
+   -v Num mv-keys        update <num> MV keys
+      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 $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTP_KEYGEN_*
+
+If there is no new host key, look for an existing one.
+If one is not found, create it.
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 5948d4da82f3ce8e88edb1a4eb09ee0e5aee62e0..4b0f08a49e14958b309aa9498cf47ba7db3cbc0d 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2010-12-24 "(ntp 4.2.7p103)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2010-12-28 "(ntp 4.2.7p104)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December 24, 2010 at 09:44:08 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 28, 2010 at 04:33:53 AM by AutoGen 5.11.6pre7
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"