[ntp:bk-ntp-dev-send] BitKeeper diffs
Harlan Stenn
stenn at whimsy.udel.edu
Sat May 26 00:24:11 PDT 2007
#### ChangeSet ####
2007-05-25 07:44:43-04:00, stenn at whimsy.udel.edu
NTP_4_2_4P2_RC3
TAG: NTP_4_2_4P2_RC3
==== util/ntp-keygen-opts.c ====
2007-05-25 07:44:37-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.49.3.2/util/ntp-keygen-opts.c 2007-05-19 07:53:51 -04:00
+++ 1.49.4.1/util/ntp-keygen-opts.c 2007-05-25 07:44:37 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntp-keygen-opts.c)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:53:00 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:43:45 AM EDT
* From the definitions ntp-keygen-opts.def
* and the template file options
*
@@ -800,7 +800,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
*/
tSCC zPROGNAME[] = "NTP_KEYGEN";
tSCC zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p2-RC2\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p2-RC3\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
==== util/ntp-keygen-opts.h ====
2007-05-25 07:44:38-04:00, stenn at whimsy.udel.edu +3 -3
NTP_4_2_4P2_RC3
--- 1.49.3.2/util/ntp-keygen-opts.h 2007-05-19 07:53:51 -04:00
+++ 1.49.4.1/util/ntp-keygen-opts.h 2007-05-25 07:44:38 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntp-keygen-opts.h)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:52:59 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:43:45 AM EDT
* From the definitions ntp-keygen-opts.def
* and the template file options
*
@@ -80,8 +80,8 @@ typedef enum {
} teOptIndex;
#define OPTION_CT 24
-#define NTP_KEYGEN_VERSION "4.2.4p2-RC2"
-#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p2-RC2"
+#define NTP_KEYGEN_VERSION "4.2.4p2-RC3"
+#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p2-RC3"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
==== util/ntp-keygen-opts.texi ====
2007-05-25 07:44:38-04:00, stenn at whimsy.udel.edu +1 -1
NTP_4_2_4P2_RC3
--- 1.47.3.2/util/ntp-keygen-opts.texi 2007-05-19 07:53:52 -04:00
+++ 1.47.4.1/util/ntp-keygen-opts.texi 2007-05-25 07:44:38 -04:00
@@ -7,7 +7,7 @@
#
# DO NOT EDIT THIS FILE (ntp-keygen-opts.texi)
#
-# It has been AutoGen-ed Saturday May 19, 2007 at 07:53:02 AM EDT
+# It has been AutoGen-ed Friday May 25, 2007 at 07:43:47 AM EDT
# From the definitions ntp-keygen-opts.def
# and the template file aginfo.tpl
@end ignore
==== util/ntp-keygen.1 ====
2007-05-25 07:44:39-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.47.3.2/util/ntp-keygen.1 2007-05-19 07:53:53 -04:00
+++ 1.47.4.1/util/ntp-keygen.1 2007-05-25 07:44:39 -04:00
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2007-05-19 "(ntp 4.2.4p2-RC2)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2007-05-25 "(ntp 4.2.4p2-RC3)" "Programmer's Manual"
.\" DO NOT EDIT THIS FILE (ntp-keygen.1)
.\"
-.\" It has been AutoGen-ed Saturday May 19, 2007 at 07:53:01 AM EDT
+.\" It has been AutoGen-ed Friday May 25, 2007 at 07:43:46 AM EDT
.\" From the definitions ntp-keygen-opts.def
.\" and the template file agman1.tpl
.\"
==== ntpd/ntpd-opts.c ====
2007-05-25 07:44:20-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.50.3.2/ntpd/ntpd-opts.c 2007-05-19 07:53:35 -04:00
+++ 1.50.4.1/ntpd/ntpd-opts.c 2007-05-25 07:44:20 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntpd-opts.c)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:44:49 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:36:01 AM EDT
* From the definitions ntpd-opts.def
* and the template file options
*
@@ -836,7 +836,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
*/
tSCC zPROGNAME[] = "NTPD";
tSCC zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.4p2-RC2\n\
+"ntpd - NTP daemon program - Ver. 4.2.4p2-RC3\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
#define zRcName NULL
#define apzHomeList NULL
==== ntpd/ntpd-opts.h ====
2007-05-25 07:44:21-04:00, stenn at whimsy.udel.edu +3 -3
NTP_4_2_4P2_RC3
--- 1.50.3.2/ntpd/ntpd-opts.h 2007-05-19 07:53:35 -04:00
+++ 1.50.4.1/ntpd/ntpd-opts.h 2007-05-25 07:44:21 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntpd-opts.h)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:44:48 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:36:00 AM EDT
* From the definitions ntpd-opts.def
* and the template file options
*
@@ -88,8 +88,8 @@ typedef enum {
} teOptIndex;
#define OPTION_CT 32
-#define NTPD_VERSION "4.2.4p2-RC2"
-#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p2-RC2"
+#define NTPD_VERSION "4.2.4p2-RC3"
+#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p2-RC3"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
==== ntpd/ntpd-opts.texi ====
2007-05-25 07:44:22-04:00, stenn at whimsy.udel.edu +1 -1
NTP_4_2_4P2_RC3
--- 1.49.3.2/ntpd/ntpd-opts.texi 2007-05-19 07:53:36 -04:00
+++ 1.49.4.1/ntpd/ntpd-opts.texi 2007-05-25 07:44:22 -04:00
@@ -7,7 +7,7 @@
#
# DO NOT EDIT THIS FILE (ntpd-opts.texi)
#
-# It has been AutoGen-ed Saturday May 19, 2007 at 07:44:52 AM EDT
+# It has been AutoGen-ed Friday May 25, 2007 at 07:36:04 AM EDT
# From the definitions ntpd-opts.def
# and the template file aginfo.tpl
@end ignore
==== ntpd/ntpd.1 ====
2007-05-25 07:44:23-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.48.3.2/ntpd/ntpd.1 2007-05-19 07:53:37 -04:00
+++ 1.48.4.1/ntpd/ntpd.1 2007-05-25 07:44:23 -04:00
@@ -1,7 +1,7 @@
-.TH NTPD 1 2007-05-19 "( 4.2.4p2-RC2)" "Programmer's Manual"
+.TH NTPD 1 2007-05-25 "( 4.2.4p2-RC3)" "Programmer's Manual"
.\" DO NOT EDIT THIS FILE (ntpd.1)
.\"
-.\" It has been AutoGen-ed Saturday May 19, 2007 at 07:44:50 AM EDT
+.\" It has been AutoGen-ed Friday May 25, 2007 at 07:36:02 AM EDT
.\" From the definitions ntpd-opts.def
.\" and the template file agman1.tpl
.\"
==== ntpdc/ntpdc-opts.c ====
2007-05-25 07:44:26-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.50.3.2/ntpdc/ntpdc-opts.c 2007-05-19 07:53:41 -04:00
+++ 1.50.4.1/ntpdc/ntpdc-opts.c 2007-05-25 07:44:26 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntpdc-opts.c)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:51:28 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:42:38 AM EDT
* From the definitions ntpdc-opts.def
* and the template file options
*
@@ -463,7 +463,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
*/
tSCC zPROGNAME[] = "NTPDC";
tSCC zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p2-RC2\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p2-RC3\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
==== ntpdc/ntpdc-opts.h ====
2007-05-25 07:44:27-04:00, stenn at whimsy.udel.edu +3 -3
NTP_4_2_4P2_RC3
--- 1.50.3.2/ntpdc/ntpdc-opts.h 2007-05-19 07:53:42 -04:00
+++ 1.50.4.1/ntpdc/ntpdc-opts.h 2007-05-25 07:44:27 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntpdc-opts.h)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:51:27 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:42:37 AM EDT
* From the definitions ntpdc-opts.def
* and the template file options
*
@@ -71,8 +71,8 @@ typedef enum {
} teOptIndex;
#define OPTION_CT 15
-#define NTPDC_VERSION "4.2.4p2-RC2"
-#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p2-RC2"
+#define NTPDC_VERSION "4.2.4p2-RC3"
+#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p2-RC3"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
==== ntpdc/ntpdc-opts.texi ====
2007-05-25 07:44:28-04:00, stenn at whimsy.udel.edu +1 -1
NTP_4_2_4P2_RC3
--- 1.48.3.2/ntpdc/ntpdc-opts.texi 2007-05-19 07:53:43 -04:00
+++ 1.48.4.1/ntpdc/ntpdc-opts.texi 2007-05-25 07:44:28 -04:00
@@ -7,7 +7,7 @@
#
# DO NOT EDIT THIS FILE (ntpdc-opts.texi)
#
-# It has been AutoGen-ed Saturday May 19, 2007 at 07:51:30 AM EDT
+# It has been AutoGen-ed Friday May 25, 2007 at 07:42:39 AM EDT
# From the definitions ntpdc-opts.def
# and the template file aginfo.tpl
@end ignore
==== ntpdc/ntpdc.1 ====
2007-05-25 07:44:28-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.48.3.2/ntpdc/ntpdc.1 2007-05-19 07:53:43 -04:00
+++ 1.48.4.1/ntpdc/ntpdc.1 2007-05-25 07:44:28 -04:00
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2007-05-19 "( 4.2.4p2-RC2)" "Programmer's Manual"
+.TH NTPDC 1 2007-05-25 "( 4.2.4p2-RC3)" "Programmer's Manual"
.\" DO NOT EDIT THIS FILE (ntpdc.1)
.\"
-.\" It has been AutoGen-ed Saturday May 19, 2007 at 07:51:29 AM EDT
+.\" It has been AutoGen-ed Friday May 25, 2007 at 07:42:39 AM EDT
.\" From the definitions ntpdc-opts.def
.\" and the template file agman1.tpl
.\"
==== ntpd/ntpdsim-opts.c ====
2007-05-25 07:44:23-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.50.3.2/ntpd/ntpdsim-opts.c 2007-05-19 07:53:38 -04:00
+++ 1.50.4.1/ntpd/ntpdsim-opts.c 2007-05-25 07:44:23 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntpdsim-opts.c)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:44:54 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:36:06 AM EDT
* From the definitions ntpdsim-opts.def
* and the template file options
*
@@ -1073,7 +1073,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
*/
tSCC zPROGNAME[] = "NTPDSIM";
tSCC zUsageTitle[] =
-"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p2-RC2\n\
+"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p2-RC3\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
==== ntpd/ntpdsim-opts.h ====
2007-05-25 07:44:24-04:00, stenn at whimsy.udel.edu +3 -3
NTP_4_2_4P2_RC3
--- 1.50.3.2/ntpd/ntpdsim-opts.h 2007-05-19 07:53:39 -04:00
+++ 1.50.4.1/ntpd/ntpdsim-opts.h 2007-05-25 07:44:24 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntpdsim-opts.h)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:44:53 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:36:05 AM EDT
* From the definitions ntpdsim-opts.def
* and the template file options
*
@@ -99,8 +99,8 @@ typedef enum {
} teOptIndex;
#define OPTION_CT 43
-#define NTPDSIM_VERSION "4.2.4p2-RC2"
-#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p2-RC2"
+#define NTPDSIM_VERSION "4.2.4p2-RC3"
+#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p2-RC3"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
==== ntpd/ntpdsim-opts.texi ====
2007-05-25 07:44:25-04:00, stenn at whimsy.udel.edu +1 -1
NTP_4_2_4P2_RC3
--- 1.48.3.2/ntpd/ntpdsim-opts.texi 2007-05-19 07:53:40 -04:00
+++ 1.48.4.1/ntpd/ntpdsim-opts.texi 2007-05-25 07:44:25 -04:00
@@ -7,7 +7,7 @@
#
# DO NOT EDIT THIS FILE (ntpdsim-opts.texi)
#
-# It has been AutoGen-ed Saturday May 19, 2007 at 07:44:57 AM EDT
+# It has been AutoGen-ed Friday May 25, 2007 at 07:36:09 AM EDT
# From the definitions ntpdsim-opts.def
# and the template file aginfo.tpl
@end ignore
==== ntpd/ntpdsim.1 ====
2007-05-25 07:44:25-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.48.3.2/ntpd/ntpdsim.1 2007-05-19 07:53:40 -04:00
+++ 1.48.4.1/ntpd/ntpdsim.1 2007-05-25 07:44:25 -04:00
@@ -1,7 +1,7 @@
-.TH NTPDSIM 1 2007-05-19 "( 4.2.4p2-RC2)" "Programmer's Manual"
+.TH NTPDSIM 1 2007-05-25 "( 4.2.4p2-RC3)" "Programmer's Manual"
.\" DO NOT EDIT THIS FILE (ntpdsim.1)
.\"
-.\" It has been AutoGen-ed Saturday May 19, 2007 at 07:44:55 AM EDT
+.\" It has been AutoGen-ed Friday May 25, 2007 at 07:36:07 AM EDT
.\" From the definitions ntpdsim-opts.def
.\" and the template file agman1.tpl
.\"
==== ntpq/ntpq-opts.c ====
2007-05-25 07:44:29-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.52.3.2/ntpq/ntpq-opts.c 2007-05-19 07:53:44 -04:00
+++ 1.52.4.1/ntpq/ntpq-opts.c 2007-05-25 07:44:29 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntpq-opts.c)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:51:59 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:43:08 AM EDT
* From the definitions ntpq-opts.def
* and the template file options
*
@@ -411,7 +411,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
*/
tSCC zPROGNAME[] = "NTPQ";
tSCC zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.4p2-RC2\n\
+"ntpq - standard NTP query program - Ver. 4.2.4p2-RC3\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
==== ntpq/ntpq-opts.h ====
2007-05-25 07:44:30-04:00, stenn at whimsy.udel.edu +3 -3
NTP_4_2_4P2_RC3
--- 1.52.3.2/ntpq/ntpq-opts.h 2007-05-19 07:53:45 -04:00
+++ 1.52.4.1/ntpq/ntpq-opts.h 2007-05-25 07:44:30 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ntpq-opts.h)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:51:58 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:43:08 AM EDT
* From the definitions ntpq-opts.def
* and the template file options
*
@@ -69,8 +69,8 @@ typedef enum {
} teOptIndex;
#define OPTION_CT 13
-#define NTPQ_VERSION "4.2.4p2-RC2"
-#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p2-RC2"
+#define NTPQ_VERSION "4.2.4p2-RC3"
+#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p2-RC3"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
==== ntpq/ntpq-opts.texi ====
2007-05-25 07:44:31-04:00, stenn at whimsy.udel.edu +1 -1
NTP_4_2_4P2_RC3
--- 1.49.3.2/ntpq/ntpq-opts.texi 2007-05-19 07:53:46 -04:00
+++ 1.49.4.1/ntpq/ntpq-opts.texi 2007-05-25 07:44:31 -04:00
@@ -7,7 +7,7 @@
#
# DO NOT EDIT THIS FILE (ntpq-opts.texi)
#
-# It has been AutoGen-ed Saturday May 19, 2007 at 07:52:01 AM EDT
+# It has been AutoGen-ed Friday May 25, 2007 at 07:43:10 AM EDT
# From the definitions ntpq-opts.def
# and the template file aginfo.tpl
@end ignore
==== ntpq/ntpq.1 ====
2007-05-25 07:44:32-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.48.3.2/ntpq/ntpq.1 2007-05-19 07:53:47 -04:00
+++ 1.48.4.1/ntpq/ntpq.1 2007-05-25 07:44:32 -04:00
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2007-05-19 "( 4.2.4p2-RC2)" "Programmer's Manual"
+.TH NTPQ 1 2007-05-25 "( 4.2.4p2-RC3)" "Programmer's Manual"
.\" DO NOT EDIT THIS FILE (ntpq.1)
.\"
-.\" It has been AutoGen-ed Saturday May 19, 2007 at 07:52:00 AM EDT
+.\" It has been AutoGen-ed Friday May 25, 2007 at 07:43:09 AM EDT
.\" From the definitions ntpq-opts.def
.\" and the template file agman1.tpl
.\"
==== packageinfo.sh ====
2007-05-25 07:44:33-04:00, stenn at whimsy.udel.edu +1 -1
NTP_4_2_4P2_RC3
--- 1.65.9.3/packageinfo.sh 2007-05-19 07:53:48 -04:00
+++ 1.65.10.1/packageinfo.sh 2007-05-25 07:44:33 -04:00
@@ -27,5 +27,5 @@ CLTAG=NTP_4_2_0
# - - rcpoint gets set to 0
# - - releasecandidate gets set to no
# - GRONK is for -dev
-rcpoint=2
+rcpoint=3
#rcpoint=GRONK
==== sntp/sntp-opts.c ====
2007-05-25 07:44:33-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.49.3.2/sntp/sntp-opts.c 2007-05-19 07:53:48 -04:00
+++ 1.49.4.1/sntp/sntp-opts.c 2007-05-25 07:44:33 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (sntp-opts.c)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:52:26 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:43:37 AM EDT
* From the definitions sntp-opts.def
* and the template file options
*
@@ -514,7 +514,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
*/
tSCC zPROGNAME[] = "SNTP";
tSCC zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.4p2-RC2\n\
+"sntp - standard SNTP program - Ver. 4.2.4p2-RC3\n\
USAGE: %s [ -<flag> | --<name> ]...\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
==== sntp/sntp-opts.h ====
2007-05-25 07:44:35-04:00, stenn at whimsy.udel.edu +3 -3
NTP_4_2_4P2_RC3
--- 1.49.3.2/sntp/sntp-opts.h 2007-05-19 07:53:49 -04:00
+++ 1.49.4.1/sntp/sntp-opts.h 2007-05-25 07:44:35 -04:00
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (sntp-opts.h)
*
- * It has been AutoGen-ed Saturday May 19, 2007 at 07:52:25 AM EDT
+ * It has been AutoGen-ed Friday May 25, 2007 at 07:43:36 AM EDT
* From the definitions sntp-opts.def
* and the template file options
*
@@ -148,8 +148,8 @@ typedef enum {
} teOptIndex;
#define OPTION_CT 13
-#define SNTP_VERSION "4.2.4p2-RC2"
-#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p2-RC2"
+#define SNTP_VERSION "4.2.4p2-RC3"
+#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p2-RC3"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
==== sntp/sntp-opts.texi ====
2007-05-25 07:44:35-04:00, stenn at whimsy.udel.edu +1 -1
NTP_4_2_4P2_RC3
--- 1.46.3.2/sntp/sntp-opts.texi 2007-05-19 07:53:49 -04:00
+++ 1.46.4.1/sntp/sntp-opts.texi 2007-05-25 07:44:35 -04:00
@@ -7,7 +7,7 @@
#
# DO NOT EDIT THIS FILE (sntp-opts.texi)
#
-# It has been AutoGen-ed Saturday May 19, 2007 at 07:52:28 AM EDT
+# It has been AutoGen-ed Friday May 25, 2007 at 07:43:39 AM EDT
# From the definitions sntp-opts.def
# and the template file aginfo.tpl
@end ignore
==== sntp/sntp.1 ====
2007-05-25 07:44:36-04:00, stenn at whimsy.udel.edu +2 -2
NTP_4_2_4P2_RC3
--- 1.49.3.2/sntp/sntp.1 2007-05-19 07:53:50 -04:00
+++ 1.49.4.1/sntp/sntp.1 2007-05-25 07:44:36 -04:00
@@ -1,7 +1,7 @@
-.TH SNTP 1 2007-05-19 "( 4.2.4p2-RC2)" "Programmer's Manual"
+.TH SNTP 1 2007-05-25 "( 4.2.4p2-RC3)" "Programmer's Manual"
.\" DO NOT EDIT THIS FILE (sntp.1)
.\"
-.\" It has been AutoGen-ed Saturday May 19, 2007 at 07:52:27 AM EDT
+.\" It has been AutoGen-ed Friday May 25, 2007 at 07:43:38 AM EDT
.\" From the definitions sntp-opts.def
.\" and the template file agman1.tpl
.\"
#### ChangeSet ####
2007-05-25 02:18:59-04:00, stenn at whimsy.udel.edu
cleanup
==== NEWS ====
2007-05-25 02:18:48-04:00, stenn at whimsy.udel.edu +1 -0
cleanup
--- 1.86.1.3/NEWS 2007-05-25 02:06:38 -04:00
+++ 1.86.1.4/NEWS 2007-05-25 02:18:48 -04:00
@@ -2,6 +2,7 @@ NTP 4.2.4p2 (Harlan Stenn <stenn at ntp.org
Focus: bug fix.
+[Bug 527] Don't write from source address length to wrong location (Windows).
(Upgraded autogen and libopts.)
[Bug 811] ntpd should not read a .ntprc file.
---
#### ChangeSet ####
2007-05-25 02:06:52-04:00, stenn at whimsy.udel.edu
Upgraded autogen and libopts
==== ChangeLog ====
2007-05-25 02:06:37-04:00, stenn at whimsy.udel.edu +1 -0
Upgraded autogen and libopts
--- 1.1.1.11/ChangeLog 2007-05-18 02:19:13 -04:00
+++ 1.1.2.1/ChangeLog 2007-05-25 02:06:37 -04:00
@@ -1,4 +1,5 @@
(4.2.4p2) Released by Harlan Stenn <stenn at ntp.org>
+* Upgraded autogen and libopts.
* [Bug 811] ntpd should not read a .ntprc file.
(4.2.4p1) (skipped)
(4.2.4p0) Released by Harlan Stenn <stenn at ntp.org>
==== NEWS ====
2007-05-25 02:06:38-04:00, stenn at whimsy.udel.edu +1 -0
Upgraded autogen and libopts
--- 1.86.1.2/NEWS 2007-05-18 02:19:14 -04:00
+++ 1.86.1.3/NEWS 2007-05-25 02:06:38 -04:00
@@ -2,6 +2,7 @@ NTP 4.2.4p2 (Harlan Stenn <stenn at ntp.org
Focus: bug fix.
+(Upgraded autogen and libopts.)
[Bug 811] ntpd should not read a .ntprc file.
---
NTP 4.2.4 (Harlan Stenn <stenn at ntp.org>, 2006/12/31)
#### ChangeSet ####
2007-05-25 01:07:59-04:00, stenn at pogo.udel.edu
cleanup ChangeLog
==== ChangeLog ====
2007-05-25 01:07:52-04:00, stenn at pogo.udel.edu +1 -1
cleanup ChangeLog
--- 1.1.1.12/ChangeLog 2007-05-24 08:10:20 -04:00
+++ 1.1.1.13/ChangeLog 2007-05-25 01:07:52 -04:00
@@ -1,5 +1,5 @@
-* [Bug 527] Don't write from source address length to wrong location
(4.2.4p2) Released by Harlan Stenn <stenn at ntp.org>
+* [Bug 527] Don't write from source address length to wrong location
* [Bug 811] ntpd should not read a .ntprc file.
(4.2.4p1) (skipped)
(4.2.4p0) Released by Harlan Stenn <stenn at ntp.org>
#### ChangeSet ####
2007-05-24 08:10:30-04:00, mayer at pogo.udel.edu
Bug #527 Don't write from source address length to wrong location
==== ChangeLog ====
2007-05-24 08:10:20-04:00, mayer at pogo.udel.edu +1 -0
Bug #527 Don't write from source address length to wrong location
--- 1.1.1.11/ChangeLog 2007-05-18 02:19:13 -04:00
+++ 1.1.1.12/ChangeLog 2007-05-24 08:10:20 -04:00
@@ -1,3 +1,4 @@
+* [Bug 527] Don't write from source address length to wrong location
(4.2.4p2) Released by Harlan Stenn <stenn at ntp.org>
* [Bug 811] ntpd should not read a .ntprc file.
(4.2.4p1) (skipped)
#### ChangeSet ####
2007-05-24 08:08:34-04:00, mayer at pogo.udel.edu
Bug #527 Don't write from source address length to wrong location
==== include/recvbuff.h ====
2007-05-24 08:08:03-04:00, mayer at pogo.udel.edu +2 -0
Bug #527 Don't write from source address length to wrong location
--- 1.11/include/recvbuff.h 2005-12-12 23:31:40 -05:00
+++ 1.11.1.1/include/recvbuff.h 2007-05-24 08:08:03 -04:00
@@ -66,6 +66,7 @@ struct recvbuf {
#else
struct sockaddr_storage srcadr; /* where packet came from */
#endif
+ int src_addr_len; /* source address length */
struct interface *dstadr; /* interface datagram arrived thru */
SOCKET fd; /* fd on which it was received */
int msg_flags; /* Flags received about the packet */
@@ -76,6 +77,7 @@ struct recvbuf {
struct pkt X_recv_pkt;
u_char X_recv_buffer[RX_BUFF_SIZE];
} recv_space;
+ int used;
#define recv_pkt recv_space.X_recv_pkt
#define recv_buffer recv_space.X_recv_buffer
};
==== libntp/recvbuff.c ====
2007-05-24 08:08:03-04:00, mayer at pogo.udel.edu +27 -13
Bug #527 Don't write from source address length to wrong location
--- 1.24/libntp/recvbuff.c 2006-09-10 15:58:11 -04:00
+++ 1.25/libntp/recvbuff.c 2007-05-24 08:08:03 -04:00
@@ -21,8 +21,8 @@ static u_long volatile total_recvbufs; /
static u_long volatile lowater_adds; /* number of times we have added memory */
-static ISC_LIST(recvbuf_t) full_list; /* Currently used recv buffers */
-static ISC_LIST(recvbuf_t) free_list; /* Currently unused buffers */
+static ISC_LIST(recvbuf_t) full_recv_list; /* Currently used recv buffers */
+static ISC_LIST(recvbuf_t) free_recv_list; /* Currently unused buffers */
#if defined(SYS_WINNT)
@@ -88,7 +88,8 @@ create_buffers(int nbufs)
return (0);
for (i = 0; i < nbufs; i++)
{
- ISC_LIST_APPEND(free_list, bufp, link);
+ memset((char *) bufp, 0, sizeof(recvbuf_t));
+ ISC_LIST_APPEND(free_recv_list, bufp, link);
bufp++;
free_recvbufs++;
total_recvbufs++;
@@ -104,8 +105,8 @@ init_recvbuff(int nbufs)
/*
* Init buffer free list and stat counters
*/
- ISC_LIST_INIT(full_list);
- ISC_LIST_INIT(free_list);
+ ISC_LIST_INIT(full_recv_list);
+ ISC_LIST_INIT(free_recv_list);
free_recvbufs = total_recvbufs = 0;
full_recvbufs = lowater_adds = 0;
@@ -123,8 +124,16 @@ init_recvbuff(int nbufs)
void
freerecvbuf(recvbuf_t *rb)
{
+ if (rb == NULL) {
+ msyslog(LOG_ERR, "freerecvbuff received NULL buffer");
+ return;
+ }
+
LOCK();
- ISC_LIST_APPEND(free_list, rb, link);
+ (rb->used)--;
+ if (rb->used != 0)
+ msyslog(LOG_ERR, "******** freerecvbuff non-zero usage: %d *******", rb->used);
+ ISC_LIST_APPEND(free_recv_list, rb, link);
#if defined SYS_WINNT
rb->wsabuff.len = RX_BUFF_SIZE;
rb->wsabuff.buf = (char *) rb->recv_buffer;
@@ -137,8 +146,12 @@ freerecvbuf(recvbuf_t *rb)
void
add_full_recv_buffer(recvbuf_t *rb)
{
+ if (rb == NULL) {
+ msyslog(LOG_ERR, "add_full_recv_buffer received NULL buffer");
+ return;
+ }
LOCK();
- ISC_LIST_APPEND(full_list, rb, link);
+ ISC_LIST_APPEND(full_recv_list, rb, link);
full_recvbufs++;
UNLOCK();
}
@@ -148,7 +161,7 @@ get_free_recv_buffer(void)
{
recvbuf_t * buffer = NULL;
LOCK();
- buffer = ISC_LIST_HEAD(free_list);
+ buffer = ISC_LIST_HEAD(free_recv_list);
if (buffer == NULL)
{
/*
@@ -160,7 +173,7 @@ get_free_recv_buffer(void)
UNLOCK();
return (NULL);
}
- buffer = ISC_LIST_HEAD(free_list);
+ buffer = ISC_LIST_HEAD(free_recv_list);
if (buffer == NULL)
{
msyslog(LOG_ERR, "Failed to obtain more memory for recvbufs");
@@ -168,9 +181,10 @@ get_free_recv_buffer(void)
return (NULL);
}
}
- ISC_LIST_DEQUEUE(free_list, buffer, link);
+ ISC_LIST_DEQUEUE(free_recv_list, buffer, link);
free_recvbufs--;
initialise_buffer(buffer);
+ (buffer->used)++;
UNLOCK();
return (buffer);
}
@@ -180,10 +194,10 @@ get_full_recv_buffer(void)
{
recvbuf_t *rbuf;
LOCK();
- rbuf = ISC_LIST_HEAD(full_list);
+ rbuf = ISC_LIST_HEAD(full_recv_list);
if (rbuf != NULL)
{
- ISC_LIST_DEQUEUE(full_list, rbuf, link);
+ ISC_LIST_DEQUEUE(full_recv_list, rbuf, link);
--full_recvbufs;
}
else
@@ -202,7 +216,7 @@ get_full_recv_buffer(void)
*/
isc_boolean_t has_full_recv_buffer(void)
{
- if (ISC_LIST_HEAD(full_list) != NULL)
+ if (ISC_LIST_HEAD(full_recv_list) != NULL)
return (ISC_TRUE);
else
return (ISC_FALSE);
==== ports/winnt/libntp/transmitbuff.c ====
2007-05-24 08:08:03-04:00, mayer at pogo.udel.edu +10 -10
Bug #527 Don't write from source address length to wrong location
--- 1.6/ports/winnt/libntp/transmitbuff.c 2005-11-27 18:32:25 -05:00
+++ 1.7/ports/winnt/libntp/transmitbuff.c 2007-05-24 08:08:03 -04:00
@@ -25,8 +25,8 @@
static volatile u_long full_transmitbufs = 0; /* number of transmitbufs on fulllist */
static volatile u_long free_transmitbufs = 0; /* number of transmitbufs on freelist */
-ISC_LIST(transmitbuf_t) free_list; /* Currently used transmit buffers */
-ISC_LIST(transmitbuf_t) full_list; /* Currently used transmit buffers */
+ISC_LIST(transmitbuf_t) free_transmit_list; /* Currently used transmit buffers */
+ISC_LIST(transmitbuf_t) full_transmit_list; /* Currently used transmit buffers */
static u_long total_transmitbufs = 0; /* total transmitbufs currently in use */
static u_long lowater_additions = 0; /* number of times we have added memory */
@@ -47,7 +47,7 @@ initialise_buffer(transmitbuf *buff)
static void
add_buffer_to_freelist(transmitbuf *tb)
{
- ISC_LIST_APPEND(free_list, tb, link);
+ ISC_LIST_APPEND(free_transmit_list, tb, link);
free_transmitbufs++;
}
@@ -75,8 +75,8 @@ init_transmitbuff(void)
/*
* Init buffer free list and stat counters
*/
- ISC_LIST_INIT(full_list);
- ISC_LIST_INIT(free_list);
+ ISC_LIST_INIT(full_transmit_list);
+ ISC_LIST_INIT(free_transmit_list);
free_transmitbufs = total_transmitbufs = 0;
full_transmitbufs = lowater_additions = 0;
create_buffers(TRANSMIT_INIT);
@@ -88,12 +88,12 @@ static void
delete_buffer_from_full_list(transmitbuf_t *tb) {
transmitbuf_t *next = NULL;
- transmitbuf_t *lbuf = ISC_LIST_HEAD(full_list);
+ transmitbuf_t *lbuf = ISC_LIST_HEAD(full_transmit_list);
while (lbuf != NULL) {
next = ISC_LIST_NEXT(lbuf, link);
if (lbuf == tb) {
- ISC_LIST_DEQUEUE(full_list, lbuf, link);
+ ISC_LIST_DEQUEUE(full_transmit_list, lbuf, link);
break;
}
else
@@ -121,12 +121,12 @@ get_free_transmit_buffer(void)
if (free_transmitbufs <= 0) {
create_buffers(TRANSMIT_INC);
}
- buffer = ISC_LIST_HEAD(free_list);
+ buffer = ISC_LIST_HEAD(free_transmit_list);
if (buffer != NULL)
{
- ISC_LIST_DEQUEUE(free_list, buffer, link);
+ ISC_LIST_DEQUEUE(free_transmit_list, buffer, link);
free_transmitbufs--;
- ISC_LIST_APPEND(full_list, buffer, link);
+ ISC_LIST_APPEND(full_transmit_list, buffer, link);
full_transmitbufs++;
}
UNLOCK(&TransmitLock);
==== ports/winnt/ntpd/ntp_iocompletionport.c ====
2007-05-24 08:08:03-04:00, mayer at pogo.udel.edu +76 -62
Bug #527 Don't write from source address length to wrong location
--- 1.21/ports/winnt/ntpd/ntp_iocompletionport.c 2006-09-26 18:14:26 -04:00
+++ 1.21.1.1/ports/winnt/ntpd/ntp_iocompletionport.c 2007-05-24 08:08:03 -04:00
@@ -61,7 +61,7 @@ static HANDLE WaitableIoEventHandle = NU
#define MAXHANDLES 3
HANDLE WaitHandles[MAXHANDLES] = { NULL, NULL, NULL };
-//#define USE_HEAP
+#define USE_HEAP
IoCompletionInfo *
GetHeapAlloc(char *fromfunc)
@@ -76,7 +76,7 @@ GetHeapAlloc(char *fromfunc)
lpo = (IoCompletionInfo *) calloc(1, sizeof(IoCompletionInfo));
#endif
#ifdef DEBUG
- if (debug > 1) {
+ if (debug > 3) {
printf("Allocation %d memory for %s, ptr %x\n", sizeof(IoCompletionInfo), fromfunc, lpo);
}
#endif
@@ -87,7 +87,7 @@ void
FreeHeap(IoCompletionInfo *lpo, char *fromfunc)
{
#ifdef DEBUG
- if (debug > 1)
+ if (debug > 3)
{
printf("Freeing memory for %s, ptr %x\n", fromfunc, lpo);
}
@@ -238,7 +238,8 @@ init_io_completion_port(
*/
WaitableIoEventHandle = CreateEvent(NULL, FALSE, FALSE, "WaitableIoEventHandle");
if (WaitableIoEventHandle == NULL) {
- msyslog(LOG_ERR, "Can't create I/O event handle: %m");
+ msyslog(LOG_ERR,
+ "Can't create I/O event handle: %m - another process may be running - EXITING");
exit(1);
}
@@ -253,9 +254,9 @@ init_io_completion_port(
/*
* Initialize the Wait Handles
*/
- WaitHandles[0] = CreateEvent(NULL, FALSE, FALSE, "WaitHandles0"); /* exit request */
- WaitHandles[1] = get_timer_handle();
- WaitHandles[2] = get_io_event();
+ WaitHandles[0] = get_io_event();
+ WaitHandles[1] = CreateEvent(NULL, FALSE, FALSE, "WaitHandles0"); /* exit request */
+ WaitHandles[2] = get_timer_handle();
/* Have one thread servicing I/O - there were 4, but this would
* somehow cause NTP to stop replying to ntpq requests; TODO
@@ -343,19 +344,19 @@ OnIoReadComplete(DWORD i, IoCompletionIn
buff->dstadr = NULL;
buff->recv_srcclock = rio->srcclock;
add_full_recv_buffer(buff);
+ if( !SetEvent( WaitableIoEventHandle ) ) {
+#ifdef DEBUG
+ if (debug > 3) {
+ printf( "Error %d setting IoEventHandle\n", GetLastError() );
+ }
+#endif
+ }
}
else
{
freerecvbuf(buff);
}
}
- if( !SetEvent( WaitableIoEventHandle ) ) {
-#ifdef DEBUG
- if (debug > 3) {
- printf( "Error %d setting IoEventHandle\n", GetLastError() );
- }
-#endif
- }
QueueIORead( rio, newbuff, lpo );
return 1;
@@ -410,10 +411,11 @@ static unsigned long QueueSocketRecv(SOC
DWORD Flags = 0;
buff->fd = s;
AddrLen = sizeof(struct sockaddr_in);
+ buff->src_addr_len = sizeof(struct sockaddr);
if (SOCKET_ERROR == WSARecvFrom(buff->fd, &buff->wsabuff, 1,
&BytesReceived, &Flags,
- (struct sockaddr *) &buff->recv_srcadr, (LPINT) &AddrLen,
+ (struct sockaddr *) &buff->recv_srcadr, (LPINT) &buff->src_addr_len,
(LPOVERLAPPED) lpo, NULL)) {
DWORD Result = WSAGetLastError();
switch (Result) {
@@ -459,7 +461,20 @@ OnSocketRecv(DWORD i, IoCompletionInfo *
/* Convert the overlapped pointer back to a recvbuf pointer.
*/
+ /*
+ * Check returned structures
+ */
+ if (lpo == NULL)
+ return (1); /* Nothing to do */
+
buff = lpo->recv_buf;
+ /*
+ * Make sure we have a buffer
+ */
+ if (buff == NULL) {
+// FreeHeap(lpo, "OnSocketRecv: Socket Closed");
+ return (1);
+ }
/*
* If the socket is closed we get an Operation Aborted error
@@ -472,7 +487,6 @@ OnSocketRecv(DWORD i, IoCompletionInfo *
return (1);
}
- get_systime(&buff->recv_time);
/*
* Get a new recv buffer for the next packet
@@ -487,36 +501,36 @@ OnSocketRecv(DWORD i, IoCompletionInfo *
}
else
{
- if (Bytes > 0 && inter->ignore_packets == ISC_FALSE) {
+ /*
+ * If we keep it add some info to the structure
+ */
+ if (Bytes > 0 && inter->ignore_packets == ISC_FALSE) {
+ get_systime(&buff->recv_time);
buff->recv_length = (int) Bytes;
buff->receiver = receive;
buff->dstadr = inter;
#ifdef DEBUG
if (debug > 3)
- printf("Received %d bytes from %s\n", Bytes, stoa(&buff->recv_srcadr));
+ printf("Received %d bytes in buffer %x from %s\n", Bytes, buff, stoa(&buff->recv_srcadr));
#endif
add_full_recv_buffer(buff);
+ /*
+ * Now signal we have something to process
+ */
+ if( !SetEvent( WaitableIoEventHandle ) ) {
+#ifdef DEBUG
+ if (debug > 1) {
+ printf( "Error %d setting IoEventHandle\n", GetLastError() );
+ }
+#endif
+ }
}
else {
freerecvbuf(buff);
}
}
- QueueSocketRecv(inter->fd, newbuff, lpo);
- /*
- * Now signal we have something to process
- */
-#if 0
- if (newbuff != buff) {
- if( !SetEvent( WaitableIoEventHandle ) ) {
-#ifdef DEBUG
- if (debug > 3) {
- printf( "Error %d setting IoEventHandle\n", GetLastError() );
- }
-#endif
- }
- }
-#endif
-
+ if (newbuff != NULL)
+ QueueSocketRecv(inter->fd, newbuff, lpo);
return 1;
}
@@ -732,38 +746,38 @@ io_completion_port_write(
*/
int GetReceivedBuffers()
{
-// DWORD Index = WaitForMultipleObjects(MAXHANDLES, WaitHandles, FALSE, INFINITE);
- DWORD Index = WaitForMultipleObjects(MAXHANDLES, WaitHandles, FALSE, 500);
- switch (Index) {
- case WAIT_OBJECT_0 + 0 : /* exit request */
- exit(0);
- break;
-
- case WAIT_OBJECT_0 + 1 : /* timer */
- timer();
- break;
-
- case WAIT_OBJECT_0 + 2 : /* Io event */
+ isc_boolean_t have_packet = ISC_FALSE;
+ while (!have_packet) {
+ DWORD Index = WaitForMultipleObjects(MAXHANDLES, WaitHandles, FALSE, INFINITE);
+ switch (Index) {
+ case WAIT_OBJECT_0 + 0 : /* Io event */
# ifdef DEBUG
- if ( debug > 3 )
- {
- printf( "IoEvent occurred\n" );
- }
+ if ( debug > 3 )
+ {
+ printf( "IoEvent occurred\n" );
+ }
# endif
- break;
+ have_packet = ISC_TRUE;
+ break;
+ case WAIT_OBJECT_0 + 1 : /* exit request */
+ exit(0);
+ break;
+ case WAIT_OBJECT_0 + 2 : /* timer */
+ timer();
+ break;
+ case WAIT_IO_COMPLETION : /* loop */
+ case WAIT_TIMEOUT :
+ break;
+ case WAIT_FAILED:
+ msyslog(LOG_ERR, "ntpd: WaitForMultipleObjects Failed: Error: %m");
+ break;
- case WAIT_IO_COMPLETION : /* loop */
- case WAIT_TIMEOUT :
- break;
- case WAIT_FAILED:
- msyslog(LOG_ERR, "ntpd: WaitForMultipleObjectsEx Failed: Error: %m");
- break;
-
- /* For now do nothing if not expected */
- default:
- break;
+ /* For now do nothing if not expected */
+ default:
+ break;
- } /* switch */
+ } /* switch */
+ }
return (full_recvbuffs()); /* get received buffers */
}
More information about the bk-ntp-dev-send
mailing list