From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 3 Sep 2012 11:00:38 +0000 (+0100)
Subject: Tweak file read/parse errors, they're confusing when that's all you see
X-Git-Tag: release_3_0_0_beta0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3c9f9aacc9b0cac84544faa00f4fa40a8dd0630;p=thirdparty%2Ffreeradius-server.git

Tweak file read/parse errors, they're confusing when that's all you see
---

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index 49296067f3f..78d58cef128 100644
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -790,7 +790,7 @@ int read_mainconfig(int reload)
 	snprintf(buffer, sizeof(buffer), "%.200s/%.50s.conf",
 		 radius_dir, mainconfig.name);
 	if ((cs = cf_file_read(buffer)) == NULL) {
-		radlog(L_ERR, "Errors reading %s", buffer);
+		radlog(L_ERR, "Errors reading or parsing %s", buffer);
 		return -1;
 	}
 
@@ -1015,7 +1015,7 @@ void hup_mainconfig(void)
 	snprintf(buffer, sizeof(buffer), "%.200s/%.50s.conf",
 		 radius_dir, mainconfig.name);
 	if ((cs = cf_file_read(buffer)) == NULL) {
-		radlog(L_ERR, "Failed to re-read %s", buffer);
+		radlog(L_ERR, "Failed to re-read or parse %s", buffer);
 		return;
 	}
 
diff --git a/src/main/radconf2xml.c b/src/main/radconf2xml.c
index bd9f34739a6..7f192e4c61a 100644
--- a/src/main/radconf2xml.c
+++ b/src/main/radconf2xml.c
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
 	snprintf(buffer, sizeof(buffer), "%s/%s.conf", raddb_dir, name);
 	cs = cf_file_read(buffer);
 	if (!cs) {
-		fprintf(stderr, "%s: Errors reading %s\n",
+		fprintf(stderr, "%s: Errors reading or parsing %s\n",
 			progname, buffer);
 		exit(1);
 	}
diff --git a/src/main/radmin.c b/src/main/radmin.c
index 228036de4d5..ad3ba83e234 100644
--- a/src/main/radmin.c
+++ b/src/main/radmin.c
@@ -461,7 +461,7 @@ int main(int argc, char **argv)
 
 		cs = cf_file_read(buffer);
 		if (!cs) {
-			fprintf(stderr, "%s: Errors reading %s\n",
+			fprintf(stderr, "%s: Errors reading or parsing %s\n",
 				progname, buffer);
 			exit(1);
 		}
diff --git a/src/main/radwho.c b/src/main/radwho.c
index 437ed8dbdc8..4bb804ee96a 100644
--- a/src/main/radwho.c
+++ b/src/main/radwho.c
@@ -416,7 +416,7 @@ int main(int argc, char **argv)
 	snprintf(buffer, sizeof(buffer), "%.200s/radiusd.conf", raddb_dir);
 	maincs = cf_file_read(buffer);
 	if (!maincs) {
-		fprintf(stderr, "%s: Error reading radiusd.conf.\n", argv[0]);
+		fprintf(stderr, "%s: Error reading or parsing radiusd.conf.\n", argv[0]);
 		exit(1);
 	}