X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth.c;h=d4b4efd5f9d7d4f62942bfe1376fb98a7293619d;hp=4861fbbe9c85c854d0d03890fb92f287ef3e868a;hb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/imap/auth.c b/imap/auth.c
index 4861fbb..d4b4efd 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -17,12 +17,10 @@
 
 #include <lib-lib/mem.h>
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "imap_private.h"
 #include "auth.h"
 
@@ -56,7 +54,7 @@ int imap_authenticate (IMAP_DATA * idata)
 
   if (ImapAuthenticators && *ImapAuthenticators) {
     /* Try user-specified list of authentication methods */
-    methods = str_dup (ImapAuthenticators);
+    methods = m_strdup(ImapAuthenticators);
 
     for (method = methods; method; method = delim) {
       delim = strchr (method, ':');
@@ -65,7 +63,6 @@ int imap_authenticate (IMAP_DATA * idata)
       if (!method[0])
         continue;
 
-      debug_print (2, ("Trying method %s\n", method));
       authenticator = imap_authenticators;
 
       while (authenticator->authenticate) {
@@ -85,7 +82,6 @@ int imap_authenticate (IMAP_DATA * idata)
   }
   else {
     /* Fall back to default: any authenticator */
-    debug_print (2, ("Using any available method.\n"));
     authenticator = imap_authenticators;
 
     while (authenticator->authenticate) {