[or-cvs] [tor/master] Survive unparseable cached cert file

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Thu, 20 Aug 2009 16:56:21 -0400
Subject: Survive unparseable cached cert file
Commit: eb829cc330629da03989c9c3b466d3c69b772249

---
 ChangeLog     |    1 +
 src/or/main.c |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b93d3f..9e68528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ Changes in version 0.2.2.1-alpha - 2009-0?-??
     - If any the v3 certs we download are unparseable, we should actually
       notice the failure so we don't retry indefinitely. Bugfix on
       0.2.0.x; reported by "rotator".
+    - If the cached cert file is unparseable, warn but don't exit.
 
   o Deprecated and removed features:
     - The controller no longer accepts the old obsolete "addr-mappings/"
diff --git a/src/or/main.c b/src/or/main.c
index 4969212..52cc028 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1410,8 +1410,10 @@ do_main_loop(void)
   /* initialize the bootstrap status events to know we're starting up */
   control_event_bootstrap(BOOTSTRAP_STATUS_STARTING, 0);
 
-  if (trusted_dirs_reload_certs())
-    return -1;
+  if (trusted_dirs_reload_certs()) {
+    log_warn(LD_DIR,
+             "Couldn't load all cached v3 certificates. Starting anyway.");
+  }
   if (router_reload_v2_networkstatus()) {
     return -1;
   }
-- 
1.5.6.5