projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
48cb2f1
)
cdb_chmod_data() : don't make so much noise unless there was an error
author
Art Cancro
<ajc@citadel.org>
Fri, 15 Sep 2023 22:19:48 +0000
(18:19 -0400)
committer
Art Cancro
<ajc@citadel.org>
Fri, 15 Sep 2023 22:19:48 +0000
(18:19 -0400)
citadel/server/backends/common/database.c
patch
|
blob
|
history
diff --git
a/citadel/server/backends/common/database.c
b/citadel/server/backends/common/database.c
index e3024f4d1919573ecf080a3f0b568733efaaa467..e9f2911b54fd6253aeb2880288bc2265c31f71a4 100644
(file)
--- 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)) {
// 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, "
b
db: 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) {
exit(CTDLEXIT_DB);
}
if (chmod(ctdl_db_dir, 0700) != 0) {
- syslog(LOG_ERR, "
b
db: 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) {
exit(CTDLEXIT_DB);
}
if (chown(ctdl_db_dir, ctdluid, (-1)) != 0) {
- syslog(LOG_ERR, "
b
db: 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] != '.') {
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);
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);
}
}
closedir(dp);