X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fauth_sasl.c;h=a3877580216bcfaedb448579335f6fbfb8038792;hb=25594eeaad2af2d06328b47283cfba72fa3bc8cd;hp=8544352878bc97cf9f5a79a6585cff3eb56c53e9;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;p=apps%2Fmadmutt.git

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 8544352..a387758 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -9,20 +9,13 @@
 
 /* SASL login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "mutt_sasl.h"
 #include "imap_private.h"
 #include "auth.h"
 
-#include <lib-lib/macros.h>
-
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 
@@ -59,7 +52,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
 
     if (mutt_bit_isset (idata->capabilities, AUTH_ANON) &&
         (!idata->conn->account.user[0] ||
-         !ascii_strncmp (idata->conn->account.user, "anonymous", 9)))
+         !m_strncmp(idata->conn->account.user, "anonymous", 9)))
       rc = sasl_client_start (saslconn, "AUTH=ANONYMOUS", NULL, &pc, &olen,
                               &mech);
   }