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

[Peter Maydell]

CVSROOT:        /sources/nmh
Module name:    nmh
Branch:         nmh-1_3-branch
Changes by:     Peter Maydell <pm215>   08/04/29 17:14:05

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

Log message:
        Backport fix from trunk for SASL bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&only_with_tag=nmh-1_3-branch&r1=1.254.2.1&r2=1.254.2.2
http://cvs.savannah.gnu.org/viewcvs/nmh/mts/smtp/smtp.c?cvsroot=nmh&only_with_tag=nmh-1_3-branch&r1=1.19&r2=1.19.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.254.2.1
retrieving revision 1.254.2.2
diff -u -b -r1.254.2.1 -r1.254.2.2
--- ChangeLog   27 Apr 2008 20:51:48 -0000      1.254.2.1
+++ ChangeLog   29 Apr 2008 17:14:03 -0000      1.254.2.2
@@ -1,3 +1,7 @@
+2008-04-29  Peter Maydell  <address@hidden>
+
+       * Port fix from trunk for SASL not working with newer libsasl.
+
 2008-04-27  Peter Maydell  <address@hidden>
 
        * Released nmh-1.3 RC1.

Index: mts/smtp/smtp.c
===================================================================
RCS file: /sources/nmh/nmh/mts/smtp/smtp.c,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -b -r1.19 -r1.19.2.1
--- mts/smtp/smtp.c     13 Apr 2007 11:53:08 -0000      1.19
+++ mts/smtp/smtp.c     29 Apr 2008 17:14:04 -0000      1.19.2.1
@@ -1,7 +1,7 @@
 /*
  * smtp.c -- nmh SMTP interface
  *
- * $Id: smtp.c,v 1.19 2007/04/13 11:53:08 jjr Exp $
+ * $Id: smtp.c,v 1.19.2.1 2008/04/29 17:14:04 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) {
+           if (result != SASL_OK && result != SASL_CONTINUE) {
                smtalk(SM_AUTH, "*");
                sm_ierror("SASL base64 decode failed: %s",
                          sasl_errstring(result, NULL, NULL));