/* IMAP login/authentication code */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "imap_private.h"
#endif
{imap_auth_login, "login"},
- {NULL}
+ {NULL, NULL}
};
/* imap_authenticate: Attempt to authenticate using either user-specified
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, ':');
if (!method[0])
continue;
- dprint (2,
- (debugfile, "imap_authenticate: Trying method %s\n", method));
authenticator = imap_authenticators;
while (authenticator->authenticate) {
!ascii_strcasecmp (authenticator->method, method))
if ((r = authenticator->authenticate (idata, method)) !=
IMAP_AUTH_UNAVAIL) {
- FREE (&methods);
+ p_delete(&methods);
return r;
}
}
}
- FREE (&methods);
+ p_delete(&methods);
}
else {
/* Fall back to default: any authenticator */
- dprint (2,
- (debugfile, "imap_authenticate: Using any available method.\n"));
authenticator = imap_authenticators;
while (authenticator->authenticate) {