X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth.c;h=143fde0ac5d5e320652361d6a2b49091aad6af35;hp=2e6b8ca3471bbb57670bb47c662b73ad521608b0;hb=1ee89902de184a640c171ae3285bff6882a791bd;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/imap/auth.c b/imap/auth.c
index 2e6b8ca..143fde0 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -11,17 +11,9 @@
 
 /* IMAP login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-
-#include <lib-lib/macros.h>
-#include "lib/debug.h"
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "imap_private.h"
 #include "auth.h"
 
@@ -55,7 +47,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, ':');
@@ -64,7 +56,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) {
@@ -84,7 +75,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) {