ChangeLog:

  [Bug 917] config parse leaves files open
ntp_scanner.c:
  Bug 917: config parse leaves files open

bk: 46ffca4e_jBzDlyztbejx_XyOWqghQ

diff --git a/ChangeLog b/ChangeLog
index dc0d12526c77d3a2b621e80245c96bcaa8681289..0883bbba145ebe8aa4e96983c839d09fa8ca42a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 917] config parse leaves files open
 * [Bug 912] detect conflicting enable/disable configuration on interfaces sharing an IP address
 * [Bug 771] compare scopeid if available for IPv6 addresses
 * [Bug 899] Only show -i/--jaildir -u/--user options if we HAVE_DROPROOT.

diff --git a/ntpd/ntp_scanner.c b/ntpd/ntp_scanner.c
index 3414e2893fb2f25545a0844561a60a12a38bb433..82d34fc50080ebd149fdbafb2bc59d49ad05b9f2 100644 (file)
--- a/ntpd/ntp_scanner.c
+++ b/ntpd/ntp_scanner.c
@@ -525,8 +525,9 @@ int yylex()
             if (!(curr_include_level > 0)) 
                return 0;
                        else { 
-                ip_file = fp[--curr_include_level]; 
-                return T_EOC;
+                               FCLOSE(fp[curr_include_level]);
+                               ip_file = fp[--curr_include_level]; 
+                               return T_EOC;
                        }
                } else if (is_EOC(ch)) {
             expect_string = NO_ARG;   /* Reset expect_string */