From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 14 Nov 2014 09:53:23 +0000 (+0000)
Subject: [Bug 2650] includefile processing broken
X-Git-Tag: NTP_4_2_7P478~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69d66cfa5fae456874f5549db76a005a5fb4f3ab;p=thirdparty%2Fntp.git

[Bug 2650] includefile processing broken

bk: 5465d113loWUvJGjot1ak59APWHB6A
---

diff --git a/ChangeLog b/ChangeLog
index 408ca5de6..bef8133dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@ntp.org>
 * [Bug 2657] Document that "restrict nopeer" intereferes with "pool".
diff --git a/ntpd/ntp_scanner.c b/ntpd/ntp_scanner.c
index faf110f52..3e098562d 100644
--- a/ntpd/ntp_scanner.c
+++ b/ntpd/ntp_scanner.c
@@ -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;