[or-cvs] r10957: Start correctly when cached-certs is missing. oops (in tor/trunk: . src/or)
nickm at seul.org
nickm at seul.org
Sat Jul 28 22:14:43 UTC 2007
Author: nickm
Date: 2007-07-28 18:14:42 -0400 (Sat, 28 Jul 2007)
New Revision: 10957
Modified:
tor/trunk/
tor/trunk/src/or/routerlist.c
Log:
r13960 at catbus: nickm | 2007-07-28 18:14:29 -0400
Start correctly when cached-certs is missing. oops
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r13960] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c 2007-07-28 22:14:39 UTC (rev 10956)
+++ tor/trunk/src/or/routerlist.c 2007-07-28 22:14:42 UTC (rev 10957)
@@ -186,9 +186,9 @@
tor_snprintf(filename,sizeof(filename),"%s"PATH_SEPARATOR"cached-certs",
get_options()->DataDirectory);
- contents = read_file_to_str(filename, 0, NULL);
+ contents = read_file_to_str(filename, RFTS_IGNORE_MISSING, NULL);
if (!contents)
- return -1;
+ return 0;
r = trusted_dirs_load_certs_from_string(contents, 1);
tor_free(contents);
return r;
More information about the tor-commits
mailing list