X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth.c;h=8b328078a86a4f9c8d74ba28f79f59e931a2ab6c;hp=47f305f098f0455fb36fc1c7748228d589bed9b8;hb=8e689b28eefc1a93797f299c33f7ec3e2e340329;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/imap/auth.c b/imap/auth.c
index 47f305f..8b32807 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -11,35 +11,15 @@
 
 /* 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"
 
 static imap_auth_t imap_authenticators[] = {
-#ifdef USE_SASL
   {imap_auth_sasl, NULL},
-#else
-  {imap_auth_anon, "anonymous"},
-#endif
-#ifdef USE_GSS
-  {imap_auth_gss, "gssapi"},
-#endif
-  /* SASL includes CRAM-MD5 (and GSSAPI, but that's not enabled by default) */
-#ifndef USE_SASL
-  {imap_auth_cram_md5, "cram-md5"},
-#endif
   {imap_auth_login, "login"},
-
   {NULL, NULL}
 };
 
@@ -64,7 +44,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 +63,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) {