You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

531430-imapuser.patch 881B

1234567891011121314151617181920212223242526
  1. From: Antonio Radici <antonio@debian.org>
  2. Date: Thu, 27 Feb 2014 16:36:23 +0100
  3. Subject: 531430-imapuser
  4. Fixes a problem where the imap->login has the precedence
  5. so the user is asked with wrong informaton,
  6. see upstream #3240.
  7. Gbp-Pq: Topic upstream
  8. ---
  9. account.c | 2 +-
  10. 1 file changed, 1 insertion(+), 1 deletion(-)
  11. diff --git a/account.c b/account.c
  12. index f738991..bf59995 100644
  13. --- a/account.c
  14. +++ b/account.c
  15. @@ -222,7 +222,7 @@ int mutt_account_getpass (ACCOUNT* account)
  16. else
  17. {
  18. snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),
  19. - account->flags & M_ACCT_LOGIN ? account->login : account->user,
  20. + ((account->flags & M_ACCT_LOGIN) && !(account->user)) ? account->login : account->user,
  21. account->host);
  22. account->pass[0] = '\0';
  23. if (mutt_get_password (prompt, account->pass, sizeof (account->pass)))