NTP_4_2_5P247_RC

bk: 4b067141gNapYnfpIHOn6MHgReCB6w

diff --git a/ChangeLog b/ChangeLog
index 24b50fd0283c31e20f2f962df4124d55cc8a2a16..23a279be538398e3d89e21e4dc29f44715fd5e78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.5p247-RC) 2009/11/20 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1142] nodebug builds shed no light on -d, -D option failure.
 * [Bug 1179] point out the problem with -i/--jaildir and -u/--user when
   they are disabled by configure.

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 91e3d705b407f076c895de67ca340943a44da8f6..0afebc2b14ce1a2e1a735f5e598f03062dbef531 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  November 17, 2009 at 05:35:44 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:28:59 AM by AutoGen 5.10
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -956,7 +956,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPD";
 tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.5p246-RC\n\
+"ntpd - NTP daemon program - Ver. 4.2.5p247-RC\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL
@@ -965,7 +965,7 @@ tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
 tSCC    zDetail[]     = "\n\n";
 tSCC    zFullVersion[] = NTPD_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 495 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -1037,7 +1037,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 109 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */
 
 #if defined(TEST_NTPD_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -1052,7 +1052,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPD_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 627 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 53cfad6cb5c899c9223f574fc852d34ebb5abb45..f90f75f1b14f03d3c1a67c4ea287f834ece6146f 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  November 17, 2009 at 05:35:44 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:28:58 AM by AutoGen 5.10
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    35
-#define NTPD_VERSION       "4.2.5p246-RC"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p246-RC"
+#define NTPD_VERSION       "4.2.5p247-RC"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p247-RC"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -334,7 +334,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 409 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
 
 /* * * * * *
  *

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index a954aff4b5287dd88f1eb1a0207303268a512058..629ef4d968e8c05aacbdc44fc0cf0423b97adfb4 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  November 17, 2009 at 05:35:45 PM by AutoGen 5.10
+# It has been AutoGen-ed  November 20, 2009 at 05:29:01 AM by AutoGen 5.10
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -63,7 +63,7 @@ This is the automatically generated usage text for ntpd:
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.5p238-RC
+ntpd - NTP daemon program - Ver. 4.2.5p242-RC
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index d8a0da7f60e322e613c8060f211c1441fe76cfba..508ca9222ce813af1bec72703877bc684285edcb 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual"
+.TH NTPD 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  November 17, 2009 at 05:35:44 PM by AutoGen 5.10
+.\"  It has been AutoGen-ed  November 20, 2009 at 05:29:00 AM by AutoGen 5.10
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 060c7c74bbcbb597f8c055d8b340f47a3dfea9c5..c99ed51e60c514e1cc5add72a72a02bbdf7f5ada 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  November 17, 2009 at 07:34:34 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:30:16 AM by AutoGen 5.10
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -452,7 +452,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDC";
 tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p246-RC\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p247-RC\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -480,7 +480,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";
 tSCC    zFullVersion[] = NTPDC_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 495 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -549,7 +549,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 109 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */
 
 #if defined(TEST_NTPDC_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -564,7 +564,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPDC_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 627 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index c440a4ef019436cf5aa551aa7f1ff4b688f56977..55f802bfb5243ddce72371688290aa988449856f 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  November 17, 2009 at 07:34:33 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:30:16 AM by AutoGen 5.10
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.5p246-RC"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p246-RC"
+#define NTPDC_VERSION       "4.2.5p247-RC"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p247-RC"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -184,7 +184,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 409 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
 
 /* * * * * *
  *

diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index c6f50ed7b0ed85166a3c6b5bc688f83fd150e9a3..9e60ed17839109c6cb31d52d6682abad3552b51d 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  November 17, 2009 at 07:34:34 PM by AutoGen 5.10
+# It has been AutoGen-ed  November 20, 2009 at 05:30:18 AM by AutoGen 5.10
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -58,7 +58,7 @@ This is the automatically generated usage text for ntpdc:
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTP query program - Ver. 4.2.5p238-RC
+ntpdc - vendor-specific NTP query program - Ver. 4.2.5p242-RC
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -98,8 +98,8 @@ 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 /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/.ntprc
- - reading file /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-dev-1142-79-1343/ntpdc/.ntprc
+ - reading file /users/stenn/.ntprc
+ - reading file /deacon/backroom/snaps/ntp-dev/ntpdc/.ntprc
  - examining environment variables named NTPDC_*
 
 The

diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index f481323577d80c70d7e13bd0f1b8a0c95e7acf38..f049d5933ae43bc842a1e757223046db504eeb02 100644 (file)
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual"
+.TH NTPDC 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  November 17, 2009 at 07:34:34 PM by AutoGen 5.10
+.\"  It has been AutoGen-ed  November 20, 2009 at 05:30:17 AM by AutoGen 5.10
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 05ead6d70cc816685c4bb91a056957a55c81f5d7..c187c61ea2e6dc3203764a196eb6a9a15b54769d 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  November 17, 2009 at 05:37:44 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:30:41 AM by AutoGen 5.10
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -427,7 +427,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPQ";
 tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.5p246-RC\n\
+"ntpq - standard NTP query program - Ver. 4.2.5p247-RC\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -447,7 +447,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";
 tSCC    zFullVersion[] = NTPQ_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 495 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -516,7 +516,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 109 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */
 
 #if defined(TEST_NTPQ_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -531,7 +531,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPQ_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 627 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index d7ea4db36ef5f1d3d2dd462055292d4d73ed51fc..700b0115e185d7e8ea6fd71018f3ffcd60449f3d 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  November 17, 2009 at 05:37:43 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:30:41 AM by AutoGen 5.10
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -69,8 +69,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.5p246-RC"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.5p246-RC"
+#define NTPQ_VERSION       "4.2.5p247-RC"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.5p247-RC"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -177,7 +177,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 409 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
 
 /* * * * * *
  *

diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index f6510eae68c87c5f905baf90b1718961a04d9f39..4457085a4d5cdf3b30cee139453f4170edd17aea 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  November 17, 2009 at 05:37:44 PM by AutoGen 5.10
+# It has been AutoGen-ed  November 20, 2009 at 05:30:43 AM by AutoGen 5.10
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,7 +47,7 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.5p238-RC
+ntpq - standard NTP query program - Ver. 4.2.5p242-RC
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -83,8 +83,8 @@ 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 /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/.ntprc
- - reading file /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-dev-1142/ntpq/.ntprc
+ - reading file /users/stenn/.ntprc
+ - reading file /deacon/backroom/snaps/ntp-dev/ntpq/.ntprc
  - examining environment variables named NTPQ_*
 
 The

diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 287a837c0ac2242a2b83cede49db50e92517b549..d3ac6d10a5dba6c5bf4691bea310205d29535aba 100644 (file)
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual"
+.TH NTPQ 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  November 17, 2009 at 05:37:44 PM by AutoGen 5.10
+.\"  It has been AutoGen-ed  November 20, 2009 at 05:30:42 AM by AutoGen 5.10
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 2ffc024e1f82f2f4add1395f9c64840fcbdef3bd..f82a0f0b18b7a20b98dc9fcc950c9539e5b1d8dc 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  November 17, 2009 at 05:37:58 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:31:04 AM by AutoGen 5.10
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -233,7 +233,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPSNMPD";
 tSCC   zUsageTitle[] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p246-RC\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p247-RC\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -245,7 +245,7 @@ tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
 #define zDetail         NULL
 tSCC    zFullVersion[] = NTPSNMPD_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 495 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -301,7 +301,7 @@ doUsageOpt(
     (void)pOptions;
     USAGE( EXIT_SUCCESS );
 }
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 109 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */
 
 #if defined(TEST_NTPSNMPD_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -316,7 +316,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPSNMPD_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 627 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index c7e7bd34e4a2de9184d163da3354e1451deb58ec..781f1cca395796d89cadd60dd8d46299973a3230 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  November 17, 2009 at 05:37:58 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:31:04 AM by AutoGen 5.10
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -62,8 +62,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    7
-#define NTPSNMPD_VERSION       "4.2.5p246-RC"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p246-RC"
+#define NTPSNMPD_VERSION       "4.2.5p247-RC"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p247-RC"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -128,7 +128,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 409 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
 
 /* * * * * *
  *

diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index cc5a02056e85786c7a40993b4a5b03c5db94057d..a57fa2071a14e6ecb867c7429d5ddca978e1cb84 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  November 17, 2009 at 05:37:59 PM by AutoGen 5.10
+# It has been AutoGen-ed  November 20, 2009 at 05:31:06 AM by AutoGen 5.10
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -33,28 +33,7 @@ This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p238-RC
-USAGE:  ntpsnmpd [ -<flag> | --<name> ]...
-  Flg Arg Option-Name    Description
-   -n no  nofork         Do not fork
-   -p no  syslog         Log to syslog()
-      opt version        Output version information and exit
-   -? no  help           Display 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 /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/.ntprc
- - reading file /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-dev-1142/ntpsnmpd/.ntprc
- - examining environment variables named NTPSNMPD_*
-
-please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
+ntpsnmpd is unavailable - no --help
 @end example
 @exampleindent 4
 

diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index 70312f5f7c3f292e5f888074ee6d7bc02c0a4be3..cd83bfbe3d62993aa5057eb4bb8e7ac272a1678f 100644 (file)
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual"
+.TH NTPSNMPD 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  November 17, 2009 at 07:28:28 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  November 20, 2009 at 05:31:05 AM by AutoGen 5.10
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/packageinfo.sh b/packageinfo.sh
index 22ab56ff55a72343dcb46edce05dea8fd8c5eb7c..a6a746ce93352f924727e7f843f6c4e678f4f8ad 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=246
+point=247
 # Special.  Normally unused.  A suffix.
 #special=ag
 special=

diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 01ffaefac349c1e544eb2fa22a4fb71c9531efce..e75b1d896586a477476630410c978f79d9d7fbe5 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  November 17, 2009 at 07:35:07 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:35:47 AM by AutoGen 5.10
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -473,7 +473,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.5p246-RC\n\
+"sntp - standard SNTP program - Ver. 4.2.5p247-RC\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... ...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -493,7 +493,7 @@ job.\n\
 NTP is the Network Time Protocol (RFC 1305) and SNTP is the\n\
 Simple Network Time Protocol (RFC 2030, which supersedes RFC 1769).\n";
 tSCC    zFullVersion[] = SNTP_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 495 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -549,7 +549,7 @@ doUsageOpt(
     (void)pOptions;
     USAGE( EXIT_SUCCESS );
 }
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 109 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */
 
 #if defined(TEST_SNTP_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -564,7 +564,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_SNTP_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 627 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 50af578b1783476e3c13f538b5378ea0dfa69e3f..acf080e4d9669fdeb69ffbab2e764907999f72c7 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  November 17, 2009 at 07:35:07 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:35:47 AM by AutoGen 5.10
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -72,8 +72,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.5p246-RC"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p246-RC"
+#define SNTP_VERSION       "4.2.5p247-RC"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p247-RC"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -202,7 +202,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 409 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
 
 /* * * * * *
  *

diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 8114b657c24769e5e580b010b45b2aa7f8bc8bb3..5948049ffcb583d716b392c4ca6dbc9034866df1 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  November 17, 2009 at 07:35:07 PM by AutoGen 5.10
+# It has been AutoGen-ed  November 20, 2009 at 05:35:49 AM by AutoGen 5.10
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -50,7 +50,7 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard SNTP program - Ver. 4.2.5p238-RC
+sntp - standard SNTP program - Ver. 4.2.5p242-RC
 USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... ...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -86,8 +86,8 @@ 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 /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/.ntprc
- - reading file /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-dev-1142-79-1343/sntp/.ntprc
+ - reading file /users/stenn/.ntprc
+ - reading file /deacon/backroom/snaps/ntp-dev/sntp/.ntprc
  - examining environment variables named SNTP_*
 
 .I sntp

diff --git a/sntp/sntp.1 b/sntp/sntp.1
index eb335acbf5cf8d90cc21412bf4d0cab2371eb17c..e647d9ad3ea9f8539d04a0127b615fe15a79c4e0 100644 (file)
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual"
+.TH SNTP 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  November 17, 2009 at 07:35:07 PM by AutoGen 5.10
+.\"  It has been AutoGen-ed  November 20, 2009 at 05:35:48 AM by AutoGen 5.10
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index aeef0cda0d566e26f7c660dde489b85594046c05..f2304c192a7635e019d92d9884dc3e809686f47c 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  November 17, 2009 at 05:38:44 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:36:04 AM by AutoGen 5.10
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -738,7 +738,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p246-RC\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p247-RC\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -752,7 +752,7 @@ tSCC    zDetail[]     = "\n\
 If there is no new host key, look for an existing one.\n\
 If one is not found, create it.\n";
 tSCC    zFullVersion[] = NTP_KEYGEN_FULL_VERSION;
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 495 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -874,7 +874,7 @@ doOptModulus(tOptions* pOptions, tOptDesc* pOptDesc)
     pOptDesc->optArg.argInt = val;
 }
 #endif /* defined OPENSSL */
-/* extracted from /usr/local/share/autogen/optmain.tpl near line 109 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */
 
 #if defined(TEST_NTP_KEYGEN_OPTS) /* TEST MAIN PROCEDURE: */
 
@@ -889,7 +889,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTP_KEYGEN_OPTS */
-/* extracted from /usr/local/share/autogen/optcode.tpl near line 627 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 4b93831c62f146b6904632c9908a3d5e96b4831d..1c41af709b7f013fa4a824b259986fad5f33d9c5 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  November 17, 2009 at 05:38:44 PM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 20, 2009 at 05:36:04 AM by AutoGen 5.10
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -78,8 +78,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define NTP_KEYGEN_VERSION       "4.2.5p246-RC"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p246-RC"
+#define NTP_KEYGEN_VERSION       "4.2.5p247-RC"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p247-RC"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -252,7 +252,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 409 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
 
 /* * * * * *
  *

diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index 0a87cc224164f72a58d6f39b53b4796d2a3af09a..217cbce4f202f7bc10790f1ede65a93032812267 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  November 17, 2009 at 05:38:45 PM by AutoGen 5.10
+# It has been AutoGen-ed  November 20, 2009 at 05:36:06 AM by AutoGen 5.10
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -50,8 +50,8 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-Using OpenSSL version 90705f
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p238-RC
+Using OpenSSL version 90704f
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p242-RC
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
@@ -87,8 +87,8 @@ 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 /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/.ntprc
- - reading file /a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-dev-1142/util/.ntprc
+ - reading file /users/stenn/.ntprc
+ - reading file /deacon/backroom/snaps/ntp-dev/util/.ntprc
  - examining environment variables named NTP_KEYGEN_*
 
 If there is no new host key, look for an existing one.

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 02051aa7b86187274d5c74a5e1530b2f12b03eb9..cee3be9aa7e5174591b5c22d081ab471f65e472f 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2009-11-17 "(ntp 4.2.5p246-RC)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2009-11-20 "(ntp 4.2.5p247-RC)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  November 17, 2009 at 05:38:44 PM by AutoGen 5.10
+.\"  It has been AutoGen-ed  November 20, 2009 at 05:36:05 AM by AutoGen 5.10
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"