mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-26 07:31:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix regression nickm pointed out

Browse source
This commit is contained in:
David Stainton 2014-09-02 22:46:46 +00:00
parent a6f2d2091b
commit 7203040835
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/common/util.c
View file

@ -1889,6 +1889,8 @@ check_private_dir(const char *dirname, cpd_check_t check,
struct stat st; struct stat st;
char *f; char *f;
#ifndef _WIN32 #ifndef _WIN32
int mask = 0;
int perm = 0;
const struct passwd *pw = NULL; const struct passwd *pw = NULL;
uid_t running_uid; uid_t running_uid;
gid_t running_gid; gid_t running_gid;
@ -1986,29 +1988,31 @@ check_private_dir(const char *dirname, cpd_check_t check,
tor_free(process_groupname); tor_free(process_groupname);
return -1; return -1;
} }
if (check & CPD_CHECK_MODE_ONLY) { if(check & CPD_CHECK_MODE_ONLY) {
if (st.st_mode & 0077) { if(check & CPD_GROUP_OK || check & CPD_GROUP_READ) {
log_warn(LD_FS, "Permissions on directory %s are too permissive.", if (!st.st_mode & 0027) {
dirname); log_warn(LD_FS, "Incorrect permissions on directory %s a.", dirname);
return -1; return -1;
}
} }
} else { } else {
log_warn(LD_FS, "Fixing permissions on directory %s", dirname); log_warn(LD_FS, "Fixing permissions on directory %s", dirname);
unsigned new_mode; unsigned new_mode;
new_mode = 0700;
if (check & CPD_GROUP_OK) {
new_mode = 0700;
}
if (check & CPD_GROUP_READ) { if (check & CPD_GROUP_READ) {
new_mode = 0750; new_mode = 0750;
} else {
new_mode = 0700;
} }
if (chmod(dirname, new_mode)) { if (chmod(dirname, new_mode)) {
log_warn(LD_FS, "Could not chmod directory %s: %s", dirname, log_warn(LD_FS, "Could not chmod directory %s: %s", dirname,
strerror(errno)); strerror(errno));
return -1; return -1;
} else { } else {
return 0; return 0;
} }
} }
#endif #endif
return 0; return 0;
} }