aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2006-09-14 04:53:23 +0000
committerPeter Palfrader <peter@palfrader.org>2006-09-14 04:53:23 +0000
commit984e8f6efb9dd50b5848545f12c6c81e4173fe5d (patch)
tree661a5212ff4dc555d53174b7d5e0810e4e4fae8b /src/or/router.c
parent7f1fa9aab50767e65780d49490249d6b583ef397 (diff)
downloadtor-984e8f6efb9dd50b5848545f12c6c81e4173fe5d.tar
tor-984e8f6efb9dd50b5848545f12c6c81e4173fe5d.tar.gz
r9736@danube: weasel | 2006-09-14 05:53:06 +0200
Refactor dirserv_parse_fingerprint_file(fname) into dirserv_load_fingerprint_file(): There is not need to put together the path to the approved-routers file in more than one place. svn:r8386
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 0fb8cf2b7..7c42ff77a 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -353,9 +353,7 @@ init_keys(void)
if (!authdir_mode(options))
return 0;
/* 6. [authdirserver only] load approved-routers file */
- tor_snprintf(keydir,sizeof(keydir),"%s/approved-routers", datadir);
- log_info(LD_DIRSERV,"Loading approved fingerprints from \"%s\"...",keydir);
- if (dirserv_parse_fingerprint_file(keydir) < 0) {
+ if (dirserv_load_fingerprint_file() < 0) {
log_err(LD_GENERAL,"Error loading fingerprints");
return -1;
}