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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Fri Nov 14 09:57:10 UTC 2014


#### ChangeSet ####
2014-11-14 09:53:23+00:00, stenn at psp-fb1.ntp.org
  [Bug 2650] includefile processing broken

==== ChangeLog ====
2014-11-14 09:52:47+00:00, stenn at psp-fb1.ntp.org +1 -0
  [Bug 2650] includefile processing broken

--- 1.1562/ChangeLog	2014-11-14 04:39:47 -05:00
+++ 1.1563/ChangeLog	2014-11-14 04:52:47 -05:00
@@ -1,5 +1,6 @@
 * [Sec 2630] buffer overrun in ntpq tokenize().
 * [Bug 2639] Check return value of ntp_adjtime().
+* [Bug 2650] includefile processing broken.
 * [Bug 2661] ntpq crashes with mreadvar.
 (4.2.7p477) 2014/11/13 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2657] Document that "restrict nopeer" intereferes with "pool".

==== ntpd/ntp_scanner.c ====
2014-11-14 09:52:53+00:00, stenn at psp-fb1.ntp.org +2 -0
  [Bug 2650] includefile processing broken

--- 1.44/ntpd/ntp_scanner.c	2014-08-08 05:52:30 -04:00
+++ 1.45/ntpd/ntp_scanner.c	2014-11-14 04:52:53 -05:00
@@ -488,6 +488,8 @@ yylex(
 	int		token;		/* The return value */
 	int		ch;
 
+	if (input_from_file)
+		ip_file = fp[curr_include_level];
 	instring = FALSE;
 	yylval_was_set = FALSE;
 


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