summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-04-25 19:04:13 -0400
committerNick Mathewson <nickm@torproject.org>2011-04-25 19:04:13 -0400
commit5230cc4fe7f80396304681ce2e9a1d0421920c40 (patch)
tree5cb1821ca2e9ae64c6fdd30bfaed5b2cfac4754d /src/or/config.c
parentfdbdaf8fabd532d8d9b875d135e9f9dde402ab61 (diff)
parentf3b58dfa53d87656f558a97bc28a333bdea06017 (diff)
downloadtor-5230cc4fe7f80396304681ce2e9a1d0421920c40.tar.gz
tor-5230cc4fe7f80396304681ce2e9a1d0421920c40.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 1bf0e6f88e..832a6ae698 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4489,11 +4489,13 @@ options_init_logs(or_options_t *options, int validate_only)
if (smartlist_len(elts) == 2 &&
!strcasecmp(smartlist_get(elts,0), "file")) {
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",
opt->value, strerror(errno));
ok = 0;
}
+ tor_free(fname);
}
goto cleanup;
}