aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-09-13 12:31:41 -0400
committerNick Mathewson <nickm@torproject.org>2013-09-13 12:31:41 -0400
commite0b2cd061bd62fc790d434b2da7ecc51ed100904 (patch)
tree0bdd72522895a018e4fc9765df0f3067eff940a1 /src/or/config.c
parentdffc5c3f240e7734e85a427b951c4e493c85906c (diff)
parent7cf1b9cc33ab2ba13d84e08105699dd1f39dae1d (diff)
downloadtor-e0b2cd061bd62fc790d434b2da7ecc51ed100904.tar
tor-e0b2cd061bd62fc790d434b2da7ecc51ed100904.tar.gz
Merge remote-tracking branch 'ctoader/gsoc-cap-stage2'
Conflicts: src/common/sandbox.c
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 37b42e891..17d672885 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6301,7 +6301,8 @@ remove_file_if_very_old(const char *fname, time_t now)
#define VERY_OLD_FILE_AGE (28*24*60*60)
struct stat st;
- if (stat(fname, &st)==0 && st.st_mtime < now-VERY_OLD_FILE_AGE) {
+ if (stat(sandbox_intern_string(fname), &st)==0 &&
+ st.st_mtime < now-VERY_OLD_FILE_AGE) {
char buf[ISO_TIME_LEN+1];
format_local_iso_time(buf, st.st_mtime);
log_notice(LD_GENERAL, "Obsolete file %s hasn't been modified since %s. "