Update from samosa: be less conservative when looking for an encrypted message

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

diff --git a/ud-mailgate b/ud-mailgate
index 680b14d..ede45ac 100755 (executable)
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -360,7 +360,8 @@ try:
    Msg = GetClearSig(Email);
 
    ErrMsg = "Message is not PGP signed:"
-   if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
+   if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1 and \
+      string.find(Msg[0],"-----BEGIN PGP MESSAGE-----") == -1:
       raise Error, "No PGP signature";
    
    # Check the signature