diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-14 12:25:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-14 12:25:33 -0400 |
| commit | 8839b86085dbb9ccf26165b6eae4d09462bc88b6 (patch) | |
| tree | 4572f6b0c38136b3d631c8878b7108213627960e /src/or/config.c | |
| parent | 910dadd6eab5b2b3af3b655f52b861085f379b84 (diff) | |
| parent | 54d7d31cba84232b50fef4287951b2c4bfa746c2 (diff) | |
| download | tor-8839b86085dbb9ccf26165b6eae4d09462bc88b6.tar tor-8839b86085dbb9ccf26165b6eae4d09462bc88b6.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index d66333679..53ecca274 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1047,7 +1047,8 @@ options_act_reversible(or_options_t *old_options, char **msg) /* Ensure data directory is private; create if possible. */ if (check_private_dir(options->DataDirectory, - running_tor ? CPD_CREATE : CPD_CHECK)<0) { + running_tor ? CPD_CREATE : CPD_CHECK, + options->User)<0) { tor_asprintf(msg, "Couldn't access/create private data directory \"%s\"", options->DataDirectory); @@ -1060,7 +1061,8 @@ options_act_reversible(or_options_t *old_options, char **msg) char *fn = tor_malloc(len); tor_snprintf(fn, len, "%s"PATH_SEPARATOR"cached-status", options->DataDirectory); - if (check_private_dir(fn, running_tor ? CPD_CREATE : CPD_CHECK) < 0) { + if (check_private_dir(fn, running_tor ? CPD_CREATE : CPD_CHECK, + options->User) < 0) { tor_asprintf(msg, "Couldn't access/create private data directory \"%s\"", fn); tor_free(fn); |