From: Frank Kardel <kardel@ntp.org>
Date: Sun, 30 Sep 2007 16:09:50 +0000 (+0000)
Subject: ChangeLog:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e74672a04b19755faaffaace81ea9d61d17ff73a;p=thirdparty%2Fntp.git

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 dc0d12526c..0883bbba14 100644
--- 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 3414e2893f..82d34fc500 100644
--- 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 */