diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-06-20 23:50:29 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-06-20 23:50:29 -0400 |
| commit | 2ea53fc0478aaf91c2dd11d520e02da9b2bebd94 (patch) | |
| tree | c0bb180bd95de727ae81157de59f141b04399845 | |
| parent | 16e8951c7d523014ccc2ef4d812ea6f8e9eec120 (diff) | |
| parent | 1040ccafb20d5d32cdf0945226f570dcbaf96e90 (diff) | |
| download | tor-0.2.2.29-beta.tar.gz tor-0.2.2.29-beta.zip | |
Merge branch 'maint-0.2.2' into release-0.2.2tor-0.2.2.29-beta
| -rw-r--r-- | src/common/util.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/common/util.c b/src/common/util.c index 36aa9ccef8..b47b9c5fa2 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1677,11 +1677,12 @@ file_status(const char *fname) * is group-readable, but in all cases we create the directory mode 0700. * If CPD_CHECK_MODE_ONLY is set, then we don't alter the directory permissions * if they are too permissive: we just return -1. - * When effective_user is not NULL, check permissions against the given user and - * its primary group. + * When effective_user is not NULL, check permissions against the given user + * and its primary group. */ int -check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user) +check_private_dir(const char *dirname, cpd_check_t check, + const char *effective_user) { int r; struct stat st; @@ -1730,10 +1731,12 @@ check_private_dir(const char *dirname, cpd_check_t check, const char *effective_ } #ifndef MS_WINDOWS if (effective_user) { - /* Lookup the user and group information, if we have a problem, bail out. */ + /* Look up the user and group information. + * If we have a problem, bail out. */ pw = getpwnam(effective_user); if (pw == NULL) { - log_warn(LD_CONFIG, "Error setting configured user: %s not found", effective_user); + log_warn(LD_CONFIG, "Error setting configured user: %s not found", + effective_user); return -1; } running_uid = pw->pw_uid; |