projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make taht shorter
[apps/madmutt.git]
/
imap
/
auth.c
diff --git
a/imap/auth.c
b/imap/auth.c
index
6f000ad
..
74aee4c
100644
(file)
--- a/
imap/auth.c
+++ b/
imap/auth.c
@@
-15,8
+15,11
@@
# include "config.h"
#endif
# include "config.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/mem.h>
+#include <lib-lib/debug.h>
+
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
#include "imap_private.h"
#include "mutt.h"
#include "imap_private.h"
@@
-37,7
+40,7
@@
static imap_auth_t imap_authenticators[] = {
#endif
{imap_auth_login, "login"},
#endif
{imap_auth_login, "login"},
- {NULL}
+ {NULL
, NULL
}
};
/* imap_authenticate: Attempt to authenticate using either user-specified
};
/* imap_authenticate: Attempt to authenticate using either user-specified
@@
-52,7
+55,7
@@
int imap_authenticate (IMAP_DATA * idata)
if (ImapAuthenticators && *ImapAuthenticators) {
/* Try user-specified list of authentication methods */
if (ImapAuthenticators && *ImapAuthenticators) {
/* Try user-specified list of authentication methods */
- methods =
safe_strdup
(ImapAuthenticators);
+ methods =
m_strdup
(ImapAuthenticators);
for (method = methods; method; method = delim) {
delim = strchr (method, ':');
for (method = methods; method; method = delim) {
delim = strchr (method, ':');
@@
-61,8
+64,7
@@
int imap_authenticate (IMAP_DATA * idata)
if (!method[0])
continue;
if (!method[0])
continue;
- dprint (2,
- (debugfile, "imap_authenticate: Trying method %s\n", method));
+ debug_print (2, ("Trying method %s\n", method));
authenticator = imap_authenticators;
while (authenticator->authenticate) {
authenticator = imap_authenticators;
while (authenticator->authenticate) {
@@
-70,7
+72,7
@@
int imap_authenticate (IMAP_DATA * idata)
!ascii_strcasecmp (authenticator->method, method))
if ((r = authenticator->authenticate (idata, method)) !=
IMAP_AUTH_UNAVAIL) {
!ascii_strcasecmp (authenticator->method, method))
if ((r = authenticator->authenticate (idata, method)) !=
IMAP_AUTH_UNAVAIL) {
-
FREE
(&methods);
+
p_delete
(&methods);
return r;
}
return r;
}
@@
-78,12
+80,11
@@
int imap_authenticate (IMAP_DATA * idata)
}
}
}
}
-
FREE
(&methods);
+
p_delete
(&methods);
}
else {
/* Fall back to default: any authenticator */
}
else {
/* Fall back to default: any authenticator */
- dprint (2,
- (debugfile, "imap_authenticate: Using any available method.\n"));
+ debug_print (2, ("Using any available method.\n"));
authenticator = imap_authenticators;
while (authenticator->authenticate) {
authenticator = imap_authenticators;
while (authenticator->authenticate) {