--- confirm-crypt-hook/PATCHES Dec 2002 17:44:54 -0000 3.6 +++ confirm-crypt-hook/PATCHES Feb 2003 09:41:34 -0000 @@ -0,0 +1 @@ +patch-1.5.3.dw.confirm-crypt-hook.1 --- confirm-crypt-hook/init.h Dec 2002 18:09:49 -0000 3.28 +++ confirm-crypt-hook/init.h Feb 2003 09:41:35 -0000 @@ -1223,2 +1223,13 @@ struct option_t MuttVars[] = { */ +# ifdef HAVE_PGP + { "pgp_confirmhook", DT_SYN, R_NONE, UL "crypt_confirmhook", 1 }, +# endif + { "crypt_confirmhook", DT_BOOL, R_NONE, OPTCRYPTCONFIRMHOOK, 1 }, + /* + ** .pp + ** If set, then you will be prompted for confirmation of keys when using + ** the \fIcrypt-hook\fP command. If unset, no such confirmation prompt will + ** be presented. This is generally considered unsafe, especially where + ** typos are concerned. + */ #ifdef HAVE_PGP --- confirm-crypt-hook/mutt.h Dec 2002 08:53:21 -0000 3.12 +++ confirm-crypt-hook/mutt.h Feb 2003 09:41:36 -0000 @@ -444,2 +444,3 @@ enum #endif + OPTCRYPTCONFIRMHOOK, #ifdef HAVE_PGP --- confirm-crypt-hook/pgp.c Dec 2002 17:59:51 -0000 3.18 +++ confirm-crypt-hook/pgp.c Feb 2003 09:41:36 -0000 @@ -1092,3 +1092,3 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox); - if ((r = mutt_yesorno (buf, M_YES)) == M_YES) + if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, M_YES)) == M_YES) {