sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r17275@catbus: nickm | 2007-12-20 01:15:04 -0500 

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


svn:r12885
This commit is contained in:
Nick Mathewson 2007-12-20 06:15:19 +00:00
parent 349e55e6cb
commit c52cacb1a2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -29,6 +29,8 @@ Changes in version 0.1.2.19 - 2007-??-??
- When we decide to send a 503 response to a request for servers, do
not then also send the server descriptors: this defeats the whole
purpose. Fixes bug 539.
- Don't try to create the datadir when running --verify-config or
--hash-password. Resolves bug 540.
Changes in version 0.1.2.18 - 2007-10-28

3
src/or/config.c
View File

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