From 2a6f71af8fbe22624d0db37b82899f40a0381b3f Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Mon, 28 Jan 2002 10:17:56 +0000
Subject: [PATCH] S/MIME-related bug fixes from Brendan Cully.

---
 Makefile.am | 4 ++--
 hook.c      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 538e8fe3..da70ca92 100644
--- 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 9972a23a..9ac9c9b2 100644
--- 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 */
-- 
2.50.1