X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_login.c;h=bffa005320455f578811c7080a2b9ecf28129277;hp=25e7b38522d7c4090b2e8ce6bf9c1642910ebf44;hb=c7ef4c04b0e95e263768e4df06220525a5872dca;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/imap/auth_login.c b/imap/auth_login.c
index 25e7b38..bffa005 100644
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -13,6 +13,9 @@
 # include "config.h"
 #endif
 
+#include "lib/intl.h"
+#include "lib/debug.h"
+
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"
@@ -30,25 +33,16 @@ 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;
 
   mutt_message _("Logging in...");
 
-  imap_quote_string (q_user, sizeof (q_user), idata->conn->account.user);
+  imap_quote_string (q_user, sizeof (q_user), idata->conn->account.login);
   imap_quote_string (q_pass, sizeof (q_pass), idata->conn->account.pass);
 
-#ifdef DEBUG
-  /* don't print the password unless we're at the ungodly debugging level
-   * of 5 or higher */
-
-  if (debuglevel < IMAP_LOG_PASS)
-    dprint (2, (debugfile, "Sending LOGIN command for %s...\n",
-                idata->conn->account.user));
-#endif
-
   snprintf (buf, sizeof (buf), "LOGIN %s %s", q_user, q_pass);
   rc = imap_exec (idata, buf, IMAP_CMD_FAIL_OK | IMAP_CMD_PASS);