[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[minion-cvs] Oops; syntax errors are bad.



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

Modified Files:
	MMTPClient.py 
Log Message:
Oops; syntax errors are bad.

Index: MMTPClient.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/MMTPClient.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- MMTPClient.py	27 Jul 2004 03:32:22 -0000	1.59
+++ MMTPClient.py	27 Jul 2004 04:39:28 -0000	1.60
@@ -497,15 +497,15 @@
             notBefore,notAfter = tls.get_cert_lifetime()
             # XXXX 'stringContains' is not the best possible check here...
             if stringContains(s, "expired"):
-                s = "%s [expired at %s]"%(s,notAfter)
+                s += " [expired at %s]"%notAfter
                 skewed = 1
             elif stringContains(s,"not yet valid"):
-                s = "%s [not valid until %s]"%(s,notBefore)
+                s += " [not valid until %s]"%notBefore
                 skewed = 1
             if skewed:
                 s +=" (One of you may have a skewed clock or wrong time zone)"
             raise MixProtocolBadAuth("Invalid certificate from %s: %s " % (
-                serverName, s)
+                serverName, s))
 
         # If we don't care whom we're talking to, we don't need to check
         # them out.