summaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 42f1d57fa4..ab46d16d73 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -10,6 +10,8 @@
extern or_options_t options; /* command-line and config-file options */
static int the_directory_is_dirty = 1;
+/* XXX the_directory is the same name as a different variable in
+ * directory.c, are you crazy?? */
static char *the_directory = NULL;
static int the_directory_len = -1;
@@ -448,7 +450,7 @@ size_t dirserv_get_directory(const char **directory)
* necessary, but safe is better than sorry. */
new_directory = tor_strdup(the_directory);
/* use a new copy of the dir, since get_dir_from_string scribbles on it */
- if (router_get_dir_from_string(new_directory, get_identity_key())) {
+ if (router_set_routerlist_from_directory(new_directory, get_identity_key())) {
log_fn(LOG_ERR, "We just generated a directory we can't parse. Dying.");
exit(0);
}