projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use safer p_clear when possible.
[apps/madmutt.git]
/
imap
/
auth_login.c
diff --git
a/imap/auth_login.c
b/imap/auth_login.c
index
25e7b38
..
27e2156
100644
(file)
--- a/
imap/auth_login.c
+++ b/
imap/auth_login.c
@@
-13,50
+13,44
@@
# include "config.h"
#endif
# 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 */
#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;
}
}