[or-cvs] when we do reachability testing and the tls cert at the other

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	dirserv.c 
Log Message:
when we do reachability testing and the tls cert at the other
end disagrees with a descriptor we already have, be more useful
at explaining it.


Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -d -r1.323 -r1.324
--- dirserv.c	8 Apr 2006 05:43:52 -0000	1.323
+++ dirserv.c	8 Apr 2006 20:35:19 -0000	1.324
@@ -1641,16 +1641,16 @@ dirserv_orconn_tls_done(const char *addr
       /* We have a router at the same address! */
       if (strcasecmp(ri->nickname, nickname_rcvd)) {
         log_notice(LD_DIRSERV,
-                   "Dropping descriptor: nickname '%s' does not match "
-                   "nickname '%s' in cert from %s:%d",
+                   "Dropping old descriptor: nickname '%s' does not match "
+                   "nickname '%s' in new cert from %s:%d",
                    ri->nickname, nickname_rcvd, address, or_port);
         drop = 1;
       } else if (memcmp(ri->cache_info.identity_digest, digest_rcvd,
                         DIGEST_LEN)) {
         log_notice(LD_DIRSERV,
-                   "Dropping descriptor: identity key does not match "
-                   "key in cert from %s:%d",
-                   address, or_port);
+                   "Dropping old descriptor for nickname '%s': "
+                   "identity key does not match key in new cert from %s:%d",
+                   ri->nickname, address, or_port);
         drop = 1;
       }
     }