/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-8 Michael R. Elkins <me@mutt.org>
* Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
* 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.
*/
/* IMAP login/authentication code */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#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) {