NTP_4_2_6P3_RC12

bk: 4d15c61csQXgaPdvMP6D4LaMbvp0xw

diff --git a/ChangeLog b/ChangeLog
index f7ab9966868d27f3f8f1026463fbcd42852da44d..e194aed748d3d10967748f80406bae3591ed3b27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 ---
+(4.2.6p3-RC12) 2010/12/25 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 1458] Can not compile NTP on FreeBSD 4.7.
 * [Bug 1510] Add modes 20/21 for driver 8 to support RAWDCF @ 75 baud.

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index c1e9ed98b91475b71b17e5ad0827e130e1b0b67f..8277a12c7139037ea50b5eeed3d7d6d715c932ea 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 19, 2010 at 01:01:29 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:04:36 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -954,7 +954,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 static char const zPROGNAME[5] = "NTPD";
 static char const zUsageTitle[104] =
-"ntpd - NTP daemon program - Ver. 4.2.6p3-RC11\n\
+"ntpd - NTP daemon program - Ver. 4.2.6p3-RC12\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL
@@ -963,7 +963,7 @@ static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
 static char const zDetail[7] = "\n\n";
 static char const zFullVersion[] = NTPD_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 504 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -1041,7 +1041,7 @@ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined DEBUG */
 #endif /* defined(TEST_NTPD_OPTS) */
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */
 
 #if defined(TEST_NTPD_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -1059,7 +1059,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPD_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 641 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 3f65e8d1d716221121fe7fcc94d317ca2dc5c044..0d2a00b8948462116512ca22fab23ae23c1837e0 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 19, 2010 at 01:01:29 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:04:36 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -88,8 +88,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    35
-#define NTPD_VERSION       "4.2.6p3-RC11"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.6p3-RC11"
+#define NTPD_VERSION       "4.2.6p3-RC12"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.6p3-RC12"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -341,7 +341,7 @@ typedef enum {
                 ntpdOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpdOptions.pUsageProc)(&ntpdOptions, c)
-/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */
 
 /* * * * * *
  *

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index ab9618cde59e3889b38a41cbc1273b08aa2b0239..ea960fe4daa9789d99c96bf8f21f13815d9ba633 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 19, 2010 at 01:01:41 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 25, 2010 at 10:16:58 AM by AutoGen 5.11.6pre7
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -63,66 +63,7 @@ This is the automatically generated usage text for ntpd:
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.6p3-RC11
-USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
-  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
-   -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
-   -r Str propagationdelay Broadcast/propagation delay
-      Str saveconfigquit Save parsed configuration and quit
-   -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
-   -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
+ntpd is unavailable - no --help
 @end example
 @exampleindent 4
 

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index edea69e210976ece9ce1417979e04c0d0a43a389..9ccab3aa53cff5411a846da4940a2e3a1c65e2ab 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2010-12-19 "( 4.2.6p3-RC11)" "Programmer's Manual"
+.TH NTPD 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 19, 2010 at 01:01:40 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 25, 2010 at 10:16: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 0a8a3a8aea4eaa392d2b2b0a69f76ae887e68d47..507c2e3bcf27638d3763b5c8b79cfa3b9ccecc48 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 19, 2010 at 01:01:44 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:18:44 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[132] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3-RC11\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3-RC12\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
@@ -479,7 +479,7 @@ configuration options which can be specified at startup using\n\
 ntpd's configuration file may also be specified at run time using\n\
 [= prog-name =] .\n";
 static char const zFullVersion[] = NTPDC_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 504 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -554,7 +554,7 @@ doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined(TEST_NTPDC_OPTS) */
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */
 
 #if defined(TEST_NTPDC_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -572,7 +572,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPDC_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 641 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 49546171fa0a342d3ac08a98cfaac787fb9463a6..c270d8afdb5711348b4220402087589c2a304915 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 19, 2010 at 01:01:44 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:18:44 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.6p3-RC11"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3-RC11"
+#define NTPDC_VERSION       "4.2.6p3-RC12"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3-RC12"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -191,7 +191,7 @@ typedef enum {
                 ntpdcOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpdcOptions.pUsageProc)(&ntpdcOptions, c)
-/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */
 
 /* * * * * *
  *

diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index f4d446ce9df1ef2e3f260db72994ad85a92178a4..1800cb2f050a92bd37925a8ed42af7c73e6964e0 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 19, 2010 at 01:01:47 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 25, 2010 at 10:19:24 AM by AutoGen 5.11.6pre7
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -58,71 +58,7 @@ This is the automatically generated usage text for ntpdc:
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3-RC11
-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
+ntpdc is unavailable - no --help
 @end example
 @exampleindent 4
 

diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index 591282e9c9f003236547d42ea977d761bfb57cf3..d8f78fb0b7b5493310537e07232af2ce4ea63f8c 100644 (file)
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2010-12-19 "( 4.2.6p3-RC11)" "Programmer's Manual"
+.TH NTPDC 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  December 19, 2010 at 01:01:46 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 25, 2010 at 10:19:23 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 52db37b485ba53c73eccc24a124fc048ff8cb09c..40256a2a6bddd42f083e3bb91679674d5832b285 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 19, 2010 at 01:01:49 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:19:26 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[124] =
-"ntpq - standard NTP query program - Ver. 4.2.6p3-RC11\n\
+"ntpq - standard NTP query program - Ver. 4.2.6p3-RC12\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
@@ -448,7 +448,7 @@ information about current state and/or changes in that state.\n\
 The same formats are used in NTPv4, although some of the\n\
 variables have changed and new ones added.\n";
 static char const zFullVersion[] = NTPQ_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 504 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -523,7 +523,7 @@ doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined(TEST_NTPQ_OPTS) */
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */
 
 #if defined(TEST_NTPQ_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -541,7 +541,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPQ_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 641 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 71fe9d2757da5fe34dc073bcecfcae19bb788cbd..b3d0de0f6c108119a701d95a3de5c6f6ce0385f8 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 19, 2010 at 01:01:49 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:19:26 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.6p3-RC11"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.6p3-RC11"
+#define NTPQ_VERSION       "4.2.6p3-RC12"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.6p3-RC12"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -184,7 +184,7 @@ typedef enum {
                 ntpqOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpqOptions.pUsageProc)(&ntpqOptions, c)
-/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */
 
 /* * * * * *
  *

diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 408a64e38dbbfae1cb353af4d8944a5584c0008b..540704b621e084536e4c81eab15f175d1638d2d8 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 19, 2010 at 01:01:56 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 25, 2010 at 10:20:38 AM by AutoGen 5.11.6pre7
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,56 +47,7 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.6p3-RC11
-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
+ntpq is unavailable - no --help
 @end example
 @exampleindent 4
 

diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 80443acb5976744f376032e84fb80eb08695b544..381a1b82cf42fa97fbd774322177e74cf725ee1b 100644 (file)
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2010-12-19 "( 4.2.6p3-RC11)" "Programmer's Manual"
+.TH NTPQ 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  December 19, 2010 at 01:01:54 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 25, 2010 at 10:20:37 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 d5706483b6d1cc90196eae95f9168e2485e216cd..c122bb91498feb64e237b78a2180272e24cce1e6 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 19, 2010 at 01:01:57 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:20:42 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[108] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3-RC11\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3-RC12\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
@@ -267,7 +267,7 @@ static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
 #define zDetail         NULL
 static char const zFullVersion[] = NTPSNMPD_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 504 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -329,7 +329,7 @@ doUsageOpt(
     (void)pOptions;
     USAGE(EXIT_SUCCESS);
 }
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */
 
 #if defined(TEST_NTPSNMPD_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -347,7 +347,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPSNMPD_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 641 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index a1999152c450d9c9a857d86858d5e920e670a952..b9a654fc38c784b71e128bb4f9cb72abe46e7fc2 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 19, 2010 at 01:01:57 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:20:41 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.6p3-RC11"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3-RC11"
+#define NTPSNMPD_VERSION       "4.2.6p3-RC12"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3-RC12"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -142,7 +142,7 @@ typedef enum {
                 ntpsnmpdOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpsnmpdOptions.pUsageProc)(&ntpsnmpdOptions, c)
-/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */
 
 /* * * * * *
  *

diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index d84997ee88630f9907a920cdddd44a3a704b0ca3..c58d71cd4526d4a7fd143a975cb88593cdef29f6 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 19, 2010 at 01:01:59 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 25, 2010 at 10:21:10 AM by AutoGen 5.11.6pre7
 # 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 23f8098dd3a4ea282f4aba503415268bee413bb5..054f991464fbc9df547d78cab71c5ebb5cc30626 100644 (file)
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2010-12-19 "( 4.2.6p3-RC11)" "Programmer's Manual"
+.TH NTPSNMPD 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 19, 2010 at 01:01:58 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 25, 2010 at 10:21:09 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 ea6488a4ade6dc4868e839a937c8d63c8606f3e9..88595ed6cca91837cdef875551302253f95fcb1e 100644 (file)
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -91,4 +91,4 @@ betapoint=1
 # - - prerelease is emptied
 # else (not in RC)
 # - rcpoint is empty and unused (for now).
-rcpoint=11
+rcpoint=12

diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index beadc94b4dd7237690bd3b806a7baf3746a469ec..ddbed39056c01918066004b3ab0adaf792a4c0d0 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 19, 2010 at 03:41:47 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:03:48 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[126] =
-"sntp - standard SNTP program - Ver. 4.2.6p3-RC11\n\
+"sntp - standard SNTP program - Ver. 4.2.6p3-RC12\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
@@ -491,7 +491,7 @@ It can be run interactively from the command line or as a cron job.\n\n\
 NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC\n\
 1305.\n";
 static char const zFullVersion[] = SNTP_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 504 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -553,7 +553,7 @@ doUsageOpt(
     (void)pOptions;
     USAGE(EXIT_SUCCESS);
 }
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */
 
 #if defined(TEST_SNTP_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -571,7 +571,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_SNTP_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 641 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index c42d9ad8936e26a9f253510d00594a2fdbabed11..386f2d9acbf19d0a19fc968dd90414c4e295ce7c 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 19, 2010 at 03:41:47 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:03: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.6p3-RC11"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.6p3-RC11"
+#define SNTP_VERSION       "4.2.6p3-RC12"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.6p3-RC12"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -209,7 +209,7 @@ typedef enum {
                 sntpOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*sntpOptions.pUsageProc)(&sntpOptions, c)
-/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */
 
 /* * * * * *
  *

diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 33668451ec8e3b3c77f965c44e2379a13bf48a65..05685cdebccd501d5cb5177424382443e6848d5e 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 19, 2010 at 03:41:53 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 25, 2010 at 10:04:29 AM by AutoGen 5.11.6pre7
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -25,7 +25,7 @@ are defined and described by RFC 5905.
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like
 @example
-1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs
+1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs
 @end example
 where the
 @example
@@ -33,8 +33,9 @@ where the
 @end example
 indicates the local clock is 4.567 seconds behind the correct time
 (so 4.567 seconds must be added to the local clock to get it to be correct),
-and the time of
-@code{1996 Oct 15 20:17:25.123}
+and the (local) time of
+@code{1996-10-15 20:17:25.123}
+can be converted to UTC time by adding 8 hours and 0 minutes, and
 is believed to be correct to within
 @code{+/- 0.089}
 seconds.
@@ -68,61 +69,7 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard SNTP program - Ver. 4.2.6p3-RC11
-USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... hostname-or-IP ...
-  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
-   -d no  normalverbose  Normal verbose
-   -K Str kod            KoD history filename
-   -p no  syslog         Logging with syslog
-                                - prohibits these options:
-                                filelog
-   -l Str filelog        Log to specified logfile
-                                - prohibits these options:
-                                syslog
-   -s no  settod         Set (step) the time with settimeofday()
-                                - prohibits these options:
-                                adjtime
-   -j no  adjtime        Set (slew) the time with adjtime()
-                                - prohibits these options:
-                                settod
-   -b Str broadcast      Use broadcasts to the address specified for synchronisation
-   -t Num timeout        Specify the number of seconds to wait for broadcasts
-   -a Num authentication Enable authentication with the key auth-keynumber
-   -k Str keyfile        Specify a keyfile. SNTP will look in this file for the key specified with -a
-      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 SNTP_*
-
-sntp implements the Simple Network Time Protocol, and is used to query
-an NTP or SNTP server and either display the time or set the local
-system's time (given suitable privilege).
-
-It can be run interactively from the command line or as a cron job.
-
-NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
-1305.
-
-please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
+sntp is unavailable - no --help
 @end example
 @exampleindent 4
 

diff --git a/sntp/sntp.1 b/sntp/sntp.1
index a7f5856ee82a3bb5c42a4a5be5f1e45bfc3827b4..29368dd61ce78c96a149bbae1cb84ec99d9a4bda 100644 (file)
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2010-12-19 "( 4.2.6p3-RC11)" "Programmer's Manual"
+.TH SNTP 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  December 19, 2010 at 03:41:52 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 25, 2010 at 10:04:27 AM by AutoGen 5.11.6pre7
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -31,13 +31,17 @@ are defined and described by RFC 5905.
 .PP
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like
-.BR "'1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs'" ,
+.BR "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs'" ,
 where the
+.B "'(+0800)'"
+means that to get to UTC from the reported local time one must
+add 8 hours and 0 minutes,
+and the
 .B "'+4.567 +/- 0.089 secs'"
 indicates the local clock is 4.567 seconds behind the correct time
 (so 4.567 seconds must be added to the local clock to get it to be correct),
 and the time of
-'1996 Oct 15 20:17:25.123'
+'1996-10-15 20:17:25.123'
 is believed to be correct to within
 +/- 0.089
 seconds.

diff --git a/sntp/sntp.html b/sntp/sntp.html
index d6cceca48f642c4626065a259c1ea7a4be1dca29..e7e57cd7e9b2c68ea2b279f4a04ffae712681e51 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.6p3-RC11 of <code>sntp</code>.
+  <p>This document applies to version 4.2.6p3-RC12 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -92,15 +92,16 @@ are defined and described by RFC 5905.
 
   <p class="indent">The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like
-<pre class="example">     1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs
+<pre class="example">     1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs
 </pre>
   <p>where the
 <pre class="example">     +4.567 +/- 0.089 secs
 </pre>
   <p>indicates the local clock is 4.567 seconds behind the correct time
 (so 4.567 seconds must be added to the local clock to get it to be correct),
-and the time of
-<code>1996 Oct 15 20:17:25.123</code>
+and the (local) time of
+<code>1996-10-15 20:17:25.123</code>
+can be converted to UTC time by adding 8 hours and 0 minutes, and
 is believed to be correct to within
 <code>+/- 0.089</code>
 seconds.
@@ -138,61 +139,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <p><a name="index-sntp-usage-3"></a>
 This is the automatically generated usage text for sntp:
 
-<pre class="example">sntp - standard SNTP program - Ver. 4.2.6p3-RC11
-USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... hostname-or-IP ...
-  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
-   -d no  normalverbose  Normal verbose
-   -K Str kod            KoD history filename
-   -p no  syslog         Logging with syslog
-                                - prohibits these options:
-                                filelog
-   -l Str filelog        Log to specified logfile
-                                - prohibits these options:
-                                syslog
-   -s no  settod         Set (step) the time with settimeofday()
-                                - prohibits these options:
-                                adjtime
-   -j no  adjtime        Set (slew) the time with adjtime()
-                                - prohibits these options:
-                                settod
-   -b Str broadcast      Use broadcasts to the address specified for synchronisation
-   -t Num timeout        Specify the number of seconds to wait for broadcasts
-   -a Num authentication Enable authentication with the key auth-keynumber
-   -k Str keyfile        Specify a keyfile. SNTP will look in this file for the key specified with -a
-      opt version        Output version information and exit
-   -? no  help           Display extended usage information and exit
-   -! no  more-help      Extended usage information passed thru pager
-   -&gt; opt save-opts      Save the option state to a config file
-   -&lt; 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 SNTP_*
-
-sntp implements the Simple Network Time Protocol, and is used to query
-an NTP or SNTP server and either display the time or set the local
-system's time (given suitable privilege).
-
-It can be run interactively from the command line or as a cron job.
-
-NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
-1305.
-
-please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
+<pre class="example">sntp is unavailable - no --help
 </pre>
   <div class="node">
 <p><hr>

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 98561e4a7b4f6fdc9de5f4effb281df872a95c8b..0a4cbeebd5582fa37c29113f30f10f2faff4fad8 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 19, 2010 at 01:02:01 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:21:14 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -727,7 +727,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
 static char const zUsageTitle[119] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3-RC11\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3-RC12\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
@@ -741,7 +741,7 @@ static char const zDetail[98] = "\n\
 If there is no new host key, look for an existing one.\n\
 If one is not found, create it.\n";
 static char const zFullVersion[] = NTP_KEYGEN_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 504 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -869,7 +869,7 @@ doOptModulus(tOptions* pOptions, tOptDesc* pOptDesc)
     pOptDesc->optArg.argInt = val;
 }
 #endif /* defined OPENSSL */
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */
 
 #if defined(TEST_NTP_KEYGEN_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -887,7 +887,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTP_KEYGEN_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 641 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index d3e7e16e1cca47f3fc2970eea71e183b417ca4e6..62d82d5712f2ee2fb6927b4420724d9e9c590193 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 19, 2010 at 01:02:00 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 25, 2010 at 10:21:14 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -76,8 +76,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define NTP_KEYGEN_VERSION       "4.2.6p3-RC11"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3-RC11"
+#define NTP_KEYGEN_VERSION       "4.2.6p3-RC12"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3-RC12"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -259,7 +259,7 @@ typedef enum {
                 ntp_keygenOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntp_keygenOptions.pUsageProc)(&ntp_keygenOptions, c)
-/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */
 
 /* * * * * *
  *

diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index 8b76f6032f33988a0009435c5e12fc5e9369d031..e22312a59fa66e1160dbdb04395118376b575c7a 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 19, 2010 at 01:02:05 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 25, 2010 at 10:22:06 AM by AutoGen 5.11.6pre7
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -50,50 +50,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.6p3-RC11
-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
-   -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
+ntp-keygen is unavailable - no --help
 @end example
 @exampleindent 4
 

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index b835646cc5b7114b12a61437fbeb508ae92035e3..9bec1901b1200a2010d5e8110011204c59650009 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2010-12-19 "(ntp 4.2.6p3-RC11)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2010-12-25 "(ntp 4.2.6p3-RC12)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December 19, 2010 at 01:02:04 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 25, 2010 at 10:22:04 AM by AutoGen 5.11.6pre7
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"