From: pdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Thu, 28 Jul 2005 20:44:17 +0000 (+0000)
Subject: Rocco Rutte:
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=fb514a63a7f58b76577fb30bfa260ad1b9239c41

Rocco Rutte:
- merge in latest mutt changes


git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@365 e385b8ad-14ed-0310-8656-cc95a2468c6d
---

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index c0c2ee7..0417064 100644
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,3 +1,10 @@
+2005-07-28 19:47:40  Brendan Cully  <brendan@kublai.com>  (brendan)
+
+	* imap/auth_cram.c, imap/auth_login.c: 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.
+
 2005-07-27 15:08:43  Vincent Lefevre  <vincent@vinc17.org>  (brendan)
 
 	* crypt-gpgme.c: Correct two typos in GPGME error messages.
diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 3f3d8ff..3cf9c5f 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -42,7 +42,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 c460a5b..3d8ae67 100644
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -33,7 +33,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;