Changeset 4114:0752255e83ae for account.c

Timestamp:

2005-08-01 17:37:41 (3 years ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

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

Files:

• account.c (modified) (2 diffs)

account.c

@@ -172 +172 @@
   {
     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;
@@ -203 +208 @@
   {
     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)))