[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Tue Aug 28 03:23:34 UTC 2007


#### ChangeSet ####
2007-08-27 22:38:57-04:00, stenn at whimsy.udel.edu 
  Updated include/copyright.def (owner and year)

==== ChangeLog ====
2007-08-27 22:38:46-04:00, stenn at whimsy.udel.edu +1 -0
  Updated include/copyright.def (owner and year)

--- 1.1.1.31/ChangeLog	2007-08-19 05:20:42 -04:00
+++ 1.1.1.32/ChangeLog	2007-08-27 22:38:46 -04:00
@@ -1,3 +1,4 @@
+* Updated include/copyright.def (owner and year).
 * [Bug 878] Avoid ntpdc use of refid value as unterminated string.
 * [Bug 881] Corrected display of pll offset on 64bit systems.
 * [Bug 886] Corrected sign handling on 64bit in ntpdc loopinfo command.

==== include/copyright.def ====
2007-08-27 22:38:47-04:00, stenn at whimsy.udel.edu +2 -2
  Updated include/copyright.def (owner and year)

--- 1.4/include/copyright.def	2007-04-14 02:35:14 -04:00
+++ 1.5/include/copyright.def	2007-08-27 22:38:47 -04:00
@@ -1,8 +1,8 @@
 /* -*- Mode: Text -*- */
 
 copyright = {
-    date  = "1970-2006";
-    owner = "ntp.org";
+    date  = "1970-2007";
+    owner = "David L. Mills and/or others";
     eaddr = "http://bugs.ntp.isc.org, bugs at ntp.org";
     type  = note;
     text  = "see html/copyright.html";

#### ChangeSet ####
2007-08-19 05:26:13-04:00, dunlop at pogo.udel.edu 
  ntpdc_ops.c, ChangeLog:
    [BUG 881] Corrected display of pll offset on 64bit systems.
    [BUG 886] Corrected sign extension of il->compliance on 64 bit systems
    [BUG 878] Avoid ntpdc use of refid value as unterminated string.

==== ChangeLog ====
2007-08-19 05:20:42-04:00, dunlop at pogo.udel.edu +1 -0
  [Bug 878] Avoid ntpdc use of refid value as unterminated string.

--- 1.1.1.30/ChangeLog	2007-08-19 05:13:18 -04:00
+++ 1.1.1.31/ChangeLog	2007-08-19 05:20:42 -04:00
@@ -1,3 +1,4 @@
+* [Bug 878] Avoid ntpdc use of refid value as unterminated string.
 * [Bug 881] Corrected display of pll offset on 64bit systems.
 * [Bug 886] Corrected sign handling on 64bit in ntpdc loopinfo command.
 * [Bug 889] avoid malloc() interrupted by SIGIO risk

==== ChangeLog ====
2007-08-19 05:13:18-04:00, dunlop at pogo.udel.edu +1 -0
  [Bug 881] Corrected display of pll offset on 64bit systems.

--- 1.1.1.29/ChangeLog	2007-08-19 05:01:14 -04:00
+++ 1.1.1.30/ChangeLog	2007-08-19 05:13:18 -04:00
@@ -1,3 +1,4 @@
+* [Bug 881] Corrected display of pll offset on 64bit systems.
 * [Bug 886] Corrected sign handling on 64bit in ntpdc loopinfo command.
 * [Bug 889] avoid malloc() interrupted by SIGIO risk
 * ntpd/refclock_parse.c: cleanup shutdown while the file descriptor is still open.

==== ChangeLog ====
2007-08-19 05:01:14-04:00, dunlop at pogo.udel.edu +1 -0
  [BUG 886] Corrected sign extension of il->compliance on 64 bit systems

--- 1.1.1.28/ChangeLog	2007-08-18 08:59:05 -04:00
+++ 1.1.1.29/ChangeLog	2007-08-19 05:01:14 -04:00
@@ -1,3 +1,4 @@
+* [Bug 886] Corrected sign handling on 64bit in ntpdc loopinfo command.
 * [Bug 889] avoid malloc() interrupted by SIGIO risk
 * ntpd/refclock_parse.c: cleanup shutdown while the file descriptor is still open.
 * [Bug 885] use emalloc() to get a message at the end of the memory

==== ntpdc/ntpdc_ops.c ====
2007-08-19 05:20:34-04:00, dunlop at pogo.udel.edu +1 -3
  [Bug 878] Avoid ntpdc use of refid value as unterminated string.

--- 1.46.1.2/ntpdc/ntpdc_ops.c	2007-08-19 05:12:52 -04:00
+++ 1.46.1.3/ntpdc/ntpdc_ops.c	2007-08-19 05:20:34 -04:00
@@ -2700,7 +2700,6 @@ clockstat(
 	int res;
 	l_fp ts;
 	struct clktype *clk;
-	u_long ltemp;
 
 	for (qitems = 0; qitems < min(pcmd->nargs, 8); qitems++)
 	    clist[qitems] = GET_INADDR(pcmd->argval[qitems].netnum);
@@ -2758,9 +2757,8 @@ again:
 			       lfptoa(&ts, 6));
 		(void) fprintf(fp, "stratum:              %ld\n",
 			       (u_long)ntohl(cl->fudgeval1));
-		ltemp = ntohl(cl->fudgeval2);
 		(void) fprintf(fp, "reference ID:         %s\n",
-			       (char *)&ltemp);
+			       refid_string(ntohl(cl->fudgeval2), 0));
 		(void) fprintf(fp, "fudge flags:          0x%x\n",
 			       cl->flags);
 

==== ntpdc/ntpdc_ops.c ====
2007-08-19 05:12:52-04:00, dunlop at pogo.udel.edu +1 -1
  [Bug 881] Corrected display of pll offset on 64bit systems.

--- 1.46.1.1/ntpdc/ntpdc_ops.c	2007-08-19 04:59:48 -04:00
+++ 1.46.1.2/ntpdc/ntpdc_ops.c	2007-08-19 05:12:52 -04:00
@@ -2992,7 +2992,7 @@ again:
 		tscale = 1e-9;
 #endif
 	(void)fprintf(fp, "pll offset:           %g s\n",
-	    (long)ntohl(ik->offset) * tscale);
+	    (int32_t)ntohl(ik->offset) * tscale);
 	(void)fprintf(fp, "pll frequency:        %s ppm\n",
 	    fptoa((s_fp)ntohl(ik->freq), 3));
 	(void)fprintf(fp, "maximum error:        %g s\n",

==== ntpdc/ntpdc_ops.c ====
2007-08-19 04:59:48-04:00, dunlop at pogo.udel.edu +2 -2
  [BUG 886] Corrected sign extension of il->compliance on 64 bit systems

--- 1.46/ntpdc/ntpdc_ops.c	2006-03-14 03:12:13 -05:00
+++ 1.46.1.1/ntpdc/ntpdc_ops.c	2007-08-19 04:59:48 -04:00
@@ -886,7 +886,7 @@ again:
 			       "offset %s, frequency %s, time_const %ld, watchdog %ld\n",
 			       lfptoa(&tempts, 6),
 			       lfptoa(&temp2ts, 3),
-			       (u_long)ntohl((u_long)il->compliance),
+			       (long)(int32_t)ntohl((u_long)il->compliance),
 			       (u_long)ntohl((u_long)il->watchdog_timer));
 	} else {
 		NTOHL_FP(&il->last_offset, &tempts);
@@ -896,7 +896,7 @@ again:
 		(void) fprintf(fp, "frequency:            %s ppm\n",
 			       lfptoa(&tempts, 3));
 		(void) fprintf(fp, "poll adjust:          %ld\n",
-			       (u_long)ntohl(il->compliance));
+			       (long)(int32_t)ntohl(il->compliance));
 		(void) fprintf(fp, "watchdog timer:       %ld s\n",
 			       (u_long)ntohl(il->watchdog_timer));
 	}

#### ChangeSet ####
2007-08-18 17:11:19-04:00, stenn at whimsy.udel.edu 
  NTP_4_2_4P4_RC1
  TAG: NTP_4_2_4P4_RC1

==== util/ntp-keygen-opts.c ====
2007-08-18 17:11:08-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.49.10.1/util/ntp-keygen-opts.c	2007-06-29 15:45:59 -04:00
+++ 1.49.11.1/util/ntp-keygen-opts.c	2007-08-18 17:11:08 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:51 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:10:16 PM 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.4p3\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p4-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== util/ntp-keygen-opts.h ====
2007-08-18 17:11:10-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_4P4_RC1

--- 1.49.10.1/util/ntp-keygen-opts.h	2007-06-29 15:45:59 -04:00
+++ 1.49.11.1/util/ntp-keygen-opts.h	2007-08-18 17:11:10 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:51 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:10:15 PM 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.4p3"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p3"
+#define NTP_KEYGEN_VERSION       "4.2.4p4-RC1"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p4-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== util/ntp-keygen-opts.texi ====
2007-08-18 17:11:11-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.47.10.1/util/ntp-keygen-opts.texi	2007-06-29 15:45:59 -04:00
+++ 1.47.11.1/util/ntp-keygen-opts.texi	2007-08-18 17:11:11 -04:00
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  Friday June 29, 2007 at 03:45:52 PM EDT
+# It has been AutoGen-ed  Saturday August 18, 2007 at 05:10:18 PM EDT
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -53,7 +53,7 @@ This is the automatically generated usag
 @exampleindent 0
 @example
 Using OpenSSL version 90704f
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p55
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p67
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme

==== util/ntp-keygen.1 ====
2007-08-18 17:11:11-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.47.10.1/util/ntp-keygen.1	2007-06-29 15:45:59 -04:00
+++ 1.47.11.1/util/ntp-keygen.1	2007-08-18 17:11:11 -04:00
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2007-06-29 "(ntp 4.2.4p3)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2007-08-18 "(ntp 4.2.4p4-RC1)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:51 PM EDT
+.\"  It has been AutoGen-ed  Saturday August 18, 2007 at 05:10:18 PM EDT
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpd/ntpd-opts.c ====
2007-08-18 17:10:51-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.50.10.1/ntpd/ntpd-opts.c	2007-06-29 15:45:58 -04:00
+++ 1.50.11.1/ntpd/ntpd-opts.c	2007-08-18 17:10:51 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:44:18 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:02:40 PM 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.4p3\n\
+"ntpd - NTP daemon program - Ver. 4.2.4p4-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL

==== ntpd/ntpd-opts.h ====
2007-08-18 17:10:52-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_4P4_RC1

--- 1.50.10.1/ntpd/ntpd-opts.h	2007-06-29 15:45:58 -04:00
+++ 1.50.11.1/ntpd/ntpd-opts.h	2007-08-18 17:10:52 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:44:18 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:02:39 PM 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.4p3"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p3"
+#define NTPD_VERSION       "4.2.4p4-RC1"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p4-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpd/ntpd-opts.texi ====
2007-08-18 17:10:53-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.49.10.1/ntpd/ntpd-opts.texi	2007-06-29 15:45:58 -04:00
+++ 1.49.11.1/ntpd/ntpd-opts.texi	2007-08-18 17:10:53 -04:00
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  Friday June 29, 2007 at 03:44:18 PM EDT
+# It has been AutoGen-ed  Saturday August 18, 2007 at 05:02:43 PM EDT
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -61,7 +61,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.5p55
+ntpd - NTP daemon program - Ver. 4.2.5p67
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

==== ntpd/ntpd.1 ====
2007-08-18 17:10:53-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.48.10.1/ntpd/ntpd.1	2007-06-29 15:45:58 -04:00
+++ 1.48.11.1/ntpd/ntpd.1	2007-08-18 17:10:53 -04:00
@@ -1,7 +1,7 @@
-.TH NTPD 1 2007-06-29 "( 4.2.4p3)" "Programmer's Manual"
+.TH NTPD 1 2007-08-18 "( 4.2.4p4-RC1)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  Friday June 29, 2007 at 03:44:18 PM EDT
+.\"  It has been AutoGen-ed  Saturday August 18, 2007 at 05:02:41 PM EDT
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpdc/ntpdc-opts.c ====
2007-08-18 17:10:57-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.50.10.1/ntpdc/ntpdc-opts.c	2007-06-29 15:45:58 -04:00
+++ 1.50.11.1/ntpdc/ntpdc-opts.c	2007-08-18 17:10:57 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:35 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:09:05 PM 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.4p3\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p4-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== ntpdc/ntpdc-opts.h ====
2007-08-18 17:10:57-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_4P4_RC1

--- 1.50.10.1/ntpdc/ntpdc-opts.h	2007-06-29 15:45:58 -04:00
+++ 1.50.11.1/ntpdc/ntpdc-opts.h	2007-08-18 17:10:57 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:35 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:09:05 PM 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.4p3"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p3"
+#define NTPDC_VERSION       "4.2.4p4-RC1"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p4-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpdc/ntpdc-opts.texi ====
2007-08-18 17:10:58-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.48.10.1/ntpdc/ntpdc-opts.texi	2007-06-29 15:45:58 -04:00
+++ 1.48.11.1/ntpdc/ntpdc-opts.texi	2007-08-18 17:10:58 -04:00
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  Friday June 29, 2007 at 03:45:36 PM EDT
+# It has been AutoGen-ed  Saturday August 18, 2007 at 05:09:07 PM EDT
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -59,7 +59,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTP query program - Ver. 4.2.5p55
+ntpdc - vendor-specific NTP query program - Ver. 4.2.5p67
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

==== ntpdc/ntpdc.1 ====
2007-08-18 17:10:59-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.48.10.1/ntpdc/ntpdc.1	2007-06-29 15:45:59 -04:00
+++ 1.48.11.1/ntpdc/ntpdc.1	2007-08-18 17:10:59 -04:00
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2007-06-29 "( 4.2.4p3)" "Programmer's Manual"
+.TH NTPDC 1 2007-08-18 "( 4.2.4p4-RC1)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:36 PM EDT
+.\"  It has been AutoGen-ed  Saturday August 18, 2007 at 05:09:07 PM EDT
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpd/ntpdsim-opts.c ====
2007-08-18 17:10:54-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.50.10.1/ntpd/ntpdsim-opts.c	2007-06-29 15:45:58 -04:00
+++ 1.50.11.1/ntpd/ntpdsim-opts.c	2007-08-18 17:10:54 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdsim-opts.c)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:44:19 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:02:45 PM 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.4p3\n\
+"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p4-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== ntpd/ntpdsim-opts.h ====
2007-08-18 17:10:54-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_4P4_RC1

--- 1.50.10.1/ntpd/ntpdsim-opts.h	2007-06-29 15:45:58 -04:00
+++ 1.50.11.1/ntpd/ntpdsim-opts.h	2007-08-18 17:10:54 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdsim-opts.h)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:44:19 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:02:44 PM 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.4p3"
-#define NTPDSIM_FULL_VERSION  "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p3"
+#define NTPDSIM_VERSION       "4.2.4p4-RC1"
+#define NTPDSIM_FULL_VERSION  "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p4-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpd/ntpdsim-opts.texi ====
2007-08-18 17:10:56-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_4P4_RC1

--- 1.48.10.1/ntpd/ntpdsim-opts.texi	2007-06-29 15:45:58 -04:00
+++ 1.48.11.1/ntpd/ntpdsim-opts.texi	2007-08-18 17:10:56 -04:00
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpdsim-opts.texi)
 # 
-# It has been AutoGen-ed  Friday June 29, 2007 at 03:44:20 PM EDT
+# It has been AutoGen-ed  Saturday August 18, 2007 at 05:02:48 PM EDT
 # From the definitions    ntpdsim-opts.def
 # and the template file   aginfo.tpl
 @end ignore

==== ntpd/ntpdsim.1 ====
2007-08-18 17:10:56-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.48.10.1/ntpd/ntpdsim.1	2007-06-29 15:45:58 -04:00
+++ 1.48.11.1/ntpd/ntpdsim.1	2007-08-18 17:10:56 -04:00
@@ -1,7 +1,7 @@
-.TH NTPDSIM 1 2007-06-29 "( 4.2.4p3)" "Programmer's Manual"
+.TH NTPDSIM 1 2007-08-18 "( 4.2.4p4-RC1)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpdsim.1)
 .\"  
-.\"  It has been AutoGen-ed  Friday June 29, 2007 at 03:44:19 PM EDT
+.\"  It has been AutoGen-ed  Saturday August 18, 2007 at 05:02:46 PM EDT
 .\"  From the definitions    ntpdsim-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpq/ntpq-opts.c ====
2007-08-18 17:10:59-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.52.10.1/ntpq/ntpq-opts.c	2007-06-29 15:45:59 -04:00
+++ 1.52.11.1/ntpq/ntpq-opts.c	2007-08-18 17:10:59 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:43 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:09:35 PM 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.4p3\n\
+"ntpq - standard NTP query program - Ver. 4.2.4p4-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== ntpq/ntpq-opts.h ====
2007-08-18 17:11:01-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_4P4_RC1

--- 1.52.10.1/ntpq/ntpq-opts.h	2007-06-29 15:45:59 -04:00
+++ 1.52.11.1/ntpq/ntpq-opts.h	2007-08-18 17:11:01 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:42 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:09:35 PM 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.4p3"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.4p3"
+#define NTPQ_VERSION       "4.2.4p4-RC1"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.4p4-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpq/ntpq-opts.texi ====
2007-08-18 17:11:02-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.49.10.1/ntpq/ntpq-opts.texi	2007-06-29 15:45:59 -04:00
+++ 1.49.11.1/ntpq/ntpq-opts.texi	2007-08-18 17:11:02 -04:00
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  Friday June 29, 2007 at 03:45:43 PM EDT
+# It has been AutoGen-ed  Saturday August 18, 2007 at 05:09:38 PM EDT
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,7 +47,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.5p55
+ntpq - standard NTP query program - Ver. 4.2.5p67
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

==== ntpq/ntpq.1 ====
2007-08-18 17:11:03-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.48.10.1/ntpq/ntpq.1	2007-06-29 15:45:59 -04:00
+++ 1.48.11.1/ntpq/ntpq.1	2007-08-18 17:11:03 -04:00
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2007-06-29 "( 4.2.4p3)" "Programmer's Manual"
+.TH NTPQ 1 2007-08-18 "( 4.2.4p4-RC1)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:43 PM EDT
+.\"  It has been AutoGen-ed  Saturday August 18, 2007 at 05:09:37 PM EDT
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== packageinfo.sh ====
2007-08-18 17:11:03-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.65.17.1/packageinfo.sh	2007-08-18 16:16:06 -04:00
+++ 1.65.17.2/packageinfo.sh	2007-08-18 17:11:03 -04:00
@@ -9,7 +9,7 @@ version=${proto}.${major}.${minor}
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=3
+point=4
 # Special.  Normally unused.  A suffix.
 #special=ag
 special=
@@ -27,5 +27,5 @@ CLTAG=NTP_4_2_0
 # - - rcpoint gets set to 0
 # - - releasecandidate gets set to no
 # - GRONK is for -dev
-rcpoint=
+rcpoint=1
 #rcpoint=GRONK

==== sntp/sntp-opts.c ====
2007-08-18 17:11:04-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.49.10.1/sntp/sntp-opts.c	2007-06-29 15:45:59 -04:00
+++ 1.49.11.1/sntp/sntp-opts.c	2007-08-18 17:11:04 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:49 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:10:05 PM 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.4p3\n\
+"sntp - standard SNTP program - Ver. 4.2.4p4-RC1\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== sntp/sntp-opts.h ====
2007-08-18 17:11:05-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_4P4_RC1

--- 1.49.10.1/sntp/sntp-opts.h	2007-06-29 15:45:59 -04:00
+++ 1.49.11.1/sntp/sntp-opts.h	2007-08-18 17:11:05 -04:00
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:49 PM EDT
+ *  It has been AutoGen-ed  Saturday August 18, 2007 at 05:10:04 PM 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.4p3"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.4p3"
+#define SNTP_VERSION       "4.2.4p4-RC1"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.4p4-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== sntp/sntp-opts.texi ====
2007-08-18 17:11:07-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_4P4_RC1

--- 1.46.10.1/sntp/sntp-opts.texi	2007-06-29 15:45:59 -04:00
+++ 1.46.11.1/sntp/sntp-opts.texi	2007-08-18 17:11:07 -04:00
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  Friday June 29, 2007 at 03:45:49 PM EDT
+# It has been AutoGen-ed  Saturday August 18, 2007 at 05:10:07 PM EDT
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore

==== sntp/sntp.1 ====
2007-08-18 17:11:08-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_4P4_RC1

--- 1.49.10.1/sntp/sntp.1	2007-06-29 15:45:59 -04:00
+++ 1.49.11.1/sntp/sntp.1	2007-08-18 17:11:08 -04:00
@@ -1,7 +1,7 @@
-.TH SNTP 1 2007-06-29 "( 4.2.4p3)" "Programmer's Manual"
+.TH SNTP 1 2007-08-18 "( 4.2.4p4-RC1)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  Friday June 29, 2007 at 03:45:49 PM EDT
+.\"  It has been AutoGen-ed  Saturday August 18, 2007 at 05:10:06 PM EDT
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"

#### ChangeSet ####
2007-08-18 16:16:22-04:00, stenn at whimsy.udel.edu 
  4.2.4p4-RC

==== packageinfo.sh ====
2007-08-18 16:16:06-04:00, stenn at whimsy.udel.edu +1 -1
  4.2.4p4-RC

--- 1.65.16.2/packageinfo.sh	2007-06-29 15:45:59 -04:00
+++ 1.65.17.1/packageinfo.sh	2007-08-18 16:16:06 -04:00
@@ -16,7 +16,7 @@ special=
 # [???] To start an RC cycle: RC->yes
 # To release from an RC cycle: rcpoint-> GO
 # ReleaseCandidate. 'yes' or 'no'.
-releasecandidate=no
+releasecandidate=yes
 #releasecandidate=no
 # ChangeLog tag
 CLTAG=NTP_4_2_0

#### ChangeSet ####
2007-08-18 12:59:45+00:00, kardel at pogo.udel.edu 
  ntp_restrict.c:
    Bug 885: clarify to allow tools to pick up
    invariants easier.
    Use NULL instead of 0 with pointers.
  ChangeLog:
    document ntp_restrict.c change

==== ChangeLog ====
2007-08-18 12:59:05+00:00, kardel at pogo.udel.edu +1 -0
  document ntp_restrict.c change

--- 1.1.1.27/ChangeLog	2007-08-18 08:52:19 -04:00
+++ 1.1.1.28/ChangeLog	2007-08-18 08:59:05 -04:00
@@ -4,6 +4,7 @@
             unsigned types cannot be less than 0
             default_ai_family is a short
             lose trailing , from enum list
+	    clarify ntp_restrict.c for easier automated analysis
 * [Bug 884] don't access recv buffers after having them passed to the free list.
 * [Bug 882] allow loopback interfaces to share addresses with other interfaces.
 

==== ntpd/ntp_restrict.c ====
2007-08-18 12:56:40+00:00, kardel at pogo.udel.edu +21 -21
  Bug 885: clarify to allow tools to pick up
  invariants easier.
  Use NULL instead of 0 with pointers.

--- 1.22/ntpd/ntp_restrict.c	2006-09-08 19:23:11 -04:00
+++ 1.22.1.1/ntpd/ntp_restrict.c	2007-08-18 08:56:40 -04:00
@@ -112,9 +112,9 @@ init_restrict(void)
 	/*
 	 * Zero the list and put all but one on the free list
 	 */
-	resfree = 0;
+	resfree = NULL;
 	memset((char *)resinit, 0, sizeof resinit);
-	resfree6 = 0;
+	resfree6 = NULL;
 	memset((char *)resinit6, 0, sizeof resinit6);
 	for (i = 1; i < INITRESLIST; i++) {
 		resinit[i].next = resfree;
@@ -194,7 +194,7 @@ restrictions(
 		 * Work our way down from there.
 		 */
 		match = restrictlist;
-		for (rl = match->next; rl != 0 && rl->addr <= hostaddr;
+		for (rl = match->next; rl != NULL && rl->addr <= hostaddr;
 		    rl = rl->next)
 			if ((hostaddr & rl->mask) == rl->addr) {
 				if ((rl->mflags & RESM_NTPONLY) &&
@@ -234,7 +234,7 @@ restrictions(
 		 *  Work our way down from there.
 		 */
 		match6 = restrictlist6;
-		for (rl6 = match6->next; rl6 != 0 &&
+		for (rl6 = match6->next; rl6 != NULL &&
 		    (memcmp(&(rl6->addr6), &hostaddr6,
 		    sizeof(hostaddr6)) <= 0); rl6 = rl6->next) {
 			SET_IPV6_ADDR_MASK(&hostservaddr6, &hostaddr6,
@@ -324,14 +324,14 @@ hack_restrict(
 		 * list. Else go searching for it.
 		 */
 		if (addr == 0) {
-			rlprev = 0;
+			rlprev = NULL;
 			rl = restrictlist;
 		} else {
 			rlprev = restrictlist;
 			rl = rlprev->next;
-			while (rl != 0) {
+			while (rl != NULL) {
 				if (rl->addr > addr) {
-					rl = 0;
+					rl = NULL;
 					break;
 				} else if (rl->addr == addr) {
 					if (rl->mask == mask) {
@@ -343,11 +343,11 @@ hack_restrict(
 
 						if (!(mflags &
 						    RESM_NTPONLY)) {
-							rl = 0;
+							rl = NULL;
 							break;
 						}
 					} else if (rl->mask > mask) {
-						rl = 0;
+						rl = NULL;
 						break;
 					}
 				}
@@ -367,11 +367,11 @@ hack_restrict(
 		} else {
 			rlprev6 = restrictlist6;
 			rl6 = rlprev6->next;
-			while (rl6 != 0) {
+			while (rl6 != NULL) {
 				addr_cmp = memcmp(&rl6->addr6, &addr6,
 				    sizeof(addr6));
 				if (addr_cmp > 0) {
-					rl6 = 0;
+					rl6 = NULL;
 					break;
 				} else if (addr_cmp == 0) {
 					mask_cmp = memcmp(&rl6->mask6,
@@ -385,11 +385,11 @@ hack_restrict(
 
 						if (!(mflags &
 						    RESM_NTPONLY)) {
-							rl6 = 0;
+							rl6 = NULL;
 							break;
 						}
 					} else if (mask_cmp > 0) {
-						rl6 = 0;
+						rl6 = NULL;
 						break;
 					}
 				}
@@ -416,8 +416,8 @@ hack_restrict(
 			 * Here we add bits to the flags. If this is a
 			 * new restriction add it.
 			 */
-			if (rl == 0) {
-				if (numresfree == 0) {
+			if (rl == NULL) {
+				if (resfree == NULL) {
 					rl = (struct restrictlist *)
 					    emalloc(INCRESLIST *
 					    sizeof(struct
@@ -463,7 +463,7 @@ hack_restrict(
 			 * Remove some bits from the flags. If we didn't
 			 * find this one, just return.
 			 */
-			if (rl != 0) {
+			if (rl != NULL) {
 				if ((rl->flags ^ (u_short)flags) &
 				    RES_LIMITED) {
 					res_limited_refcnt--;
@@ -481,7 +481,7 @@ hack_restrict(
 			 * found one. Don't remove the default entry and
 			 * don't remove an interface entry.
 			 */
-			if (rl != 0
+			if (rl != NULL
 			    && rl->addr != htonl(INADDR_ANY)
 			    && !(rl->mflags & RESM_INTERFACE && op != RESTRICT_REMOVEIF)) {
 				if (rlprev != NULL) {
@@ -514,8 +514,8 @@ hack_restrict(
 			 * Here we add bits to the flags. If this is a
 			 * new restriction add it.
 			 */
-			if (rl6 == 0) {
-				if (numresfree6 == 0) {
+			if (rl6 == NULL) {
+				if (resfree6 == NULL) {
 					rl6 = (struct
 					    restrictlist6 *)emalloc(
 					    INCRESLIST * sizeof(struct
@@ -560,7 +560,7 @@ hack_restrict(
 			 * Remove some bits from the flags. If we didn't
 			 * find this one, just return.
 			 */
-			if (rl6 != 0) {
+			if (rl6 != NULL) {
 				if ((rl6->flags ^ (u_short)flags) &
 				    RES_LIMITED) {
 					res_limited_refcnt6--;
@@ -578,7 +578,7 @@ hack_restrict(
 			 * found one. Don't remove the default entry and
 			 * don't remove an interface entry.
 			 */
-			if (rl6 != 0 &&
+			if (rl6 != NULL &&
 			    !IN6_IS_ADDR_UNSPECIFIED(&rl6->addr6)
 			    && !(rl6->mflags & RESM_INTERFACE && op != RESTRICT_REMOVEIF)) {
 				if (rlprev6 != NULL) {

#### ChangeSet ####
2007-08-18 12:53:35+00:00, kardel at pogo.udel.edu 
  recvbuff.c:
    Bug 889: avoid malloc() interrupted by SIGIO risk
  ChangeLog:
    document Bug 889

==== ChangeLog ====
2007-08-18 12:52:19+00:00, kardel at pogo.udel.edu +1 -0
  document Bug 889

--- 1.1.1.26/ChangeLog	2007-08-11 13:31:30 -04:00
+++ 1.1.1.27/ChangeLog	2007-08-18 08:52:19 -04:00
@@ -1,3 +1,4 @@
+* [Bug 889] avoid malloc() interrupted by SIGIO risk
 * ntpd/refclock_parse.c: cleanup shutdown while the file descriptor is still open.
 * [Bug 885] use emalloc() to get a message at the end of the memory
             unsigned types cannot be less than 0

==== libntp/recvbuff.c ====
2007-08-18 12:49:27+00:00, kardel at pogo.udel.edu +28 -21
  Bug 889: avoid malloc() interrupted by SIGIO risk

--- 1.25/libntp/recvbuff.c	2007-05-24 08:08:03 -04:00
+++ 1.26/libntp/recvbuff.c	2007-08-18 08:49:27 -04:00
@@ -162,29 +162,13 @@ get_free_recv_buffer(void)
 	recvbuf_t * buffer = NULL;
 	LOCK();
 	buffer = ISC_LIST_HEAD(free_recv_list);
-	if (buffer == NULL)
+	if (buffer != NULL)
 	{
-		/*
-		 * See if more are available
-		 */
-		if (create_buffers(RECV_INC) <= 0)
-		{
-			msyslog(LOG_ERR, "No more memory for recvufs");
-			UNLOCK();
-			return (NULL);
-		}
-		buffer = ISC_LIST_HEAD(free_recv_list);
-		if (buffer == NULL)
-		{
-			msyslog(LOG_ERR, "Failed to obtain more memory for recvbufs");
-			UNLOCK();
-			return (NULL);
-		}
+		ISC_LIST_DEQUEUE(free_recv_list, buffer, link);
+		free_recvbufs--;
+		initialise_buffer(buffer);
+		(buffer->used)++;
 	}
-	ISC_LIST_DEQUEUE(free_recv_list, buffer, link);
-	free_recvbufs--;
-	initialise_buffer(buffer);
-	(buffer->used)++;
 	UNLOCK();
 	return (buffer);
 }
@@ -194,6 +178,29 @@ get_full_recv_buffer(void)
 {
 	recvbuf_t *rbuf;
 	LOCK();
+	
+	/*
+	 * make sure there are free buffers when we
+	 * wander off to do lengthy paket processing with
+	 * any buffer we grab from the full list.
+	 * 
+	 * fixes malloc() interrupted by SIGIO risk
+	 * (Bug 889)
+	 */
+	rbuf = ISC_LIST_HEAD(free_recv_list);
+	if (rbuf == NULL) {
+		/*
+		 * try to get us some more buffers
+		 */
+		if (create_buffers(RECV_INC) <= 0)
+		{
+			msyslog(LOG_ERR, "No more memory for recvufs");
+		}
+	}
+
+	/*
+	 * try to grab a full buffer
+	 */
 	rbuf = ISC_LIST_HEAD(full_recv_list);
 	if (rbuf != NULL)
 	{

#### ChangeSet ####
2007-08-18 09:51:41+00:00, kardel at pogo.udel.edu 
  cmd_args.c:
    Bug 885: fix comparison

==== ntpd/cmd_args.c ====
2007-08-18 09:50:28+00:00, kardel at pogo.udel.edu +1 -1
  Bug 885: fix comparison

--- 1.45.3.1/ntpd/cmd_args.c	2007-08-11 13:19:51 -04:00
+++ 1.45.3.2/ntpd/cmd_args.c	2007-08-18 05:50:28 -04:00
@@ -126,7 +126,7 @@ getCmdOpts(
 			const char* p = *pp++;
 
 			tkey = (int)atol(p);
-			if (tkey = 0 || tkey > NTP_MAXKEY) {
+			if (tkey == 0 || tkey > NTP_MAXKEY) {
 				msyslog(LOG_ERR,
 				    "command line trusted key %s is invalid",
 				    p);


More information about the bk-ntp-dev-send mailing list