From 7995fb587acf227b08102c75e15c20418d06ad7d Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 29 Apr 2008 20:53:33 +0000 Subject: [PATCH] Revert previous SASL fix (wrong approach) --- ChangeLog | 5 +++++ mts/smtp/smtp.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 046a118..9a7b310 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-04-29 Peter Maydell + * Revert previous attempt at fix for SASL issue as it + is the wrong approach. + +2008-04-29 Peter Maydell + * Cope with sasl_decode64() returning SASL_CONTINUE, as happens with newer sasl libraries and LOGIN auth. diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c index 9527a5e..1ab027f 100644 --- a/mts/smtp/smtp.c +++ b/mts/smtp/smtp.c @@ -1246,7 +1246,7 @@ sm_auth_sasl(char *user, char *mechlist, char *host) result = sasl_decode64(sm_reply.text, sm_reply.length, outbuf, sizeof(outbuf), &outlen); - if (result != SASL_OK && result != SASL_CONTINUE) { + if (result != SASL_OK) { smtalk(SM_AUTH, "*"); sm_ierror("SASL base64 decode failed: %s", sasl_errstring(result, NULL, NULL)); -- 1.7.10.4