NTP_4_2_3P39

bk: 4500cb1dVgoStV_bxmW23DOedCZdqQ

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 814b5458e82c31e82c9934fee5cc311438d7a153..70a18d92a659bf70ceca6f0fc2f0c09d8472c97d 100644 (file)
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:42:51 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:31:51 PM EDT
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  */
@@ -864,7 +864,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPD";
 tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.3p38\n\
+"ntpd - NTP daemon program - Ver. 4.2.3p39\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 3ea75490bb871224d4aa3c99cfdccfb31e582495..d9f20bbac4b7be761257228f923f5ab319aefec9 100644 (file)
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:42:50 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:31:51 PM EDT
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  */
@@ -88,8 +88,189 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    34
-#define NTPD_VERSION       "4.2.3p38"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.3p38"
+#define NTPD_VERSION       "4.2.3p39"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.3p39"
+
+/*
+ *  Make sure there are no #define name conflicts with the option names
+ */
+#ifndef NO_OPTION_NAME_WARNINGS
+# ifdef IPV4
+#  warn  undefining IPV4 due to option name conflict
+#  undef IPV4
+# endif
+
+# ifdef IPV6
+#  warn  undefining IPV6 due to option name conflict
+#  undef IPV6
+# endif
+
+# ifdef AUTHREQ
+#  warn  undefining AUTHREQ due to option name conflict
+#  undef AUTHREQ
+# endif
+
+# ifdef AUTHNOREQ
+#  warn  undefining AUTHNOREQ due to option name conflict
+#  undef AUTHNOREQ
+# endif
+
+# ifdef BCASTSYNC
+#  warn  undefining BCASTSYNC due to option name conflict
+#  undef BCASTSYNC
+# endif
+
+# ifdef CONFIGFILE
+#  warn  undefining CONFIGFILE due to option name conflict
+#  undef CONFIGFILE
+# endif
+
+# ifdef DEBUG_LEVEL
+#  warn  undefining DEBUG_LEVEL due to option name conflict
+#  undef DEBUG_LEVEL
+# endif
+
+# ifdef SET_DEBUG_LEVEL
+#  warn  undefining SET_DEBUG_LEVEL due to option name conflict
+#  undef SET_DEBUG_LEVEL
+# endif
+
+# ifdef DRIFTFILE
+#  warn  undefining DRIFTFILE due to option name conflict
+#  undef DRIFTFILE
+# endif
+
+# ifdef PANICGATE
+#  warn  undefining PANICGATE due to option name conflict
+#  undef PANICGATE
+# endif
+
+# ifdef JAILDIR
+#  warn  undefining JAILDIR due to option name conflict
+#  undef JAILDIR
+# endif
+
+# ifdef INTERFACE
+#  warn  undefining INTERFACE due to option name conflict
+#  undef INTERFACE
+# endif
+
+# ifdef KEYFILE
+#  warn  undefining KEYFILE due to option name conflict
+#  undef KEYFILE
+# endif
+
+# ifdef LOGFILE
+#  warn  undefining LOGFILE due to option name conflict
+#  undef LOGFILE
+# endif
+
+# ifdef NOVIRTUALIPS
+#  warn  undefining NOVIRTUALIPS due to option name conflict
+#  undef NOVIRTUALIPS
+# endif
+
+# ifdef MODIFYMMTIMER
+#  warn  undefining MODIFYMMTIMER due to option name conflict
+#  undef MODIFYMMTIMER
+# endif
+
+# ifdef NOFORK
+#  warn  undefining NOFORK due to option name conflict
+#  undef NOFORK
+# endif
+
+# ifdef NICE
+#  warn  undefining NICE due to option name conflict
+#  undef NICE
+# endif
+
+# ifdef PIDFILE
+#  warn  undefining PIDFILE due to option name conflict
+#  undef PIDFILE
+# endif
+
+# ifdef PRIORITY
+#  warn  undefining PRIORITY due to option name conflict
+#  undef PRIORITY
+# endif
+
+# ifdef QUIT
+#  warn  undefining QUIT due to option name conflict
+#  undef QUIT
+# endif
+
+# ifdef PROPAGATIONDELAY
+#  warn  undefining PROPAGATIONDELAY due to option name conflict
+#  undef PROPAGATIONDELAY
+# endif
+
+# ifdef UPDATEINTERVAL
+#  warn  undefining UPDATEINTERVAL due to option name conflict
+#  undef UPDATEINTERVAL
+# endif
+
+# ifdef STATSDIR
+#  warn  undefining STATSDIR due to option name conflict
+#  undef STATSDIR
+# endif
+
+# ifdef TRUSTEDKEY
+#  warn  undefining TRUSTEDKEY due to option name conflict
+#  undef TRUSTEDKEY
+# endif
+
+# ifdef USER
+#  warn  undefining USER due to option name conflict
+#  undef USER
+# endif
+
+# ifdef VAR
+#  warn  undefining VAR due to option name conflict
+#  undef VAR
+# endif
+
+# ifdef DVAR
+#  warn  undefining DVAR due to option name conflict
+#  undef DVAR
+# endif
+
+# ifdef SLEW
+#  warn  undefining SLEW due to option name conflict
+#  undef SLEW
+# endif
+
+#else  /* NO_OPTION_NAME_WARNINGS */
+# undef IPV4
+# undef IPV6
+# undef AUTHREQ
+# undef AUTHNOREQ
+# undef BCASTSYNC
+# undef CONFIGFILE
+# undef DEBUG_LEVEL
+# undef SET_DEBUG_LEVEL
+# undef DRIFTFILE
+# undef PANICGATE
+# undef JAILDIR
+# undef INTERFACE
+# undef KEYFILE
+# undef LOGFILE
+# undef NOVIRTUALIPS
+# undef MODIFYMMTIMER
+# undef NOFORK
+# undef NICE
+# undef PIDFILE
+# undef PRIORITY
+# undef QUIT
+# undef PROPAGATIONDELAY
+# undef UPDATEINTERVAL
+# undef STATSDIR
+# undef TRUSTEDKEY
+# undef USER
+# undef VAR
+# undef DVAR
+# undef SLEW
+#endif /* NO_OPTION_NAME_WARNINGS */
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -174,7 +355,7 @@ typedef enum {
                 ntpdOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpdOptions.pUsageProc)( &ntpdOptions, c )
-/* extracted from opthead near line 288 */
+/* extracted from opthead near line 316 */
 
 /* * * * * *
  *

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index af2532b7663453b62c40ba8d81d50d19ed06ef90..089c8326c4f79d873bf731ee0e3e4099b3f88a03 100644 (file)
--- a/ntpd/ntpd-opts.texi
+++ b/ntpd/ntpd-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 31, 2006 at 01:42:53 AM EDT
+# It has been AutoGen-ed  Thursday September  7, 2006 at 09:31:54 PM EDT
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index bb588b2bbbb460cc06b34241d4afc50865bb1b89..6527a19e33f7422f235d89bbd152392548720cb9 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2006-08-31 "( 4.2.3p38)" "Programmer's Manual"
+.TH NTPD 1 2006-09-07 "( 4.2.3p39)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 31, 2006 at 01:42:52 AM EDT
+.\"  It has been AutoGen-ed  Thursday September  7, 2006 at 09:31:53 PM EDT
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c
index f8b89230a6333c52a69a1d46c3f1789f970bcc45..31b10cff3d56fa767ab5bab67c6076553273202a 100644 (file)
--- a/ntpd/ntpdsim-opts.c
+++ b/ntpd/ntpdsim-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdsim-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:42:55 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:31:56 PM EDT
  *  From the definitions    ntpdsim-opts.def
  *  and the template file   options
  */
@@ -1062,7 +1062,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDSIM";
 tSCC   zUsageTitle[] =
-"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p38\n\
+"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p39\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h
index 6bd2a90aa3d637e90e4acfc4c73cc320adc42e2e..5bcbc9c5499acde90124d5d38706aef0874c0372 100644 (file)
--- a/ntpd/ntpdsim-opts.h
+++ b/ntpd/ntpdsim-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdsim-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:42:54 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:31:55 PM EDT
  *  From the definitions    ntpdsim-opts.def
  *  and the template file   options
  */
@@ -97,8 +97,243 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    43
-#define NTPDSIM_VERSION       "4.2.3p38"
-#define NTPDSIM_FULL_VERSION  "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p38"
+#define NTPDSIM_VERSION       "4.2.3p39"
+#define NTPDSIM_FULL_VERSION  "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p39"
+
+/*
+ *  Make sure there are no #define name conflicts with the option names
+ */
+#ifndef NO_OPTION_NAME_WARNINGS
+# ifdef IPV4
+#  warn  undefining IPV4 due to option name conflict
+#  undef IPV4
+# endif
+
+# ifdef IPV6
+#  warn  undefining IPV6 due to option name conflict
+#  undef IPV6
+# endif
+
+# ifdef AUTHREQ
+#  warn  undefining AUTHREQ due to option name conflict
+#  undef AUTHREQ
+# endif
+
+# ifdef AUTHNOREQ
+#  warn  undefining AUTHNOREQ due to option name conflict
+#  undef AUTHNOREQ
+# endif
+
+# ifdef BCASTSYNC
+#  warn  undefining BCASTSYNC due to option name conflict
+#  undef BCASTSYNC
+# endif
+
+# ifdef SIMBROADCASTDELAY
+#  warn  undefining SIMBROADCASTDELAY due to option name conflict
+#  undef SIMBROADCASTDELAY
+# endif
+
+# ifdef CONFIGFILE
+#  warn  undefining CONFIGFILE due to option name conflict
+#  undef CONFIGFILE
+# endif
+
+# ifdef PHASENOISE
+#  warn  undefining PHASENOISE due to option name conflict
+#  undef PHASENOISE
+# endif
+
+# ifdef DEBUG_LEVEL
+#  warn  undefining DEBUG_LEVEL due to option name conflict
+#  undef DEBUG_LEVEL
+# endif
+
+# ifdef SET_DEBUG_LEVEL
+#  warn  undefining SET_DEBUG_LEVEL due to option name conflict
+#  undef SET_DEBUG_LEVEL
+# endif
+
+# ifdef DRIFTFILE
+#  warn  undefining DRIFTFILE due to option name conflict
+#  undef DRIFTFILE
+# endif
+
+# ifdef PANICGATE
+#  warn  undefining PANICGATE due to option name conflict
+#  undef PANICGATE
+# endif
+
+# ifdef SIMSLEW
+#  warn  undefining SIMSLEW due to option name conflict
+#  undef SIMSLEW
+# endif
+
+# ifdef JAILDIR
+#  warn  undefining JAILDIR due to option name conflict
+#  undef JAILDIR
+# endif
+
+# ifdef INTERFACE
+#  warn  undefining INTERFACE due to option name conflict
+#  undef INTERFACE
+# endif
+
+# ifdef KEYFILE
+#  warn  undefining KEYFILE due to option name conflict
+#  undef KEYFILE
+# endif
+
+# ifdef LOGFILE
+#  warn  undefining LOGFILE due to option name conflict
+#  undef LOGFILE
+# endif
+
+# ifdef NOVIRTUALIPS
+#  warn  undefining NOVIRTUALIPS due to option name conflict
+#  undef NOVIRTUALIPS
+# endif
+
+# ifdef MODIFYMMTIMER
+#  warn  undefining MODIFYMMTIMER due to option name conflict
+#  undef MODIFYMMTIMER
+# endif
+
+# ifdef NOFORK
+#  warn  undefining NOFORK due to option name conflict
+#  undef NOFORK
+# endif
+
+# ifdef NICE
+#  warn  undefining NICE due to option name conflict
+#  undef NICE
+# endif
+
+# ifdef SERVERTIME
+#  warn  undefining SERVERTIME due to option name conflict
+#  undef SERVERTIME
+# endif
+
+# ifdef PIDFILE
+#  warn  undefining PIDFILE due to option name conflict
+#  undef PIDFILE
+# endif
+
+# ifdef PRIORITY
+#  warn  undefining PRIORITY due to option name conflict
+#  undef PRIORITY
+# endif
+
+# ifdef QUIT
+#  warn  undefining QUIT due to option name conflict
+#  undef QUIT
+# endif
+
+# ifdef PROPAGATIONDELAY
+#  warn  undefining PROPAGATIONDELAY due to option name conflict
+#  undef PROPAGATIONDELAY
+# endif
+
+# ifdef UPDATEINTERVAL
+#  warn  undefining UPDATEINTERVAL due to option name conflict
+#  undef UPDATEINTERVAL
+# endif
+
+# ifdef STATSDIR
+#  warn  undefining STATSDIR due to option name conflict
+#  undef STATSDIR
+# endif
+
+# ifdef ENDSIMTIME
+#  warn  undefining ENDSIMTIME due to option name conflict
+#  undef ENDSIMTIME
+# endif
+
+# ifdef TRUSTEDKEY
+#  warn  undefining TRUSTEDKEY due to option name conflict
+#  undef TRUSTEDKEY
+# endif
+
+# ifdef FREQERR
+#  warn  undefining FREQERR due to option name conflict
+#  undef FREQERR
+# endif
+
+# ifdef WALKNOISE
+#  warn  undefining WALKNOISE due to option name conflict
+#  undef WALKNOISE
+# endif
+
+# ifdef USER
+#  warn  undefining USER due to option name conflict
+#  undef USER
+# endif
+
+# ifdef VAR
+#  warn  undefining VAR due to option name conflict
+#  undef VAR
+# endif
+
+# ifdef DVAR
+#  warn  undefining DVAR due to option name conflict
+#  undef DVAR
+# endif
+
+# ifdef SLEW
+#  warn  undefining SLEW due to option name conflict
+#  undef SLEW
+# endif
+
+# ifdef NDELAY
+#  warn  undefining NDELAY due to option name conflict
+#  undef NDELAY
+# endif
+
+# ifdef PDELAY
+#  warn  undefining PDELAY due to option name conflict
+#  undef PDELAY
+# endif
+
+#else  /* NO_OPTION_NAME_WARNINGS */
+# undef IPV4
+# undef IPV6
+# undef AUTHREQ
+# undef AUTHNOREQ
+# undef BCASTSYNC
+# undef SIMBROADCASTDELAY
+# undef CONFIGFILE
+# undef PHASENOISE
+# undef DEBUG_LEVEL
+# undef SET_DEBUG_LEVEL
+# undef DRIFTFILE
+# undef PANICGATE
+# undef SIMSLEW
+# undef JAILDIR
+# undef INTERFACE
+# undef KEYFILE
+# undef LOGFILE
+# undef NOVIRTUALIPS
+# undef MODIFYMMTIMER
+# undef NOFORK
+# undef NICE
+# undef SERVERTIME
+# undef PIDFILE
+# undef PRIORITY
+# undef QUIT
+# undef PROPAGATIONDELAY
+# undef UPDATEINTERVAL
+# undef STATSDIR
+# undef ENDSIMTIME
+# undef TRUSTEDKEY
+# undef FREQERR
+# undef WALKNOISE
+# undef USER
+# undef VAR
+# undef DVAR
+# undef SLEW
+# undef NDELAY
+# undef PDELAY
+#endif /* NO_OPTION_NAME_WARNINGS */
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -192,7 +427,7 @@ typedef enum {
                 ntpdsimOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpdsimOptions.pUsageProc)( &ntpdsimOptions, c )
-/* extracted from opthead near line 288 */
+/* extracted from opthead near line 316 */
 
 /* * * * * *
  *

diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi
index 9693920b4f940f66e022f229218beb5dc2d680ed..a0a0960fdbba8417b7ba48de2e04329b845690e1 100644 (file)
--- a/ntpd/ntpdsim-opts.texi
+++ b/ntpd/ntpdsim-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpdsim-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 31, 2006 at 01:42:58 AM EDT
+# It has been AutoGen-ed  Thursday September  7, 2006 at 09:31:59 PM EDT
 # From the definitions    ntpdsim-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1
index 980b6665e9862a836499e4311111645ee2a18568..dfbac9dc28ccc0dc9c3ffb1856823fa50de5b296 100644 (file)
--- a/ntpd/ntpdsim.1
+++ b/ntpd/ntpdsim.1
@@ -1,7 +1,7 @@
-.TH NTPDSIM 1 2006-08-31 "( 4.2.3p38)" "Programmer's Manual"
+.TH NTPDSIM 1 2006-09-07 "( 4.2.3p39)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpdsim.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 31, 2006 at 01:42:57 AM EDT
+.\"  It has been AutoGen-ed  Thursday September  7, 2006 at 09:31:58 PM EDT
 .\"  From the definitions    ntpdsim-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 3ecc82b5af193e8aec7d654209aba315132eec82..5e98bca4768c4f00623e745d36cab2ffcaa378e0 100644 (file)
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:49:06 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:14 PM EDT
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  */
@@ -451,7 +451,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDC";
 tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p38\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p39\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 616e4829afa15b9ee8937712f0a1ecaf223e6115..41fa896156fa382ee3a400904a69016fff68a67b 100644 (file)
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:49:06 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:14 PM EDT
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  */
@@ -69,8 +69,75 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.3p38"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p38"
+#define NTPDC_VERSION       "4.2.3p39"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p39"
+
+/*
+ *  Make sure there are no #define name conflicts with the option names
+ */
+#ifndef NO_OPTION_NAME_WARNINGS
+# ifdef IPV4
+#  warn  undefining IPV4 due to option name conflict
+#  undef IPV4
+# endif
+
+# ifdef IPV6
+#  warn  undefining IPV6 due to option name conflict
+#  undef IPV6
+# endif
+
+# ifdef COMMAND
+#  warn  undefining COMMAND due to option name conflict
+#  undef COMMAND
+# endif
+
+# ifdef LISTPEERS
+#  warn  undefining LISTPEERS due to option name conflict
+#  undef LISTPEERS
+# endif
+
+# ifdef PEERS
+#  warn  undefining PEERS due to option name conflict
+#  undef PEERS
+# endif
+
+# ifdef SHOWPEERS
+#  warn  undefining SHOWPEERS due to option name conflict
+#  undef SHOWPEERS
+# endif
+
+# ifdef INTERACTIVE
+#  warn  undefining INTERACTIVE due to option name conflict
+#  undef INTERACTIVE
+# endif
+
+# ifdef DEBUG_LEVEL
+#  warn  undefining DEBUG_LEVEL due to option name conflict
+#  undef DEBUG_LEVEL
+# endif
+
+# ifdef SET_DEBUG_LEVEL
+#  warn  undefining SET_DEBUG_LEVEL due to option name conflict
+#  undef SET_DEBUG_LEVEL
+# endif
+
+# ifdef NUMERIC
+#  warn  undefining NUMERIC due to option name conflict
+#  undef NUMERIC
+# endif
+
+#else  /* NO_OPTION_NAME_WARNINGS */
+# undef IPV4
+# undef IPV6
+# undef COMMAND
+# undef LISTPEERS
+# undef PEERS
+# undef SHOWPEERS
+# undef INTERACTIVE
+# undef DEBUG_LEVEL
+# undef SET_DEBUG_LEVEL
+# undef NUMERIC
+#endif /* NO_OPTION_NAME_WARNINGS */
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -132,7 +199,7 @@ typedef enum {
                 ntpdcOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpdcOptions.pUsageProc)( &ntpdcOptions, c )
-/* extracted from opthead near line 288 */
+/* extracted from opthead near line 316 */
 
 /* * * * * *
  *

diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 8fa7125f36601744877a321ccaf03bb3d2b5cdd9..3295c0b997e8d97071a63961fac95eb9c9707181 100644 (file)
--- a/ntpdc/ntpdc-opts.texi
+++ b/ntpdc/ntpdc-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 31, 2006 at 01:49:08 AM EDT
+# It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:16 PM EDT
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index 610e0d5fe4953ec0b2c7b1d733e4a76637121057..7653d2759b021e34d01d4493060c7db79ea835c3 100644 (file)
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2006-08-31 "( 4.2.3p38)" "Programmer's Manual"
+.TH NTPDC 1 2006-09-07 "( 4.2.3p39)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 31, 2006 at 01:49:08 AM EDT
+.\"  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:16 PM EDT
 .\"  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 416fd86906717a5e877a9c6a234d05f26e19e08e..0d9edecafb84ce4d2c5e2dd35168c634dcedb909 100644 (file)
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:49:37 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:33 PM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  */
@@ -399,7 +399,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPQ";
 tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.3p38\n\
+"ntpq - standard NTP query program - Ver. 4.2.3p39\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 26ad38b918db6c7ace4648cf3efa36ac54aa5acd..e93f90b4dc45a44a1f8522be6b65fe9bc3905219 100644 (file)
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:49:36 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:33 PM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  */
@@ -67,8 +67,63 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    13
-#define NTPQ_VERSION       "4.2.3p38"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.3p38"
+#define NTPQ_VERSION       "4.2.3p39"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.3p39"
+
+/*
+ *  Make sure there are no #define name conflicts with the option names
+ */
+#ifndef NO_OPTION_NAME_WARNINGS
+# ifdef IPV4
+#  warn  undefining IPV4 due to option name conflict
+#  undef IPV4
+# endif
+
+# ifdef IPV6
+#  warn  undefining IPV6 due to option name conflict
+#  undef IPV6
+# endif
+
+# ifdef COMMAND
+#  warn  undefining COMMAND due to option name conflict
+#  undef COMMAND
+# endif
+
+# ifdef DEBUG_LEVEL
+#  warn  undefining DEBUG_LEVEL due to option name conflict
+#  undef DEBUG_LEVEL
+# endif
+
+# ifdef SET_DEBUG_LEVEL
+#  warn  undefining SET_DEBUG_LEVEL due to option name conflict
+#  undef SET_DEBUG_LEVEL
+# endif
+
+# ifdef PEERS
+#  warn  undefining PEERS due to option name conflict
+#  undef PEERS
+# endif
+
+# ifdef INTERACTIVE
+#  warn  undefining INTERACTIVE due to option name conflict
+#  undef INTERACTIVE
+# endif
+
+# ifdef NUMERIC
+#  warn  undefining NUMERIC due to option name conflict
+#  undef NUMERIC
+# endif
+
+#else  /* NO_OPTION_NAME_WARNINGS */
+# undef IPV4
+# undef IPV6
+# undef COMMAND
+# undef DEBUG_LEVEL
+# undef SET_DEBUG_LEVEL
+# undef PEERS
+# undef INTERACTIVE
+# undef NUMERIC
+#endif /* NO_OPTION_NAME_WARNINGS */
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -128,7 +183,7 @@ typedef enum {
                 ntpqOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpqOptions.pUsageProc)( &ntpqOptions, c )
-/* extracted from opthead near line 288 */
+/* extracted from opthead near line 316 */
 
 /* * * * * *
  *

diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index be403b4d69b6d903ebccd7dcd90aae98f2207a08..d9bf96824ab2785e55341f095e9c773b6538422c 100644 (file)
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 31, 2006 at 01:49:39 AM EDT
+# It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:35 PM EDT
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index a0939bea0a7fea4cffca199c81e7c7de1b2d26fe..f8a9fa28fee52e79b3b4892fdcd89e78f3c9233f 100644 (file)
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2006-08-31 "( 4.2.3p38)" "Programmer's Manual"
+.TH NTPQ 1 2006-09-07 "( 4.2.3p39)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 31, 2006 at 01:49:38 AM EDT
+.\"  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:34 PM EDT
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/packageinfo.sh b/packageinfo.sh
index b81dd7269e975ef57f8418c57cca19c8cdb43e96..1a290579da332730297b22c59810ef8e4d9d1778 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=38
+point=39
 # Special.  Normally unused.  A suffix.
 #special=ag
 special=

diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index c6cc4ed4dd9886d5ac1de321d3fbe3405f1905d7..318e7df262c1411f15b0e9b248c8a56742549e73 100644 (file)
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:50:08 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:20:54 PM EDT
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  */
@@ -114,7 +114,7 @@ tSCC zCopyright[] =
        "sntp copyright (c) 1970-2006 ntp.org, all rights reserved";
 tSCC zCopyrightNotice[] =
        
-/* extracted from sntp-opts.def near line 10 */
+/* extracted from sntp-opts.def near line 12 */
 "        General Public Licence for the software known as MSNTP\n\
         ------------------------------------------------------\n\n\
 \t  (c) Copyright, N.M. Maclaren, 1996, 1997, 2000\n\
@@ -481,7 +481,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.3p38\n\
+"sntp - standard SNTP program - Ver. 4.2.3p39\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 56a1395de4678ce5d5ff2567b98f7f8fd2daf8c4..00d6677dc13bba46c9812084946e5d90c9ccbcce 100644 (file)
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:50:07 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:20:53 PM EDT
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  */
@@ -145,8 +145,57 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    12
-#define SNTP_VERSION       "4.2.3p38"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.3p38"
+#define SNTP_VERSION       "4.2.3p39"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.3p39"
+
+/*
+ *  Make sure there are no #define name conflicts with the option names
+ */
+#ifndef NO_OPTION_NAME_WARNINGS
+# ifdef IPV4
+#  warn  undefining IPV4 due to option name conflict
+#  undef IPV4
+# endif
+
+# ifdef IPV6
+#  warn  undefining IPV6 due to option name conflict
+#  undef IPV6
+# endif
+
+# ifdef NORMALVERBOSE
+#  warn  undefining NORMALVERBOSE due to option name conflict
+#  undef NORMALVERBOSE
+# endif
+
+# ifdef EXTRAVERBOSE
+#  warn  undefining EXTRAVERBOSE due to option name conflict
+#  undef EXTRAVERBOSE
+# endif
+
+# ifdef MEGAVERBOSE
+#  warn  undefining MEGAVERBOSE due to option name conflict
+#  undef MEGAVERBOSE
+# endif
+
+# ifdef SETTIMEOFDAY
+#  warn  undefining SETTIMEOFDAY due to option name conflict
+#  undef SETTIMEOFDAY
+# endif
+
+# ifdef ADJTIME
+#  warn  undefining ADJTIME due to option name conflict
+#  undef ADJTIME
+# endif
+
+#else  /* NO_OPTION_NAME_WARNINGS */
+# undef IPV4
+# undef IPV6
+# undef NORMALVERBOSE
+# undef EXTRAVERBOSE
+# undef MEGAVERBOSE
+# undef SETTIMEOFDAY
+# undef ADJTIME
+#endif /* NO_OPTION_NAME_WARNINGS */
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -201,7 +250,7 @@ typedef enum {
                 sntpOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*sntpOptions.pUsageProc)( &sntpOptions, c )
-/* extracted from opthead near line 288 */
+/* extracted from opthead near line 316 */
 
 /* * * * * *
  *

diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index e7ba3258d0b78bbdf0c41646b985b3c3ee2c7881..692915eaea415932aaf3caeed45722c2fc6739ea 100644 (file)
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 31, 2006 at 01:50:10 AM EDT
+# It has been AutoGen-ed  Thursday September  7, 2006 at 09:20:57 PM EDT
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 17d9f038498cbe56a94d388467217f3f436e098d..3728ef60ca1a45f1d948cc31533ae46a6c7bb01e 100644 (file)
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:50:17 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:56 PM EDT
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  */
@@ -789,7 +789,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p38\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p39\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 80b14ab28a3958365f0cae76a64e3ad33b96b49c..936d48e7cb0bec6077ff92fb0633484ded8f230d 100644 (file)
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 31, 2006 at 01:50:16 AM EDT
+ *  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:55 PM EDT
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  */
@@ -78,8 +78,129 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.3p38"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p38"
+#define NTP_KEYGEN_VERSION       "4.2.3p39"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p39"
+
+/*
+ *  Make sure there are no #define name conflicts with the option names
+ */
+#ifndef NO_OPTION_NAME_WARNINGS
+# ifdef CERTIFICATE
+#  warn  undefining CERTIFICATE due to option name conflict
+#  undef CERTIFICATE
+# endif
+
+# ifdef DEBUG_LEVEL
+#  warn  undefining DEBUG_LEVEL due to option name conflict
+#  undef DEBUG_LEVEL
+# endif
+
+# ifdef SET_DEBUG_LEVEL
+#  warn  undefining SET_DEBUG_LEVEL due to option name conflict
+#  undef SET_DEBUG_LEVEL
+# endif
+
+# ifdef ID_KEY
+#  warn  undefining ID_KEY due to option name conflict
+#  undef ID_KEY
+# endif
+
+# ifdef GQ_PARAMS
+#  warn  undefining GQ_PARAMS due to option name conflict
+#  undef GQ_PARAMS
+# endif
+
+# ifdef GQ_KEYS
+#  warn  undefining GQ_KEYS due to option name conflict
+#  undef GQ_KEYS
+# endif
+
+# ifdef HOST_KEY
+#  warn  undefining HOST_KEY due to option name conflict
+#  undef HOST_KEY
+# endif
+
+# ifdef IFFKEY
+#  warn  undefining IFFKEY due to option name conflict
+#  undef IFFKEY
+# endif
+
+# ifdef ISSUER_NAME
+#  warn  undefining ISSUER_NAME due to option name conflict
+#  undef ISSUER_NAME
+# endif
+
+# ifdef MD5KEY
+#  warn  undefining MD5KEY due to option name conflict
+#  undef MD5KEY
+# endif
+
+# ifdef MODULUS
+#  warn  undefining MODULUS due to option name conflict
+#  undef MODULUS
+# endif
+
+# ifdef PVT_CERT
+#  warn  undefining PVT_CERT due to option name conflict
+#  undef PVT_CERT
+# endif
+
+# ifdef PVT_PASSWD
+#  warn  undefining PVT_PASSWD due to option name conflict
+#  undef PVT_PASSWD
+# endif
+
+# ifdef GET_PVT_PASSWD
+#  warn  undefining GET_PVT_PASSWD due to option name conflict
+#  undef GET_PVT_PASSWD
+# endif
+
+# ifdef SIGN_KEY
+#  warn  undefining SIGN_KEY due to option name conflict
+#  undef SIGN_KEY
+# endif
+
+# ifdef SUBJECT_NAME
+#  warn  undefining SUBJECT_NAME due to option name conflict
+#  undef SUBJECT_NAME
+# endif
+
+# ifdef TRUSTED_CERT
+#  warn  undefining TRUSTED_CERT due to option name conflict
+#  undef TRUSTED_CERT
+# endif
+
+# ifdef MV_PARAMS
+#  warn  undefining MV_PARAMS due to option name conflict
+#  undef MV_PARAMS
+# endif
+
+# ifdef MV_KEYS
+#  warn  undefining MV_KEYS due to option name conflict
+#  undef MV_KEYS
+# endif
+
+#else  /* NO_OPTION_NAME_WARNINGS */
+# undef CERTIFICATE
+# undef DEBUG_LEVEL
+# undef SET_DEBUG_LEVEL
+# undef ID_KEY
+# undef GQ_PARAMS
+# undef GQ_KEYS
+# undef HOST_KEY
+# undef IFFKEY
+# undef ISSUER_NAME
+# undef MD5KEY
+# undef MODULUS
+# undef PVT_CERT
+# undef PVT_PASSWD
+# undef GET_PVT_PASSWD
+# undef SIGN_KEY
+# undef SUBJECT_NAME
+# undef TRUSTED_CERT
+# undef MV_PARAMS
+# undef MV_KEYS
+#endif /* NO_OPTION_NAME_WARNINGS */
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -183,7 +304,7 @@ typedef enum {
                 ntp_keygenOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntp_keygenOptions.pUsageProc)( &ntp_keygenOptions, c )
-/* extracted from opthead near line 288 */
+/* extracted from opthead near line 316 */
 
 /* * * * * *
  *

diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index 73bf17fedc54070c075b62e95b9a164f9c0f5969..eb3117c04b010baffc7f245769b7285ebfa9c948 100644 (file)
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 31, 2006 at 01:50:19 AM EDT
+# It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:58 PM EDT
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index d83a55208944e8a32e34f1d48784b4df1a46a841..27f54091d97dc26e295ecf529c8e79c07df8105b 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2006-08-31 "(ntp 4.2.3p38)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2006-09-07 "(ntp 4.2.3p39)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 31, 2006 at 01:50:19 AM EDT
+.\"  It has been AutoGen-ed  Thursday September  7, 2006 at 09:33:57 PM EDT
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"