[Bug 2650] includefile processing broken

bk: 5465d113loWUvJGjot1ak59APWHB6A

diff --git a/ChangeLog b/ChangeLog
index 408ca5de6d5ee75eccd20fac0d787aeaacf2b74e..bef8133dc46f06672272abeccbe507c808f03dad 100644 (file)
--- 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 faf110f52e99881c34139a9f20faea16412ba588..3e098562dda70870ea0688c910efae74f3b7d1b1 100644 (file)
--- 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;