From: Roger Dingledine <arma@torproject.org>
Date: Mon, 19 Apr 2010 22:35:57 +0000 (-0400)
Subject: fix "Got a certificate for ?? that we already have"
X-Git-Tag: tor-0.2.2.12-alpha~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de4a49adc2bc7bc8a2dfe44d75a47a828056a52c;p=thirdparty%2Ftor.git

fix "Got a certificate for ?? that we already have"

what's happening here is that we're fetching certs for obsolete
authorities -- probably legacy signers in this case. but try to
remain general in the log message.
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 6c97bd0761..b4fb8d167d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -185,15 +185,15 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store,
       log_info(LD_DIR, "Skipping %s certificate for %s that we "
                "already have.",
                from_store ? "cached" : "downloaded",
-               ds ? ds->nickname : "??");
+               ds ? ds->nickname : "an old or new authority");
 
       /* a duplicate on a download should be treated as a failure, since it
        * probably means we wanted a different secret key or we are trying to
        * replace an expired cert that has not in fact been updated. */
       if (!from_store) {
-        log_warn(LD_DIR, "Got a certificate for %s that we already have. "
-                 "Maybe they haven't updated it.  Waiting for a while.",
-                 ds ? ds->nickname : "??");
+        log_warn(LD_DIR, "Got a certificate for %s, but we already have it. "
+                 "Maybe they haven't updated it. Waiting for a while.",
+                 ds ? ds->nickname : "an old or new authority");
         authority_cert_dl_failed(cert->cache_info.identity_digest, 404);
       }