Commit 6d5d27da authored by Brendan Cully's avatar Brendan Cully

Fix password prompt for POP (more authentication ID fallout).

parent e2646151
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment