#include "mutt_sasl.h"
#include "mutt_socket.h"
-#include "lib/mem.h"
#include "lib/debug.h"
#include <errno.h>
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);
* 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;
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++;
}
}
if (len)
- *len = str_len (*result);
+ *len = m_strlen(*result);
return SASL_OK;
}
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;