nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2011-04-25 19:03:15 -04:00
commit f3b58dfa53
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug2971 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes:
- Be more consistent in our treatment of file system paths. ~ should
get expanded to the user's home directory in the Log config option.
Bugfix on 0.2.0.1-alpha, which introduced the feature for the -f and
--DataDirectory options.

4
src/or/config.c
View File

@ -4382,11 +4382,13 @@ options_init_logs(or_options_t *options, int validate_only)
if (smartlist_len(elts) == 2 && if (smartlist_len(elts) == 2 &&
!strcasecmp(smartlist_get(elts,0), "file")) { !strcasecmp(smartlist_get(elts,0), "file")) {
if (!validate_only) { if (!validate_only) {
if (add_file_log(severity, smartlist_get(elts, 1)) < 0) { char *fname = expand_filename(smartlist_get(elts, 1));
if (add_file_log(severity, fname) < 0) {
log_warn(LD_CONFIG, "Couldn't open file for 'Log %s': %s", log_warn(LD_CONFIG, "Couldn't open file for 'Log %s': %s",
opt->value, strerror(errno)); opt->value, strerror(errno));
ok = 0; ok = 0;
} }
tor_free(fname);
} }
goto cleanup; goto cleanup;
} }