Commit 9201e4c7 authored by Nick Mathewson's avatar Nick Mathewson
Browse files

Merge branch 'bug23487_029'

parents 03e102c1 75659fd5
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
......@@ -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) :
const struct passwd *pw_running = tor_getpwuid(running_uid);
process_ownername = pw_running ? tor_strdup(pw_running->pw_name) :
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) :
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);
return -1;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment