[or-cvs] bugfix: if a server uploads a descriptor that"s unapproved,...

[Roger Dingledine]

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

Modified Files:
	directory.c dirserv.c 
Log Message:
bugfix: if a server uploads a descriptor that's unapproved, actually
tell him so.


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- directory.c	1 Jan 2005 07:40:59 -0000	1.182
+++ directory.c	3 Jan 2005 17:47:32 -0000	1.183
@@ -635,7 +635,7 @@
         log_fn(LOG_WARN,"http status 400 (bad request) response from dirserver '%s'. Malformed server descriptor?", conn->address);
         break;
       case 403:
-        log_fn(LOG_WARN,"http status 403 (unapproved server) response from dirserver '%s'. Is your clock skewed? Have you mailed us your identity fingerprint? Are you using the right key? See README.", conn->address);
+        log_fn(LOG_WARN,"http status 403 (unapproved server) response from dirserver '%s'. Is your clock skewed? Have you mailed us your key fingerprint? Are you using the right key? See http://tor.eff.org/doc/tor-doc.html#server.", conn->address);
         break;
       default:
         log_fn(LOG_WARN,"http status %d response unrecognized (server '%s').", status_code, conn->address);

Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- dirserv.c	24 Dec 2004 02:50:27 -0000	1.132
+++ dirserv.c	3 Jan 2005 17:47:32 -0000	1.133
@@ -380,7 +380,7 @@
       /* This isn't really an error; return success. */
       routerinfo_free(ri);
       *desc = end;
-      return 1;
+      return verified;
     }
     /* We don't have a newer one; we'll update this one. */
     log_fn(LOG_INFO,"Dirserv updating desc for nickname '%s'",ri->nickname);
@@ -403,7 +403,7 @@
   *desc = end;
   directory_set_dirty();
 
-  return 1;
+  return verified;
 }
 
 /** Remove all descriptors whose nicknames or fingerprints we don't