From e1eb49d3e9cae587840ce5389854d2d1d79bbbed Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Tue, 6 Apr 2021 09:24:57 -0600 Subject: * Always follow ‘suppress-asterisks-in-password-prompt’ setting in the various password prompts. Submitted by Étienne Deparis. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alpine/mailcmd.c | 3 ++- alpine/smime.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'alpine') diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c index afc0a48d..66a8ae35 100644 --- a/alpine/mailcmd.c +++ b/alpine/mailcmd.c @@ -366,7 +366,8 @@ alpine_smime_confirm_save(char *email) int alpine_get_password(char *prompt, char *pass, size_t len) { - int flags = OE_PASSWD | OE_DISALLOW_HELP; + int flags = F_ON(F_QUELL_ASTERISKS, ps_global) ? OE_PASSWD_NOAST : OE_PASSWD; + flags |= OE_DISALLOW_HELP; pass[0] = '\0'; return optionally_enter(pass, -(ps_global->ttyo ? FOOTER_ROWS(ps_global) : 3), diff --git a/alpine/smime.c b/alpine/smime.c index 5dadcaba..f119f394 100644 --- a/alpine/smime.c +++ b/alpine/smime.c @@ -87,7 +87,8 @@ smime_get_passphrase(void) _("Enter passphrase for <%s>: "), (ps_global->smime && ps_global->smime->passphrase_emailaddr) ? ps_global->smime->passphrase_emailaddr[0] : "unknown"); do { - flags = OE_PASSWD | OE_DISALLOW_HELP; + flags = F_ON(F_QUELL_ASTERISKS, ps_global) ? OE_PASSWD_NOAST : OE_PASSWD; + flags |= OE_DISALLOW_HELP; ((char *) ps_global->smime->passphrase)[0] = '\0'; rc = optionally_enter((char *) ps_global->smime->passphrase, -FOOTER_ROWS(ps_global), 0, -- cgit v1.2.3-54-g00ecf