projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build system simplifications.
[apps/madmutt.git]
/
mutt_sasl.c
diff --git
a/mutt_sasl.c
b/mutt_sasl.c
index
374082b
..
219c36d
100644
(file)
--- a/
mutt_sasl.c
+++ b/
mutt_sasl.c
@@
-11,6
+11,8
@@
#include <lib-lib/lib-lib.h>
#include <lib-lib/lib-lib.h>
+#ifdef USE_SASL
+
#include <netdb.h>
#include <sasl/sasl.h>
#include <sys/socket.h>
#include <netdb.h>
#include <sasl/sasl.h>
#include <sys/socket.h>
@@
-186,8
+188,8
@@
int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn)
int mutt_sasl_interact (sasl_interact_t * interaction)
{
int mutt_sasl_interact (sasl_interact_t * interaction)
{
- char prompt[S
HORT_S
TRING];
- char resp[S
HORT_S
TRING];
+ char prompt[STRING];
+ char resp[STRING];
while (interaction->id != SASL_CB_LIST_END) {
snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt);
while (interaction->id != SASL_CB_LIST_END) {
snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt);
@@
-285,7
+287,8
@@
static int mutt_sasl_cb_authname (void *context, int id, const char **result,
return SASL_OK;
}
return SASL_OK;
}
-static int mutt_sasl_cb_pass(sasl_conn_t *conn, void *context, int id,
+static int mutt_sasl_cb_pass(sasl_conn_t *conn __attribute__ ((unused)),
+ void *context, int id __attribute__ ((unused)),
sasl_secret_t **psecret)
{
ACCOUNT *account = (ACCOUNT *) context;
sasl_secret_t **psecret)
{
ACCOUNT *account = (ACCOUNT *) context;
@@
-301,7
+304,7
@@
static int mutt_sasl_cb_pass(sasl_conn_t *conn, void *context, int id,
*psecret = xmalloc(sizeof(sasl_secret_t) + len);
(*psecret)->len = len;
*psecret = xmalloc(sizeof(sasl_secret_t) + len);
(*psecret)->len = len;
-
strcpy((char*)(*psecret)->data, account->pass
);
+
memcpy((char*)(*psecret)->data, account->pass, len
);
return SASL_OK;
}
return SASL_OK;
}
@@
-433,9
+436,9
@@
mutt_sasl_conn_write(CONNECTION * conn, const char *buf, ssize_t len)
goto fail;
}
goto fail;
}
-
rc
= (sasldata->msasl_write)(conn, pbuf, plen);
+
plen -
= (sasldata->msasl_write)(conn, pbuf, plen);
p_delete(&pbuf);
p_delete(&pbuf);
- if (
rc !=
plen)
+ if (plen)
goto fail;
len -= olen;
goto fail;
len -= olen;
@@
-454,3
+457,5
@@
fail:
conn->sockdata = sasldata;
return -1;
}
conn->sockdata = sasldata;
return -1;
}
+
+#endif /* USE_SASL */