projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
mutt_sasl.c
diff --git
a/mutt_sasl.c
b/mutt_sasl.c
index
b4d200c
..
095a9ae
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 (ret)
return getnameinfo_err (ret);
- if (outlen <
mutt_strlen (hbuf) + mutt_str
len (pbuf) + 2)
+ if (outlen <
str_len (hbuf) + str_
len (pbuf) + 2)
return SASL_BUFOVER;
snprintf (out, outlen, "%s;%s", hbuf, pbuf);
return SASL_BUFOVER;
snprintf (out, outlen, "%s;%s", hbuf, pbuf);
@@
-363,8
+363,8
@@
int mutt_sasl_interact (sasl_interact_t * interaction)
if (mutt_get_field (prompt, resp, sizeof (resp), 0))
return SASL_FAIL;
if (mutt_get_field (prompt, resp, sizeof (resp), 0))
return SASL_FAIL;
- interaction->len =
mutt_str
len (resp) + 1;
- interaction->result =
safe
_malloc (interaction->len);
+ interaction->len =
str_
len (resp) + 1;
+ interaction->result =
mem
_malloc (interaction->len);
memcpy ((char*) interaction->result, resp, interaction->len);
interaction++;
memcpy ((char*) interaction->result, resp, interaction->len);
interaction++;
@@
-391,7
+391,7
@@
int mutt_sasl_interact (sasl_interact_t * interaction)
* for the read/write methods. */
void mutt_sasl_setup_conn (CONNECTION * conn, sasl_conn_t * saslconn)
{
* for the read/write methods. */
void mutt_sasl_setup_conn (CONNECTION * conn, sasl_conn_t * saslconn)
{
- SASL_DATA *sasldata = (SASL_DATA *)
safe
_malloc (sizeof (SASL_DATA));
+ SASL_DATA *sasldata = (SASL_DATA *)
mem
_malloc (sizeof (SASL_DATA));
sasldata->saslconn = saslconn;
/* get ssf so we know whether we have to (en|de)code read/write */
sasldata->saslconn = saslconn;
/* get ssf so we know whether we have to (en|de)code read/write */
@@
-467,7
+467,7
@@
static int mutt_sasl_cb_authname (void *context, int id, const char **result,
}
if (len)
}
if (len)
- *len =
mutt_str
len (*result);
+ *len =
str_
len (*result);
return SASL_OK;
}
return SASL_OK;
}
@@
-487,9
+487,9
@@
static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id,
if (mutt_account_getpass (account))
return SASL_FAIL;
if (mutt_account_getpass (account))
return SASL_FAIL;
- len =
mutt_str
len (account->pass);
+ len =
str_
len (account->pass);
- *psecret = (sasl_secret_t *)
safe
_malloc (sizeof (sasl_secret_t) + len);
+ *psecret = (sasl_secret_t *)
mem
_malloc (sizeof (sasl_secret_t) + len);
(*psecret)->len = len;
strcpy ((char*) (*psecret)->data, account->pass); /* __STRCPY_CHECKED__ */
(*psecret)->len = len;
strcpy ((char*) (*psecret)->data, account->pass); /* __STRCPY_CHECKED__ */
@@
-532,9
+532,9
@@
static int mutt_sasl_conn_close (CONNECTION * conn)
/* release sasl resources */
sasl_dispose (&sasldata->saslconn);
#ifndef USE_SASL2
/* release sasl resources */
sasl_dispose (&sasldata->saslconn);
#ifndef USE_SASL2
-
FREE
(&sasldata->buf);
+
mem_free
(&sasldata->buf);
#endif
#endif
-
FREE
(&sasldata);
+
mem_free
(&sasldata);
/* call underlying close */
rc = (conn->conn_close) (conn);
/* call underlying close */
rc = (conn->conn_close) (conn);
@@
-565,7
+565,7
@@
static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len)
conn->sockdata = sasldata->sockdata;
#ifndef USE_SASL2
conn->sockdata = sasldata->sockdata;
#ifndef USE_SASL2
-
FREE
(&sasldata->buf);
+
mem_free
(&sasldata->buf);
#endif
sasldata->bpos = 0;
sasldata->blen = 0;
#endif
sasldata->bpos = 0;
sasldata->blen = 0;
@@
-636,7
+636,7
@@
static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf,
rc = (sasldata->msasl_write) (conn, pbuf, plen);
#ifndef USE_SASL2
rc = (sasldata->msasl_write) (conn, pbuf, plen);
#ifndef USE_SASL2
-
FREE
(&pbuf);
+
mem_free
(&pbuf);
#endif
if (rc != plen)
goto fail;
#endif
if (rc != plen)
goto fail;