[or-cvs] Make sure that routerlists contain only routers; give a bet...

[Nick Mathewson]

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

Modified Files:
	routerlist.c 
Log Message:
Make sure that routerlists contain only routers; give a better error message if they start with a nonrouter.

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerlist.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- routerlist.c	28 Sep 2004 22:43:11 -0000	1.141
+++ routerlist.c	28 Sep 2004 22:49:34 -0000	1.142
@@ -748,6 +748,10 @@
     log(LOG_WARN, "Error parsing router file");
     return -1;
   }
+  if (*s) {
+    log(LOG_WARN, "Extraneous text at start of router file");
+    return -1;
+  }
   if (trusted) {
     int i;
     if (!trusted_dir_digests)