nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug23487_029'

Browse Source
This commit is contained in:
Nick Mathewson 2017-09-15 14:27:58 -04:00
commit 9201e4c74b
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug23487 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (logging):
- When warning about a directory owned by the wrong user, log the actual
name of the user owning the directory. Previously, we'd log the name
of the process owner twice. Fixes bug 23487; bugfix on 0.2.9.1-alpha.

22
src/common/util.c
View File

@ -2342,21 +2342,27 @@ check_private_dir,(const char *dirname, cpd_check_t check,
running_gid = getgid();
}
if (st.st_uid != running_uid) {
const struct passwd *pw_uid = NULL;
char *process_ownername = NULL;
char *process_ownername = NULL, *file_ownername = NULL;
pw_uid = tor_getpwuid(running_uid);
process_ownername = pw_uid ? tor_strdup(pw_uid->pw_name) :
tor_strdup("<unknown>");
{
const struct passwd *pw_running = tor_getpwuid(running_uid);
process_ownername = pw_running ? tor_strdup(pw_running->pw_name) :
tor_strdup("<unknown>");
}
pw_uid = tor_getpwuid(st.st_uid);
{
const struct passwd *pw_stat = tor_getpwuid(st.st_uid);
file_ownername = pw_stat ? tor_strdup(pw_stat->pw_name) :
tor_strdup("<unknown>");
}
log_warn(LD_FS, "%s is not owned by this user (%s, %d) but by "
"%s (%d). Perhaps you are running Tor as the wrong user?",
dirname, process_ownername, (int)running_uid,
pw ? pw->pw_name : "<unknown>", (int)st.st_uid);
dirname, process_ownername, (int)running_uid,
file_ownername, (int)st.st_uid);
tor_free(process_ownername);
tor_free(file_ownername);
close(fd);
return -1;
}