Revert previous SASL fix (wrong approach)

diff --git a/ChangeLog b/ChangeLog
index 046a118865f9383d8440bb77d33cdc95d547dd40..9a7b310884586dfbce10acef9c0c932217d351d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-29  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
+
+       * Revert previous attempt at fix for SASL issue as it
+       is the wrong approach.
+
 2008-04-29  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
 
        * Cope with sasl_decode64() returning SASL_CONTINUE, as

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