From 56a5f74f59620a8113db86467edaf589a4038119 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Tue, 22 Sep 2015 19:47:51 -0600 Subject: * SMIME: Turn off automatic signing and encrypting of a message when bouncing. Suggested after a discussion with Matthias Rieber. --- alpine/mailcmd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'alpine') diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c index f066c898..e134e8dc 100644 --- a/alpine/mailcmd.c +++ b/alpine/mailcmd.c @@ -2419,6 +2419,16 @@ cmd_bounce(struct pine *state, MSGNO_S *msgmap, int aopt) } } +#ifdef SMIME + /* When we bounce a message, we will leave the original message + * intact, which means that it will not be signed or encrypted, + * so we turn off signing and encrypting now. It will be turned + * on again in send_exit_for_pico(). + */ + if(ps_global->smime) + ps_global->smime->do_sign = ps_global->smime->do_encrypt = 0; +#endif /* SMIME */ + rv = bounce(state, role); if(role) -- cgit v1.2.3-54-g00ecf