From: René Clerc <rene@clerc.nl>
Date: Tue, 22 Oct 2002 21:22:45 +0000 (+0000)
Subject: Another crypt_reply fix.
X-Git-Tag: mutt-1-5-2-rel~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e3c906085ea8c9bf538db1d51692de13920cf65;p=mutt

Another crypt_reply fix.
---

diff --git a/send.c b/send.c
index 0f7ed7d6..c4a545d2 100644
--- a/send.c
+++ b/send.c
@@ -1261,10 +1261,12 @@ ci_send_message (int flags,		/* send mode */
       {
 #ifdef HAVE_SMIME
         if (option (OPTSMIMEISDEFAULT))
-          msg->security ^= APPLICATION_SMIME;
+          msg->security &= ~APPLICATION_SMIME;
 #endif
         msg->security |= APPLICATION_PGP;
       }
+      if (~cur->security && !option (OPTSMIMEISDEFAULT))
+	msg->security |= APPLICATION_PGP;
 #endif /* HAVE_PGP */
     }
     else if (msg->security)
@@ -1275,7 +1277,7 @@ ci_send_message (int flags,		/* send mode */
       if (option (OPTSMIMEISDEFAULT))
       {
         msg->security |= APPLICATION_SMIME;
-        msg->security ^= APPLICATION_PGP;
+        msg->security &= ~APPLICATION_PGP;
       }
 #endif
 #endif /* HAVE_PGP */