X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fsmime.c;fp=lib-crypt%2Fsmime.c;h=33c53b001db6190a7de2c00b6894e46035fc047f;hb=8a2967d883cee12f0de4c0cdf0cd594ea96e622b;hp=0178d60e286325be241053e4257c4a1839871396;hpb=6896715a0d62173a620b2377dba8e6d2058c1ee2;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index 0178d60..33c53b0 100644
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -218,12 +218,11 @@ _mutt_fmt_smime_command (char *dest, ssize_t destlen, char op,
     break;
   }
 
-  if (optional)
-    m_strformat(dest, destlen, ifstr, _mutt_fmt_smime_command, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elstr, _mutt_fmt_smime_command, data, 0);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, optional ? ifstr : elstr,
+                _mutt_fmt_smime_command, data, 0);
 
-  return (src);
+  return src;
 }
 
 
@@ -232,7 +231,7 @@ static void mutt_smime_command (char *d, ssize_t dlen,
                                 struct smime_command_context *cctx,
                                 const char *fmt)
 {
-  m_strformat(d, dlen, NONULL (fmt), _mutt_fmt_smime_command, cctx, 0);
+    m_strformat(d, dlen, fmt, _mutt_fmt_smime_command, cctx, 0);
 }
 
 static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,