Rocco Rutte:

[apps/madmutt.git] / imap / auth_sasl.c

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 21af375..9230a87 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -14,6 +14,7 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
 #include "mutt_sasl.h"
 #include "imap_private.h"
 #include "auth.h"
@@ -129,10 +130,10 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
     if (irc == IMAP_CMD_RESPOND) {
 #ifdef USE_SASL2
       if (sasl_decode64
-          (idata->cmd.buf + 2, mutt_strlen (idata->cmd.buf + 2), buf,
+          (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
            LONG_STRING - 1,
 #else
-      if (sasl_decode64 (idata->cmd.buf + 2, mutt_strlen (idata->cmd.buf + 2), buf,
+      if (sasl_decode64 (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
 #endif
                          &len) != SASL_OK) {
         debug_print (1, ("error base64-decoding server response.\n"));
@@ -161,7 +162,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
       /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
        * free it */
 #ifndef USE_SASL2
-      FREE (&pc);
+      mem_free (&pc);
 #endif
     }