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]
/
imap
/
auth_sasl.c
diff --git
a/imap/auth_sasl.c
b/imap/auth_sasl.c
index
075e4b5
..
fa1714f
100644
(file)
--- a/
imap/auth_sasl.c
+++ b/
imap/auth_sasl.c
@@
-14,6
+14,7
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "ascii.h"
#include "mutt_sasl.h"
#include "imap_private.h"
#include "auth.h"
#include "mutt_sasl.h"
#include "imap_private.h"
#include "auth.h"
@@
-129,10
+130,10
@@
imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
if (irc == IMAP_CMD_RESPOND) {
#ifdef USE_SASL2
if (sasl_decode64
if (irc == IMAP_CMD_RESPOND) {
#ifdef USE_SASL2
if (sasl_decode64
- (idata->cmd.buf + 2, s
afe_str
len (idata->cmd.buf + 2), buf,
+ (idata->cmd.buf + 2, s
tr_
len (idata->cmd.buf + 2), buf,
LONG_STRING - 1,
#else
LONG_STRING - 1,
#else
- if (sasl_decode64 (idata->cmd.buf + 2, s
afe_str
len (idata->cmd.buf + 2), buf,
+ if (sasl_decode64 (idata->cmd.buf + 2, s
tr_
len (idata->cmd.buf + 2), buf,
#endif
&len) != SASL_OK) {
debug_print (1, ("error base64-decoding server response.\n"));
#endif
&len) != SASL_OK) {
debug_print (1, ("error base64-decoding server response.\n"));
@@
-140,7
+141,10
@@
imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
}
}
}
}
- if (!client_start) {
+ /* client-start is only available with the SASL-IR extension, but
+ * SASL 2.1 seems to want to use it regardless, at least for DIGEST
+ * fast reauth. Override if the server sent an initial continuation */
+ if (!client_start || buf[0]) {
do {
rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen);
if (rc == SASL_INTERACT)
do {
rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen);
if (rc == SASL_INTERACT)
@@
-161,7
+165,7
@@
imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
#ifndef USE_SASL2
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
#ifndef USE_SASL2
-
FREE
(&pc);
+
mem_free
(&pc);
#endif
}
#endif
}