X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_sasl.c;h=b8b1e3ce64128e0d0f9d3237cc5187d0ebcf6048;hp=f9be1807dc224fb4c167ad49b4494706d29b358c;hb=108f3c7ab59844591f7540347914ea57be5245e2;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index f9be180..b8b1e3c 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -14,16 +14,15 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "mutt_sasl.h"
 #include "imap_private.h"
 #include "auth.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
 
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
@@ -111,7 +110,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
 
     if (irc == IMAP_CMD_RESPOND) {
       if (sasl_decode64
-          (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
+          (idata->cmd.buf + 2, m_strlen(idata->cmd.buf + 2), buf,
            LONG_STRING - 1,
                          &len) != SASL_OK) {
         debug_print (1, ("error base64-decoding server response.\n"));
@@ -142,7 +141,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
     }
 
     if (irc == IMAP_CMD_RESPOND) {
-      strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
+      m_strcpy(buf + olen, sizeof(buf) - olen, "\r\n");
       mutt_socket_write (idata->conn, buf);
     }