Escaping of - starting lines

[mirror/userdir-ldap.git] / ud-echelon

diff --git a/ud-echelon b/ud-echelon
index 0487d94..6d4c38f 100755 (executable)
--- a/ud-echelon
+++ b/ud-echelon
@@ -12,10 +12,19 @@ Debug = None;
 # Try to extract a key fingerprint from a PGP siged message
 def TryGPG(Email):
    # Try to get a pgp text
-   Msg = GetClearSig(Email);
+   try:
+      Msg = GetClearSig(Email);
+   except:
+      # Log an exception.. but continue. This is to deal with 'sort of' 
+      # PGP-MIME things
+      S = "%s: %s -> %s\n" %(Now,MsgID,ErrMsg);
+      S = S + " %s: %s\n" %(sys.exc_type,sys.exc_value);
+      ErrLog.write(S);
+      return None;
+
    if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
       return None;
-      
+
    Res = GPGCheckSig(Msg[0]);
 
    # Failed to find a matching sig