Merge branch 'master' of github.com:uakfdotb/gpg-mailgate

This commit is contained in:
perennate 2013-09-23 23:29:41 -04:00
commit 4942419db7
2 changed files with 6 additions and 1 deletions

View file

@ -3,6 +3,11 @@
# this may be useful for debugging purposes
add_header = yes
# whether we should only sign emails if they are explicitly defined in
# the key mappings below ([keymap] section)
# this means gpg-mailgate won't automatically detect PGP recipients
keymap_only = no
[gpg]
# the directory where gpg-mailgate public keys are stored
# (see INSTALL for details)

View file

@ -86,7 +86,7 @@ gpg_to = list()
ungpg_to = list()
for to in to_addrs:
if to in keys:
if to in keys and not ( cfg['default'].has_key('keymap_only') and cfg['default']['keymap_only'] == 'yes' ):
gpg_to.append( (to, to) )
elif cfg.has_key('keymap') and cfg['keymap'].has_key(to):
gpg_to.append( (to, cfg['keymap'][to]) )