<<< Date Index >>>     <<< Thread Index >>>

Re: For 1.5.9 - (problem w/ pgp_autoinline)



Thanks for the pointer.

I'm doing this:

--- pgp.c       3 Feb 2005 18:44:27 -0000       3.39
+++ pgp.c       19 Feb 2005 21:59:47 -0000
@@ -1486,6 +1486,11 @@
   
   if (!(WithCrypto & APPLICATION_PGP))
     return msg->security;
+
+  /* If autoinline and no crypto options set, then set inline. */
+  if (option (OPTPGPAUTOINLINE) && 
+      !((msg->security & APPLICATION_PGP) && (msg->security & (SIGN|ENCRYPT))))
+    msg->security |= INLINE;
   
   snprintf (prompt, sizeof (prompt), 
            _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "),

Regards,
-- 
Thomas Roessler · Personal soap box at <http://log.does-not-exist.org/>.





On 2005-02-16 22:05:00 -0800, Will Yardley wrote:
> From: Will Yardley <mutt-dev@xxxxxxxxxxxxxxxxx>
> To: mutt-dev@xxxxxxxx
> Date: Wed, 16 Feb 2005 22:05:00 -0800
> Subject: For 1.5.9 - (problem w/ pgp_autoinline)
> Mail-Followup-To: mutt-dev@xxxxxxxx
> X-Spam-Level: 
> 
> Not my patch, but I think this one fixes a bug with pgp_autoinline not
> working when not autosigning / autoencrypting.
> 
> See: http://marc.theaimsgroup.com/?l=mutt-dev&m=110742186705368&w=2
> 

> --- pgp.c.BAK Mon Jan 31 22:51:01 2005
> +++ pgp.c     Thu Feb  3 17:59:42 2005
> @@ -1475,6 +1475,7 @@
>  
>  int pgp_send_menu (HEADER *msg, int *redraw)
>  {
> +  int prefer_inline;
>    pgp_key_t p;
>    char input_signas[SHORT_STRING];
>  
> @@ -1482,6 +1483,13 @@
>    
>    if (!(WithCrypto & APPLICATION_PGP))
>      return msg->security;
> +  
> +  /* honour pgp_autoinline */
> +  prefer_inline = option(OPTPGPAUTOINLINE) ? INLINE : 0;
> +  prefer_inline = ((msg->security & APPLICATION_PGP)
> +                && (msg->security & (SIGN | ENCRYPT)))
> +               ? (msg->security & INLINE) : prefer_inline;
> +  msg->security |= prefer_inline;
>    
>    snprintf (prompt, sizeof (prompt), 
>           _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "),
> 
> --Q68bSM7Ycu6FN28Q--

Attachment: pgpA61CWHtgPV.pgp
Description: PGP signature