From 0403e47ec05aab254c90090357e0b7a9a54a18bd Mon Sep 17 00:00:00 2001 From: perennate Date: Fri, 9 Aug 2013 14:43:56 +0800 Subject: [PATCH] Fix format errors, also do deliver email for domain that should be encrypted even if the recipient doesn't have a key. --- gpg-mailgate.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gpg-mailgate.py b/gpg-mailgate.py index 221e71e..f6b9534 100755 --- a/gpg-mailgate.py +++ b/gpg-mailgate.py @@ -75,8 +75,10 @@ for enc in encrypted_to_addrs: if domain in cfg['default']['domains'].split(','): if enc in keys: gpg_to.append( (enc, enc) ) - elif cfg.has_key('keymap') and cfg['keymap'].has_key(enc): - gpg_to.append( (enc, cfg['keymap'][enc]) ) + elif cfg.has_key('keymap') and cfg['keymap'].has_key(enc): + gpg_to.append( (enc, cfg['keymap'][enc]) ) + else: + ungpg_to.append(enc); for to in to_addrs: domain = to.split('@')[1] @@ -85,6 +87,8 @@ for to in to_addrs: gpg_to.append( (to, to) ) elif cfg.has_key('keymap') and cfg['keymap'].has_key(to): gpg_to.append( (to, cfg['keymap'][to]) ) + else: + ungpg_to.append(to); else: ungpg_to.append(to)