[minion-cvs] Make Contact required for servers.

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerInfo.py test.py 
Log Message:
Make Contact required for servers.

Index: ServerInfo.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ServerInfo.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- ServerInfo.py	17 Jan 2004 04:24:57 -0000	1.76
+++ ServerInfo.py	27 Jan 2004 05:14:31 -0000	1.77
@@ -113,6 +113,7 @@
                      "Published": ("REQUIRE", "time", None),
                      "Valid-After": ("REQUIRE", "date", None),
                      "Valid-Until": ("REQUIRE", "date", None),
+                     #XXXX008 change this to 'require'.
                      "Contact": ("ALLOW", None, None),
                      "Comments": ("ALLOW", None, None),
                      "Packet-Key": ("REQUIRE", "publicKey", None),

Index: test.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/test.py,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- test.py	22 Jan 2004 05:42:06 -0000	1.179
+++ test.py	27 Jan 2004 05:14:31 -0000	1.180
@@ -3405,7 +3405,7 @@
             print >>stream, "Y"
         finally:
             r = resumeLog()
-        lines = [ l[20:] for l in r.split("\n") ]
+        lines = [ l[26:] for l in r.split("\n") ]
         self.assertEquals(lines[0], "[WARN] ->STREAM: Testing 1 2 3")
         self.assertEquals(lines[1], "[WARN] ->STREAM: ")
         self.assertEquals(lines[2], "[WARN] ->STREAM: A")
@@ -4456,6 +4456,7 @@
 Homedir: %s
 Mode: relay
 Nickname: fred-the-bunny
+Contact-Email: a@b.c
 """
 
 class ServerInfoTests(TestCase):
@@ -5917,6 +5918,7 @@
 IdentityKeyBits: 2048
 EncryptPrivateKey: no
 Nickname: mac-the-knife
+Contact-Email: a@b.c
 [Incoming/MMTP]
 Enabled: yes
 Hostname: Theserver5
@@ -6202,6 +6204,7 @@
 IdentityKeyBits: 2048
 EncryptPrivateKey: no
 Nickname: %(nickname)s
+Contact-Email: a@b.c
 [Incoming/MMTP]
 Enabled: yes
 Hostname: %(nickname)s