X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpinvoke.c;h=ac3145a47595fcbd7bd0ff5155de7bceff5ea599;hp=8bbc4f7e0b5299a45f4b08148d35e535ad6753c9;hb=0b94e5518f3859ba10697f34978122d8e3adb334;hpb=6833ce8bdca2d64e14485118f2a4417b7e1cb1b1

diff --git a/pgpinvoke.c b/pgpinvoke.c
index 8bbc4f7..ac3145a 100644
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -23,6 +23,10 @@
  * is almost entirely format based.
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -123,7 +127,7 @@ const char *_mutt_fmt_pgp_command (char *dest,
 	snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
 	snprintf (dest, destlen, fmt, cctx->need_passphrase ? "PGPPASSFD=0" : "");
       }
-      else if (!cctx->need_passphrase)
+      else if (!cctx->need_passphrase || pgp_use_gpg_agent())
 	optional = 0;
       break;
     }