From: Arnaud Lacombe <al@sigfpe.info>

[apps/madmutt.git] / imap / auth.c

diff --git a/imap/auth.c b/imap/auth.c
index 4e30c9c..23473e1 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -1,21 +1,12 @@
 /*
+ * 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 */
@@ -24,7 +15,12 @@
 # include "config.h"
 #endif
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
+
 #include "mutt.h"
+#include "ascii.h"
 #include "imap_private.h"
 #include "auth.h"
 
@@ -58,7 +54,7 @@ int imap_authenticate (IMAP_DATA * idata)
 
   if (ImapAuthenticators && *ImapAuthenticators) {
     /* Try user-specified list of authentication methods */
-    methods = safe_strdup (ImapAuthenticators);
+    methods = str_dup (ImapAuthenticators);
 
     for (method = methods; method; method = delim) {
       delim = strchr (method, ':');
@@ -67,8 +63,7 @@ int imap_authenticate (IMAP_DATA * idata)
       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) {
@@ -76,7 +71,7 @@ int imap_authenticate (IMAP_DATA * idata)
             !ascii_strcasecmp (authenticator->method, method))
           if ((r = authenticator->authenticate (idata, method)) !=
               IMAP_AUTH_UNAVAIL) {
-            FREE (&methods);
+            mem_free (&methods);
             return r;
           }
 
@@ -84,12 +79,11 @@ int imap_authenticate (IMAP_DATA * idata)
       }
     }
 
-    FREE (&methods);
+    mem_free (&methods);
   }
   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) {