[or-cvs] back-port tolerating a corrupt cached dir

[arma@xxxxxxxx (Roger Dingledine)]

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

Modified Files:
      Tag: tor-0_0_9-patches
	router.c 
Log Message:
back-port tolerating a corrupt cached dir


Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.137
retrieving revision 1.137.2.1
diff -u -d -r1.137 -r1.137.2.1
--- router.c	13 Dec 2004 19:42:46 -0000	1.137
+++ router.c	3 Feb 2005 23:30:41 -0000	1.137.2.1
@@ -366,9 +366,9 @@
     log_fn(LOG_INFO,"Cached directory %s not present. Ok.",keydir);
   } else {
     if (dirserv_load_from_directory_string(cp) < 0) {
-      log_fn(LOG_ERR, "Cached directory %s is corrupt", keydir);
+      log_fn(LOG_WARN, "Cached directory %s is corrupt, only loaded part of it", keydir);
       tor_free(cp);
-      return -1;
+      return 0;
     }
     tor_free(cp);
   }