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 b440dd2a0f68f9b44a6f10c35d08d3cd01ccfd4f..e2eebeb2c8526b454cf8913dfc0451ccc027022f 100644 (file)
--- 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 af1fa21434a1daa11126134d7d2653a1627ad9fa..722ab5d910fac45a75e83b5cbfa08f6536569690 100644 (file)
--- 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;