X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.c;h=956b164003d327ba01ee0678c21ce6c9910110b2;hp=5bc1b707edf69209f8eda3549f0f7e7c7cc34494;hb=334faeb80904ba5b8ced869abfea2731440d52e5;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 5bc1b70..956b164 100644
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -13,22 +13,20 @@
 # include "config.h"
 #endif
 
-#include <lib-lib/mem.h>
-
-#include "mutt.h"
-#include "account.h"
-#include "mutt_sasl.h"
-#include "mutt_socket.h"
-
-#include "lib/debug.h"
-
 #include <errno.h>
 #include <netdb.h>
 #include <sasl/sasl.h>
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/debug.h>
+
+#include "mutt.h"
+#include "account.h"
+#include "mutt_sasl.h"
+#include <lib-sys/mutt_socket.h>
+
 static int getnameinfo_err (int ret)
 {
   int err;
@@ -116,7 +114,7 @@ static int iptostring (const struct sockaddr *addr, socklen_t addrlen,
   if (ret)
     return getnameinfo_err (ret);
 
-  if (outlen < str_len (hbuf) + str_len (pbuf) + 2)
+  if (outlen < m_strlen(hbuf) + m_strlen(pbuf) + 2)
     return SASL_BUFOVER;
 
   snprintf (out, outlen, "%s;%s", hbuf, pbuf);
@@ -257,7 +255,7 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn)
    * just fall back to LOGIN in the IMAP case anyway. If that doesn't
    * work for POP, we can make it a flag or move this code into
    * imap/auth_sasl.c */
-  memset (&secprops, 0, sizeof (secprops));
+  p_clear(&secprops, 1);
   /* Work around a casting bug in the SASL krb4 module */
   secprops.max_ssf = 0x7fff;
   secprops.maxbufsize = M_SASL_MAXBUF;
@@ -331,7 +329,7 @@ int mutt_sasl_interact (sasl_interact_t * interaction)
     if (mutt_get_field (prompt, resp, sizeof (resp), 0))
       return SASL_FAIL;
 
-    interaction->len = str_len (resp) + 1;
+    interaction->len = m_strlen(resp) + 1;
     interaction->result = p_dupstr(resp, interaction->len - 1);
     interaction++;
   }
@@ -429,7 +427,7 @@ static int mutt_sasl_cb_authname (void *context, int id, const char **result,
   }
 
   if (len)
-    *len = str_len (*result);
+    *len = m_strlen(*result);
 
   return SASL_OK;
 }
@@ -449,7 +447,7 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id,
   if (mutt_account_getpass (account))
     return SASL_FAIL;
 
-  len = str_len (account->pass);
+  len = m_strlen(account->pass);
 
   *psecret = xmalloc(sizeof(sasl_secret_t) + len);
   (*psecret)->len = len;