Commit eb829cc3 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Survive unparseable cached cert file

parent 7f518873
......@@ -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/"
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment