r17274@catbus: nickm | 2007-12-20 01:14:09 -0500

Don't try to create the datadir when we are only verifying the configuration or hashing a password. Resolves bug 540.


svn:r12884
This commit is contained in:
Nick Mathewson 2007-12-20 06:15:09 +00:00
parent 6de2b484cf
commit 2f922937d3
2 changed files with 4 additions and 1 deletions

View File

@ -399,6 +399,8 @@ Changes in version 0.1.2.18 - 2007-10-28
is fishy. Resolves bug 463.
- Don't reset trusted dir server list when we set a configuration
option. Patch from Robert Hogan.
- Don't try to create the datadir when running --verify-config or
--hash-password. Resolves bug 540.
Changes in version 0.2.0.9-alpha - 2007-10-24

View File

@ -1004,7 +1004,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, CPD_CREATE)<0) {
if (check_private_dir(options->DataDirectory,
running_tor ? CPD_CREATE : CPD_CHECK)<0) {
char buf[1024];
int tmp = tor_snprintf(buf, sizeof(buf),
"Couldn't access/create private data directory \"%s\"",