[Nmh-commits] nmh ChangeLog mts/smtp/smtp.c

[Peter Maydell]

CVSROOT:        /cvsroot/nmh
Module name:    nmh
Changes by:     Peter Maydell <pm215>   08/04/29 20:53:34

Modified files:
        .              : ChangeLog 
        mts/smtp       : smtp.c 

Log message:
        Revert previous SASL fix (wrong approach)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.258&r2=1.259
http://cvs.savannah.gnu.org/viewcvs/nmh/mts/smtp/smtp.c?cvsroot=nmh&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/nmh/nmh/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -b -r1.258 -r1.259
--- ChangeLog   29 Apr 2008 17:04:38 -0000      1.258
+++ ChangeLog   29 Apr 2008 20:53:33 -0000      1.259
@@ -1,5 +1,10 @@
 2008-04-29  Peter Maydell  <address@hidden>
 
+       * Revert previous attempt at fix for SASL issue as it
+       is the wrong approach.
+
+2008-04-29  Peter Maydell  <address@hidden>
+
        * Cope with sasl_decode64() returning SASL_CONTINUE, as
        happens with newer sasl libraries and LOGIN auth.
 

Index: mts/smtp/smtp.c
===================================================================
RCS file: /cvsroot/nmh/nmh/mts/smtp/smtp.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- mts/smtp/smtp.c     29 Apr 2008 17:04:38 -0000      1.20
+++ mts/smtp/smtp.c     29 Apr 2008 20:53:33 -0000      1.21
@@ -1,7 +1,7 @@
 /*
  * smtp.c -- nmh SMTP interface
  *
- * $Id: smtp.c,v 1.20 2008/04/29 17:04:38 pm215 Exp $
+ * $Id: smtp.c,v 1.21 2008/04/29 20:53:33 pm215 Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -1246,7 +1246,7 @@
            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));