summaryrefslogtreecommitdiff
path: root/alpine
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2021-04-06 09:24:57 -0600
committerEduardo Chappa <chappa@washington.edu>2021-04-06 09:24:57 -0600
commite1eb49d3e9cae587840ce5389854d2d1d79bbbed (patch)
treee80c5f267df7df33766ba860d5377dabda511dff /alpine
parentac5b691c26f847763c41d2bcee773c78dc8b295b (diff)
downloadalpine-e1eb49d3e9cae587840ce5389854d2d1d79bbbed.tar.xz
* Always follow ‘suppress-asterisks-in-password-prompt’ setting in the
various password prompts. Submitted by Étienne Deparis.
Diffstat (limited to 'alpine')
-rw-r--r--alpine/mailcmd.c3
-rw-r--r--alpine/smime.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c
index afc0a48..66a8ae3 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 5dadcab..f119f39 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,