warning fixes

[apps/madmutt.git] / imap / auth_login.c

diff --git a/imap/auth_login.c b/imap/auth_login.c
index 51667fb..bffa005 100644 (file)
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -1,19 +1,10 @@
 /*
 /*

+ * Copyright notice from original mutt:

  * Copyright (C) 1999-2001 Brendan Cully <brendan@kublai.com>
  * Copyright (C) 1999-2001 Brendan Cully <brendan@kublai.com>

- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.

  */
 
 /* plain LOGIN support */
  */
 
 /* plain LOGIN support */


@@ -22,6 +13,9 @@
 # include "config.h"
 #endif
 
 # include "config.h"
 #endif
 

+#include "lib/intl.h"
+#include "lib/debug.h"
+

 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"


@@ -39,25 +33,16 @@ imap_auth_res_t imap_auth_login (IMAP_DATA * idata, const char *method)
     return IMAP_AUTH_UNAVAIL;
   }
 
     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...");
 
     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);
 
   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);
 
   snprintf (buf, sizeof (buf), "LOGIN %s %s", q_user, q_pass);
   rc = imap_exec (idata, buf, IMAP_CMD_FAIL_OK | IMAP_CMD_PASS);