From 973488eb9c49a781f817d0e23a79d6416ad94654 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Tue, 2 Aug 2005 00:37:41 +0000 Subject: [PATCH] Fix password prompt for POP (more authentication ID fallout). --- account.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/account.c b/account.c index a71746b77..9647657dd 100644 --- a/account.c +++ b/account.c @@ -171,14 +171,19 @@ int mutt_account_getlogin (ACCOUNT* account) else if (account->type == M_ACCT_TYPE_IMAP) { if (ImapLogin) + { strfcpy (account->login, ImapLogin, sizeof (account->login)); - else { - mutt_account_getuser (account); - strfcpy (account->login, account->user, sizeof (account->login)); + account->flags |= M_ACCT_LOGIN; } } #endif + if (! account->flags & M_ACCT_LOGIN) + { + mutt_account_getuser (account); + strfcpy (account->login, account->user, sizeof (account->login)); + } + account->flags |= M_ACCT_LOGIN; return 0; @@ -202,7 +207,8 @@ int mutt_account_getpass (ACCOUNT* account) else { snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "), - account->login, account->host); + account->flags & M_ACCT_LOGIN ? account->login : account->user, + account->host); account->pass[0] = '\0'; if (mutt_get_password (prompt, account->pass, sizeof (account->pass))) return -1; -- 2.40.0