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

[Peter Maydell]

CVSROOT:        /sources/nmh
Module name:    nmh
Changes by:     Peter Maydell <pm215>   08/04/29 17:04:39

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

Log message:
        Cope with sasl_decode64() returning SASL_CONTINUE as well as SASL_OK.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- ChangeLog   27 Apr 2008 20:58:50 -0000      1.257
+++ ChangeLog   29 Apr 2008 17:04:38 -0000      1.258
@@ -1,3 +1,8 @@
+2008-04-29  Peter Maydell  <address@hidden>
+
+       * Cope with sasl_decode64() returning SASL_CONTINUE, as
+       happens with newer sasl libraries and LOGIN auth.
+
 2008-04-27  Peter Maydell  <address@hidden>
 
        * Updated some of the 'how to do a release' documentation.

Index: mts/smtp/smtp.c
===================================================================
RCS file: /sources/nmh/nmh/mts/smtp/smtp.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- mts/smtp/smtp.c     13 Apr 2007 11:53:08 -0000      1.19
+++ mts/smtp/smtp.c     29 Apr 2008 17:04:38 -0000      1.20
@@ -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.20 2008/04/29 17:04:38 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));