[minion-cvs] Fix bug in CGI

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/directory
In directory moria.mit.edu:/tmp/cvs-serv1151/lib/mixminion/directory

Modified Files:
	ServerInbox.py 
Log Message:
Fix bug in CGI

Index: ServerInbox.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/ServerInbox.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ServerInbox.py	26 May 2003 21:08:13 -0000	1.3
+++ ServerInbox.py	28 May 2003 07:45:52 -0000	1.4
@@ -13,6 +13,7 @@
 
 from mixminion.Common import LOG, MixError, MixFatalError, UIError, \
      readPickled, writePickled
+from mixminion.ServerInfo import ServerInfo
 
 from mixminion.directory.Directory import getIDFingerprint, MismatchedID
 from mixminion.directory.ServerList import _writeServer, _readServer
@@ -32,7 +33,7 @@
            ServerQueued on wait-for-admin.
            """
         try:
-            text, server = _readServer(text)
+            server = ServerInfo(string=contents,assumeValid=0)
         except MixError, e:
             LOG.warn("Rejected invalid server from %s: %s", source,e)
             raise UIError("Server descriptor was not valid: %s"%e)
@@ -40,7 +41,7 @@
         nickname = server.getNickname()
 
         try:
-            known = self.idCache.containsServer(nickname)
+            known = self.idCache.containsServer(server)
         except MismatchedID:
             LOG.warn("Rejected server with mismatched identity from %s",
                      source)