[or-cvs] Stop dying when we get a directory from tor26; workaround f...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv5392/src/or

Modified Files:
	routerparse.c 
Log Message:
Stop dying when we get a directory from tor26; workaround for change in networkstatus format

Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerparse.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- routerparse.c	7 Sep 2005 17:15:46 -0000	1.127
+++ routerparse.c	8 Sep 2005 18:24:26 -0000	1.128
@@ -133,6 +133,8 @@
   { "dir-signing-key",     K_DIR_SIGNING_KEY,     ARGS,    OBJ_OK, DIR|NETSTATUS},
   { "family",              K_FAMILY,              ARGS,    NO_OBJ,  RTR },
   { "fingerprint",         K_FINGERPRINT,         ARGS,    NO_OBJ,  ANY },
+  /* XXXX NM obsolete; remove once tor26 upgrades. */
+  { "dir-fingerprint",     K_FINGERPRINT,         ARGS,    NO_OBJ,  NETSTATUS },
   { "hibernating",         K_HIBERNATING,         ARGS,    NO_OBJ,  RTR },
   { "read-history",        K_READ_HISTORY,        ARGS,    NO_OBJ,  RTR },
   { "write-history",       K_WRITE_HISTORY,       ARGS,    NO_OBJ,  RTR },
@@ -1412,7 +1414,8 @@
 
   goto done;
  err:
-  networkstatus_free(ns);
+  if (ns)
+    networkstatus_free(ns);
   ns = NULL;
  done:
   SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));