projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the ispell stuff, it's useless, most editors know how to do this,
[apps/madmutt.git]
/
imap
/
auth_login.c
diff --git
a/imap/auth_login.c
b/imap/auth_login.c
index
c460a5b
..
023c654
100644
(file)
--- a/
imap/auth_login.c
+++ b/
imap/auth_login.c
@@
-9,57
+9,43
@@
/* plain LOGIN support */
/* plain LOGIN support */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "lib/intl.h"
-#include "lib/debug.h"
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "imap_private.h"
#include "auth.h"
/* imap_auth_login: Plain LOGIN support */
#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 __attribute__ ((unused))
)
{
{
- 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.");
-
- return IMAP_AUTH_UNAVAIL;
- }
+ char q_user[STRING], q_pass[STRING];
+ char buf[STRING];
+ int rc;
- if (mutt_account_getuser (&idata->conn->account))
- return IMAP_AUTH_FAILURE;
- if (mutt_account_getpass (&idata->conn->account))
- return IMAP_AUTH_FAILURE;
+ if (mutt_bit_isset (idata->capabilities, LOGINDISABLED)) {
+ mutt_message _("LOGIN disabled on this server.");
- mutt_message _("Logging in...");
+ return IMAP_AUTH_UNAVAIL;
+ }
- imap_quote_string (q_user, sizeof (q_user), idata->conn->account.user);
- imap_quote_string (q_pass, sizeof (q_pass), idata->conn->account.pass);
+ if (mutt_account_getlogin (&idata->conn->account))
+ return IMAP_AUTH_FAILURE;
+ if (mutt_account_getpass (&idata->conn->account))
+ return IMAP_AUTH_FAILURE;
-#ifdef DEBUG
- /* don't print the password unless we're at the ungodly debugging level
- * of 5 or higher */
+ mutt_message _("Logging in...");
- if (DebugLevel < IMAP_LOG_PASS)
- debug_print (2, ("Sending LOGIN command for %s...\n",
- idata->conn->account.user));
-#endif
+ imap_quote_string(q_user, sizeof(q_user), idata->conn->account.login);
+ imap_quote_string(q_pass, sizeof(q_pass), idata->conn->account.pass);
-
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);
- if (!rc)
- return IMAP_AUTH_SUCCESS;
+
if (!rc)
+
return IMAP_AUTH_SUCCESS;
- mutt_error _("Login failed.");
+
mutt_error _("Login failed.");
- mutt_sleep (2);
- return IMAP_AUTH_FAILURE;
+
mutt_sleep (2);
+
return IMAP_AUTH_FAILURE;
}
}