From: Art Cancro <ajc@citadel.org>
Date: Wed, 3 Jan 2007 15:54:22 +0000 (+0000)
Subject: config.c: more verbose error reporting on citadel.config
X-Git-Tag: v7.86~3709
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=cd1e64dd3fed4ed06f8c3c3e5dbc2cd51ea8d253

config.c: more verbose error reporting on citadel.config
---

diff --git a/citadel/config.c b/citadel/config.c
index e1728a524..b4c38b569 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -54,9 +54,14 @@ void get_config(void) {
 		exit(CTDLEXIT_CONFIG);
 	}
 #ifndef __CYGWIN__
-	if (st.st_uid != CTDLUID || st.st_mode != (S_IFREG | S_IRUSR | S_IWUSR)) {
-		fprintf(stderr, "check the permissions on %s\n", file_citadel_config);
-		//		fprintf(stderr, "check the permissions on citadel.config\n");
+	if (st.st_uid != CTDLUID) {
+		fprintf(stderr, "%s must be owned by uid=%d\n", file_citadel_config, CTDLUID);
+		exit(CTDLEXIT_CONFIG);
+	}
+	int desired_mode = (S_IFREG | S_IRUSR | S_IWUSR) ;
+	if (st.st_mode != desired_mode) {
+		fprintf(stderr, "%s must be set to permissions mode %03o\n",
+			file_citadel_config, desired_mode);
 		exit(CTDLEXIT_CONFIG);
 	}
 #endif