From: Thomas Roessler <roessler@does-not-exist.org>
Date: Mon, 9 Dec 2002 18:38:28 +0000 (+0000)
Subject: Try to fix another obscure error in S/MIME auto-signing upon reply.
X-Git-Tag: mutt-1-5-3-rel~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f1c55ae438cc92a6f2d4ff4a51097bb84fcd7f0;p=mutt

Try to fix another obscure error in S/MIME auto-signing upon reply.
---

diff --git a/send.c b/send.c
index 0cebc532..01e39544 100644
--- a/send.c
+++ b/send.c
@@ -1250,9 +1250,9 @@ ci_send_message (int flags,		/* send mode */
 	msg->security |= SIGN;
       if (option (OPTCRYPTAUTOENCRYPT))
 	msg->security |= ENCRYPT;
-      if (option (OPTCRYPTREPLYENCRYPT) && cur && cur->security & ENCRYPT)
+      if (option (OPTCRYPTREPLYENCRYPT) && cur && (cur->security & ENCRYPT))
 	msg->security |= ENCRYPT;
-      if (option (OPTCRYPTREPLYSIGN) && cur && cur->security & SIGN)
+      if (option (OPTCRYPTREPLYSIGN) && cur && (cur->security & SIGN))
 	msg->security |= SIGN;
       if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur && cur->security & ENCRYPT)
 	msg->security |= SIGN;
@@ -1261,20 +1261,19 @@ ci_send_message (int flags,		/* send mode */
     if (msg->security && cur)
     {
 #ifdef HAVE_SMIME
-      if (cur->security & APPLICATION_SMIME || option (OPTSMIMEISDEFAULT))
+      if ((cur->security & APPLICATION_SMIME) || option (OPTSMIMEISDEFAULT))
         msg->security |= APPLICATION_SMIME;
 #endif
 #ifdef HAVE_PGP
       if (cur->security & APPLICATION_PGP)
       {
 #ifdef HAVE_SMIME
-        if (option (OPTSMIMEISDEFAULT))
-          msg->security &= ~APPLICATION_SMIME;
+	msg->security &= ~APPLICATION_SMIME;
 #endif
         msg->security |= APPLICATION_PGP;
       }
 #ifdef HAVE_SMIME
-      if (~cur->security && !option (OPTSMIMEISDEFAULT))
+      if (!(cur->security & (APPLICATION_PGP|APPLICATION_SMIME)))
 #endif
 	msg->security |= APPLICATION_PGP;
 #endif /* HAVE_PGP */