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

diff --git a/imap/auth_login.c b/imap/auth_login.c
index 25e7b38..27e2156 100644
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -13,50 +13,44 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+#include "lib/debug.h"
+
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"
 
 /* imap_auth_login: Plain LOGIN support */
-imap_auth_res_t imap_auth_login (IMAP_DATA * idata, const char *method)
+imap_auth_res_t imap_auth_login(IMAP_DATA *idata, const char *method)
 {
-  char q_user[SHORT_STRING], q_pass[SHORT_STRING];
-  char buf[STRING];
-  int rc;
+    char q_user[SHORT_STRING], q_pass[SHORT_STRING];
+    char buf[STRING];
+    int rc;
 
-  if (mutt_bit_isset (idata->capabilities, LOGINDISABLED)) {
-    mutt_message _("LOGIN disabled on this server.");
+    if (mutt_bit_isset (idata->capabilities, LOGINDISABLED)) {
+        mutt_message _("LOGIN disabled on this server.");
 
-    return IMAP_AUTH_UNAVAIL;
-  }
+        return IMAP_AUTH_UNAVAIL;
+    }
 
-  if (mutt_account_getuser (&idata->conn->account))
-    return IMAP_AUTH_FAILURE;
-  if (mutt_account_getpass (&idata->conn->account))
-    return IMAP_AUTH_FAILURE;
+    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...");
+    mutt_message _("Logging in...");
 
-  imap_quote_string (q_user, sizeof (q_user), idata->conn->account.user);
-  imap_quote_string (q_pass, sizeof (q_pass), idata->conn->account.pass);
+    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 */
+    snprintf(buf, sizeof(buf), "LOGIN %s %s", q_user, q_pass);
+    rc = imap_exec(idata, buf, IMAP_CMD_FAIL_OK | IMAP_CMD_PASS);
 
-  if (debuglevel < IMAP_LOG_PASS)
-    dprint (2, (debugfile, "Sending LOGIN command for %s...\n",
-                idata->conn->account.user));
-#endif
+    if (!rc)
+        return IMAP_AUTH_SUCCESS;
 
-  snprintf (buf, sizeof (buf), "LOGIN %s %s", q_user, q_pass);
-  rc = imap_exec (idata, buf, IMAP_CMD_FAIL_OK | IMAP_CMD_PASS);
+    mutt_error _("Login failed.");
 
-  if (!rc)
-    return IMAP_AUTH_SUCCESS;
-
-  mutt_error _("Login failed.");
-
-  mutt_sleep (2);
-  return IMAP_AUTH_FAILURE;
+    mutt_sleep (2);
+    return IMAP_AUTH_FAILURE;
 }