On Tue, Oct 14, 2003 at 04:44:53PM +0200, René Clerc wrote: " * hal King <hck@xxxxxxx> [14-10-2003 16:39]: " " > Almost everytime I go to sign mail, I find I'm not looking at my default sig. " > Also PGP keeps trying to sign mail, even thought it is disabled. I have the " > proper sig set as default in my muttrc. I'm running 1.5.4i. " " October 8th, I posted a message with ID <20031007222829.GF5516@xxxxxxxx> " to this list, containing an already committed patch by Thomas Roessler " to overcome these problems. Mutt 1.5.4 is indeed broken in this " respect. " Thanks for the response but, The patch addresses 1.5.1 I'm using 1.5.4i. The patch does not function in the source directory, nor above (where it would fail on directory). Are you saying I need to go back to 1.5.1? patch attached as I got it from the web. -- hal king Unix System Group / The University of Tennessee at Knoxville Volkswagen of Vengeance? nm, just remember that "xp" only works correctly in vi
--- mutt-1.5.1/send.c Mon Feb 18 15:55:09 2002
+++ mutt-devel/send.c Tue Oct 8 09:51:04 2002
@@ -1235,26 +1235,39 @@
msg->security |= SIGN;
if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur && cur->security &
ENCRYPT)
msg->security |= SIGN;
-
-#ifdef HAVE_PGP
- if (msg->security)
- msg->security |= APPLICATION_PGP; /* default is PGP */
-#endif
+ }
+ if (msg->security && cur)
+ {
#ifdef HAVE_SMIME
- if (msg->security && ((cur && cur->security & APPLICATION_SMIME) ||
- option (OPTSMIMEISDEFAULT)))
- {
+ if (cur->security & APPLICATION_SMIME || option (OPTSMIMEISDEFAULT))
+ msg->security |= APPLICATION_SMIME;
+#endif
#ifdef HAVE_PGP
- /* if not both.. */
- msg->security ^= APPLICATION_PGP;
+ if (cur->security & APPLICATION_PGP)
+ {
+#ifdef HAVE_SMIME
+ if (option (OPTSMIMEISDEFAULT))
+ msg->security ^= APPLICATION_SMIME;
#endif
- msg->security |= APPLICATION_SMIME;
+ msg->security |= APPLICATION_PGP;
}
-#endif /* HAVE_SMIME */
+#endif /* HAVE_PGP */
+ }
+ else if (msg->security)
+ {
+#ifdef HAVE_PGP
+ msg->security |= APPLICATION_PGP;
+#ifdef HAVE_SMIME
+ if (option (OPTSMIMEISDEFAULT))
+ {
+ msg->security |= APPLICATION_SMIME;
+ msg->security ^= APPLICATION_PGP;
+ }
+#endif
+#endif /* HAVE_PGP */
}
#endif /* HAVE_PGP || HAVE_SMIME */
-
}
Attachment:
smime.p7s
Description: S/MIME cryptographic signature