X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-mailgate;h=1ec0e9f503047b2eca2a8a96c151c71f379fb217;hp=8439037ba63fd5b468984d80b437ea7d08203441;hb=703033b7eeaffc61568300877d2d452651388acf;hpb=43aa6ad5f244e7b574309b29b2bf512336ea27b1 diff --git a/ud-mailgate b/ud-mailgate index 8439037..1ec0e9f 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -752,8 +752,8 @@ try: # Get the email ErrType = EX_PERMFAIL; ErrMsg = "Failed to understand the email or find a signature:"; - email = email.parser.Parser().parse(sys.stdin); - Msg = GetClearSig(email); + mail = email.parser.Parser().parse(sys.stdin); + Msg = GetClearSig(mail); ErrMsg = "Message is not PGP signed:" if Msg[0].find("-----BEGIN PGP SIGNED MESSAGE-----") == -1 and \ @@ -802,8 +802,8 @@ try: # Determine the sender address ErrMsg = "A problem occured while trying to formulate the reply"; - Sender = email['Reply-To'] - if not Sender: Sender = email['From'] + Sender = mail['Reply-To'] + if not Sender: Sender = mail['From'] if not Sender: raise UDFormatError, "Unable to determine the sender's address"; # Formulate a reply