[or-cvs] Improve warnings for old-style directories.

Nick Mathewson nickm at seul.org
Thu Oct 14 04:31:42 UTC 2004


Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv11845/src/or

Modified Files:
	routerparse.c 
Log Message:
Improve warnings for old-style directories.

Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerparse.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- routerparse.c	14 Oct 2004 04:06:24 -0000	1.55
+++ routerparse.c	14 Oct 2004 04:31:40 -0000	1.56
@@ -622,15 +622,16 @@
       _pkey = declared_key;
   }
   if (!_pkey) {
+    log_fn(LOG_WARN, "Processing directory in old (before 0.0.9pre3) format--this may fail.");
     r = router_get_by_nickname(tok->args[0]);
-    log_fn(LOG_DEBUG, "Got directory signed by %s", tok->args[0]);
+    log_fn(LOG_DEBUG, "Got directory signed (allegedly) by %s", tok->args[0]);
     if (r && r->is_trusted_dir) {
       _pkey = r->identity_pkey;
     } else if (!r && pkey) {
       /* pkey provided for debugging purposes. */
       _pkey = pkey;
     } else if (!r) {
-      log_fn(LOG_WARN, "Directory was signed by unrecognized server %s",
+      log_fn(LOG_WARN, "No server descriptor loaded for signer %s",
              tok->args[0]);
       return -1;
     } else if (r && !r->is_trusted_dir) {



More information about the tor-commits mailing list