X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_sasl.c;h=4d9df2640ef74aede786012ae8348828d812e953;hp=71b8f49ad66a7376b94f9bd309d1ae9c118d2109;hb=4670d23c56f21afaa7ef2e0289a47a6a0d112671;hpb=9afa66139f6099fc06d9866d4283191e43b0e17a

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 71b8f49..4d9df26 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -13,14 +13,15 @@
 # include "config.h"
 #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-lib/macros.h>
 #include "lib/debug.h"
 
 #include <sasl/sasl.h>
@@ -109,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"));
@@ -137,14 +138,10 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
         debug_print (1, ("error base64-encoding client response.\n"));
         goto bail;
       }
-
-      /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
-       * free it */
-      mem_free (&pc);
     }
 
     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);
     }