From: Art Cancro <ajc@citadel.org>
Date: Fri, 15 Sep 2023 22:19:48 +0000 (-0400)
Subject: cdb_chmod_data() : don't make so much noise unless there was an error
X-Git-Tag: v994~3
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=47eb37d982e741de6761afea7d50183dc8e719b2;p=citadel.git

cdb_chmod_data() : don't make so much noise unless there was an error
---

diff --git a/citadel/server/backends/common/database.c b/citadel/server/backends/common/database.c
index e3024f4d1..e9f2911b5 100644
--- a/citadel/server/backends/common/database.c
+++ b/citadel/server/backends/common/database.c
@@ -56,24 +56,31 @@ void cdb_chmod_data(void) {
 
 	// Silently try to create the database subdirectory.  If it's already there, no problem.
 	if ((mkdir(ctdl_db_dir, 0700) != 0) && (errno != EEXIST)) {
-		syslog(LOG_ERR, "bdb: database directory [%s] does not exist and could not be created: %m", ctdl_db_dir);
+		syslog(LOG_ERR, "db: database directory [%s] does not exist and could not be created: %m", ctdl_db_dir);
 		exit(CTDLEXIT_DB);
 	}
 	if (chmod(ctdl_db_dir, 0700) != 0) {
-		syslog(LOG_ERR, "bdb: unable to set database directory permissions [%s]: %m", ctdl_db_dir);
+		syslog(LOG_ERR, "db: unable to set database directory permissions [%s]: %m", ctdl_db_dir);
 		exit(CTDLEXIT_DB);
 	}
 	if (chown(ctdl_db_dir, ctdluid, (-1)) != 0) {
-		syslog(LOG_ERR, "bdb: unable to set the owner for [%s]: %m", ctdl_db_dir);
+		syslog(LOG_ERR, "db: unable to set the owner for [%s]: %m", ctdl_db_dir);
 		exit(CTDLEXIT_DB);
 	}
 	dp = opendir(ctdl_db_dir);
 	if (dp != NULL) {
 		while (d = readdir(dp), d != NULL) {
 			if (d->d_name[0] != '.') {
+				int ret;
 				snprintf(filename, sizeof filename, "%s/%s", ctdl_db_dir, d->d_name);
-				syslog(LOG_DEBUG, "bdb: chmod(%s, 0600) returned %d", filename, chmod(filename, 0600));
-				syslog(LOG_DEBUG, "bdb: chown(%s, ctdluid, -1) returned %d", filename, chown(filename, ctdluid, (-1)));
+				ret = chmod(filename, 0600);
+				if (ret != 0) {
+					syslog(LOG_DEBUG, "db: chmod(%s, 0600) returned %d", filename, ret);
+				}
+				ret = chown(filename, ctdluid, (-1));
+				if (ret != 0) {
+					syslog(LOG_DEBUG, "db: chown(%s, ctdluid, -1) returned %d", filename, ret);
+				}
 			}
 		}
 		closedir(dp);