Backport fix from trunk for SASL bug.

diff --git a/ChangeLog b/ChangeLog
index c0f38c2a6a4fd70bb712b5bdad268938421a1794..4e42901e350a95c7db09cea15e9cd97d68ef3b5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-29  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
+
+       * Port fix from trunk for SASL not working with newer libsasl.
+
 2008-04-27  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
 
        * Released nmh-1.3 RC1.

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 1ab027f31f731da2d0178ea9fcc574786103c186..9527a5e1e8cfb1d0b082a22cc5426adf2ee5fbb7 100644 (file)
--- 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) {
+           if (result != SASL_OK && result != SASL_CONTINUE) {
                smtalk(SM_AUTH, "*");
                sm_ierror("SASL base64 decode failed: %s",
                          sasl_errstring(result, NULL, NULL));