summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-11-09 10:38:42 +0000
committerRoger Dingledine <arma@torproject.org>2004-11-09 10:38:42 +0000
commitb773045a584c73c7e3c902bf7eef76eea9b7469e (patch)
tree582fcb0fcb4d88859b845438233e111cdd011a0b
parent3235c72f6cc85e20ced08657bbb49fafe4846273 (diff)
downloadtor-b773045a584c73c7e3c902bf7eef76eea9b7469e.tar.gz
tor-b773045a584c73c7e3c902bf7eef76eea9b7469e.zip
only non-authdirservers cache the dir they just fetched
svn:r2747
-rw-r--r--src/or/dirserv.c1
-rw-r--r--src/or/routerparse.c8
2 files changed, 6 insertions, 3 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index c0fc76c391..54d1ec3f7e 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -688,6 +688,7 @@ static char *cached_directory_z = NULL;
static size_t cached_directory_z_len = 0;
static time_t cached_directory_published = 0;
+/** DOCDOC */
void dirserv_set_cached_directory(const char *directory, time_t when)
{
time_t now;
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index dcdc0563bc..27e59ea9fa 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -345,9 +345,11 @@ router_parse_routerlist_from_directory(const char *str,
smartlist_free(tokens);
tokens = NULL;
- /* Now that we know the signature is okay, cache the directory. */
- /* XXXX009 extract published time if possible. */
- dirserv_set_cached_directory(str, time(NULL));
+ if(!get_options()->AuthoritativeDir) {
+ /* Now that we know the signature is okay, cache the directory. */
+ /* XXXX009 extract published time if possible. */
+ dirserv_set_cached_directory(str, time(NULL));
+ }
/* Now that we know the signature is okay, check the version. */
if (check_version)