From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 22 Aug 2012 22:51:12 +0000 (+0100)
Subject: Output the name of the file were reading
X-Git-Tag: release_2_2_0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=601e6455d02a277ed3b14d13437c65dda694a178;p=thirdparty%2Ffreeradius-server.git

Output the name of the file were reading
---

diff --git a/src/main/files.c b/src/main/files.c
index a0ee24997cf..547ccec6c10 100644
--- a/src/main/files.c
+++ b/src/main/files.c
@@ -74,6 +74,8 @@ int pairlist_read(const char *file, PAIR_LIST **list, int complain)
 	FR_TOKEN parsecode;
 	char newfile[8192];
 
+	DEBUG2("reading pairlist file %s", file);
+	
 	/*
 	 *	Open the file.  The error message should be a little
 	 *	more useful...
@@ -132,7 +134,7 @@ parse_again:
 			 *	Include another file if we see
 			 *	$INCLUDE filename
 			 */
-			if (strcasecmp(entry, "$include") == 0) {
+			if (strcasecmp(entry, "$INCLUDE") == 0) {
 				while(isspace((int) *ptr))
 					ptr++;
 
@@ -162,6 +164,7 @@ parse_again:
 				}
 
 				t = NULL;
+				
 				if (pairlist_read(newfile, &t, 0) != 0) {
 					pairlist_free(&pl);
 					radlog(L_ERR|L_CONS,