S/MIME-related bug fixes from Brendan Cully.

diff --git a/Makefile.am b/Makefile.am
index 538e8fe30044eed549c055834e6fb62439624b1b..da70ca9283b25194a9d30ecd703410d8c64823c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,8 +99,8 @@ flea: muttbug.sh
        cp muttbug.sh flea
        chmod +x flea
 
-smime_keys: smime_keys.pl
-       cp smime_keys.pl smime_keys
+smime_keys: $(srcdir)/smime_keys.pl
+       cp $(srcdir)/smime_keys.pl smime_keys
        chmod +x smime_keys
 
 Makefile: $(BUILT_SOURCES)

diff --git a/hook.c b/hook.c
index 9972a23a94dcab7b8ea7c82ab334a323cfae56af..9ac9c9b292a25720bb1f9b526315297c609db194 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -87,7 +87,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
     memset (&pattern, 0, sizeof (pattern));
     pattern.data = safe_strdup (path);
   }
-  else if (DefaultHook && !(data & M_CHARSETHOOK)
+  else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
 #if defined(HAVE_PGP) || defined(HAVE_SMIME)
       && !(data & M_CRYPTHOOK)
 #endif /* HAVE_PGP */