[or-cvs] clean up the log lines more, and note a future work.

[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:
clean up the log lines more, and note a future work.


Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -d -r1.324 -r1.325
--- dirserv.c	8 Apr 2006 20:35:19 -0000	1.324
+++ dirserv.c	8 Apr 2006 21:12:07 -0000	1.325
@@ -1637,18 +1637,19 @@ dirserv_orconn_tls_done(const char *addr
     int drop = 0;
     if (strcasecmp(address, ri->address) || or_port != ri->or_port)
       continue;
+    /* XXX For 0.1.2.x, we should do something smarter here than !is_valid. */
     if (!ri->is_valid) {
       /* We have a router at the same address! */
       if (strcasecmp(ri->nickname, nickname_rcvd)) {
         log_notice(LD_DIRSERV,
-                   "Dropping old descriptor: nickname '%s' does not match "
-                   "nickname '%s' in new cert from %s:%d",
+                   "Dropping old invalid 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 old descriptor for nickname '%s': "
+                   "Dropping old invalid descriptor for nickname '%s': "
                    "identity key does not match key in new cert from %s:%d",
                    ri->nickname, address, or_port);
         drop = 1;