X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fauth.c;h=6ec3c1b4fe11a6db33a2019ed8b76add8566fdbc;hb=0e654d058aa2b5027166bd3e535f85bbc4f214dc;hp=6f000add8c57c229f65ee2ea6f6b16fb93e6c982;hpb=492434e350e3ca2d3330c2589de3f9485929dab7;p=apps%2Fmadmutt.git

diff --git a/imap/auth.c b/imap/auth.c
index 6f000ad..6ec3c1b 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -17,6 +17,7 @@
 
 #include "lib/mem.h"
 #include "lib/intl.h"
+#include "lib/debug.h"
 
 #include "mutt.h"
 #include "imap_private.h"
@@ -52,7 +53,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, ':');
@@ -61,8 +62,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) {
@@ -70,7 +70,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;
           }
 
@@ -78,12 +78,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) {