commit 7ee486c15f51177016baf85c1d21244b84667dc2 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 17:37:25 2017 -0400

Log correctly on owner/user mismatch.

Found with clang's scan-build while looking at dead assignments.

Fixes bug 23487; bugfix on 1135405c8c6ea31 in 0.2.9.1-alpha --- changes/bug23487 | 5 +++++ src/common/util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug23487 b/changes/bug23487 new file mode 100644 index 000000000..89b55c243 --- /dev/null +++ b/changes/bug23487 @@ -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. + diff --git a/src/common/util.c b/src/common/util.c index d2cbacde3..40f05468d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2334,8 +2334,8 @@ check_private_dir,(const char *dirname, cpd_check_t check,

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, + pw_uid ? pw_uid->pw_name : "<unknown>", (int)st.st_uid);

tor_free(process_ownername); close(fd);