From: Brendan Cully <brendan@kublai.com>
Date: Thu, 28 Jul 2005 19:47:40 +0000 (+0000)
Subject: Use mutt_account_getlogin instead of getuser for authentication methods that
X-Git-Tag: mutt-1-5-10-rel~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5406e58caffb284faa1c7a5827bfe445820fcea1;p=mutt

Use mutt_account_getlogin instead of getuser for authentication methods that
only support an authentication ID. As a side-effect, don't display a dangling
authentication name pointer in getpass.
---

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index b440dd2a..e2eebeb2 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -48,7 +48,7 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA* idata, const char* method)
   mutt_message _("Authenticating (CRAM-MD5)...");
 
   /* get auth info */
-  if (mutt_account_getuser (&idata->conn->account))
+  if (mutt_account_getlogin (&idata->conn->account))
     return IMAP_AUTH_FAILURE;
   if (mutt_account_getpass (&idata->conn->account))
     return IMAP_AUTH_FAILURE;
diff --git a/imap/auth_login.c b/imap/auth_login.c
index af1fa214..722ab5d9 100644
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -39,7 +39,7 @@ imap_auth_res_t imap_auth_login (IMAP_DATA* idata, const char* method)
     return IMAP_AUTH_UNAVAIL;
   }
 
-  if (mutt_account_getuser (&idata->conn->account))
+  if (mutt_account_getlogin (&idata->conn->account))
     return IMAP_AUTH_FAILURE;
   if (mutt_account_getpass (&idata->conn->account))
     return IMAP_AUTH_FAILURE;