Nico Golde:

[apps/madmutt.git] / mutt_sasl.c

diff --git a/mutt_sasl.c b/mutt_sasl.c
index d78a7eb..5c661c7 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -123,7 +123,7 @@ static int iptostring (const struct sockaddr *addr, socklen_t addrlen,
   if (ret)
     return getnameinfo_err (ret);
 
-  if (outlen < safe_strlen (hbuf) + safe_strlen (pbuf) + 2)
+  if (outlen < mutt_strlen (hbuf) + mutt_strlen (pbuf) + 2)
     return SASL_BUFOVER;
 
   snprintf (out, outlen, "%s;%s", hbuf, pbuf);
@@ -367,7 +367,7 @@ int mutt_sasl_interact (sasl_interact_t * interaction)
     if (mutt_get_field (prompt, resp, sizeof (resp), 0))
       return SASL_FAIL;
 
-    interaction->len = safe_strlen (resp) + 1;
+    interaction->len = mutt_strlen (resp) + 1;
     interaction->result = safe_malloc (interaction->len);
     memcpy (interaction->result, resp, interaction->len);
 
@@ -471,7 +471,7 @@ static int mutt_sasl_cb_authname (void *context, int id, const char **result,
   }
 
   if (len)
-    *len = safe_strlen (*result);
+    *len = mutt_strlen (*result);
 
   return SASL_OK;
 }
@@ -491,7 +491,7 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id,
   if (mutt_account_getpass (account))
     return SASL_FAIL;
 
-  len = safe_strlen (account->pass);
+  len = mutt_strlen (account->pass);
 
   *psecret = (sasl_secret_t *) safe_malloc (sizeof (sasl_secret_t) + len);
   (*psecret)->len = len;