diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-14 22:51:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-14 22:51:51 -0400 |
| commit | a6eea86a2c915ef424c17920139babcfe42f3704 (patch) | |
| tree | 5ce52e3783d8b4b3d4e3de42c62b22875c4a658c /src/common/util.c | |
| parent | a88923e455cb0cae0f5fd7e705a2cbf45df2e5aa (diff) | |
| parent | f694a443fc35e91d301470c60a7989d4fbd6de71 (diff) | |
| download | tor-a6eea86a2c915ef424c17920139babcfe42f3704.tar.gz tor-a6eea86a2c915ef424c17920139babcfe42f3704.zip | |
Merge branch 'bug11946'
Diffstat (limited to 'src/common/util.c')
| -rw-r--r-- | src/common/util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/util.c b/src/common/util.c index f2b21407bf..e27036a84d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1871,7 +1871,7 @@ check_private_dir(const char *dirname, cpd_check_t check, char *f; #ifndef _WIN32 int mask; - struct passwd *pw = NULL; + const struct passwd *pw = NULL; uid_t running_uid; gid_t running_gid; #else @@ -1918,7 +1918,7 @@ check_private_dir(const char *dirname, cpd_check_t check, if (effective_user) { /* Look up the user and group information. * If we have a problem, bail out. */ - pw = getpwnam(effective_user); + pw = tor_getpwnam(effective_user); if (pw == NULL) { log_warn(LD_CONFIG, "Error setting configured user: %s not found", effective_user); @@ -1932,13 +1932,13 @@ check_private_dir(const char *dirname, cpd_check_t check, } if (st.st_uid != running_uid) { - struct passwd *pw = NULL; + const struct passwd *pw = NULL; char *process_ownername = NULL; - pw = getpwuid(running_uid); + pw = tor_getpwuid(running_uid); process_ownername = pw ? tor_strdup(pw->pw_name) : tor_strdup("<unknown>"); - pw = getpwuid(st.st_uid); + pw = tor_getpwuid(st.st_uid); 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?", |