From 4db5ba9a511564e4a3cb3d2b67bce4bb171eae4f Mon Sep 17 00:00:00 2001
From: Eduardo Chappa <chappa@washington.edu>
Date: Sun, 25 Jan 2015 18:52:13 -0700
Subject:    * new version 2.20.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

   * Ignore message from smtp server after a successful authentication
     challenge.

   * Alpine would not set include and lib paths for OpenSSL if this was
     installed in /usr/local/ssl.

   * If the .pinerc file is a symbolic link, Alpine might not write its
     contents when saving its configuration.

   * The _INIT_ token does not skip over non-alpha numeric characters in
     the name. Reported by Andreas Fehr.

   * If SSLDIR is defined somehow, do not disable S/MIME if the
     SSLCERTSDIR is not found.

   * Mismatch in size of UCS and CELL caused a corruption in the
     content of a pointer, which made the speller in PC-Alpine get
     the content of a word incorrectly.

   * Update splash screen to version 2.20 in main repository.

   * Skip testing openssl compatibility version when cross-compilation is
     detected. Fix contributed by Antti Seppälä.
---
 imap/src/c-client/smtp.c       | 7 +++++--
 imap/src/osdep/unix/tcp_unix.c | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'imap/src')

diff --git a/imap/src/c-client/smtp.c b/imap/src/c-client/smtp.c
index 1c72670c..1a79d28d 100644
--- a/imap/src/c-client/smtp.c
+++ b/imap/src/c-client/smtp.c
@@ -1,4 +1,5 @@
 /* ========================================================================
+ * Copyright 2015 Eduardo Chappa
  * Copyright 2008 Mark Crispin
  * ========================================================================
  */
@@ -9,7 +10,8 @@
  * Author:	Mark Crispin
  *
  * Date:	27 July 1988
- * Last Edited:	19 November 2008
+ * Last Edited:	19 November 2008 (Crispin)
+ * Last Edited: 16 January 2015 (Chappa)
  *
  * Previous versions of this file were
  *
@@ -345,8 +347,9 @@ void *smtp_challenge (void *s,unsigned long *len)
   if ((stream->replycode == SMTPAUTHREADY) &&
       !(ret = rfc822_base64 ((unsigned char *) stream->reply + 4,
 			     strlen (stream->reply + 4),len))) {
-    sprintf (tmp,"SMTP SERVER BUG (invalid challenge): %.80s",stream->reply+4);
+    sprintf (tmp,"SMTP SERVER BUG (invalid challenge, continuing): %.80s",stream->reply+4);
     mm_log (tmp,ERROR);
+    ret = cpystr("");	/* This is silly: fake a reply, it will be ignored */
   }
   return ret;
 }
diff --git a/imap/src/osdep/unix/tcp_unix.c b/imap/src/osdep/unix/tcp_unix.c
index 652f1250..4fe8194d 100644
--- a/imap/src/osdep/unix/tcp_unix.c
+++ b/imap/src/osdep/unix/tcp_unix.c
@@ -312,7 +312,7 @@ int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port,
 	/* This used to be a zero-byte read(), but that crashes Solaris */
 				/* get socket status */
 	if(FD_ISSET(sock,&rfds))
-	   while (((i = *ctr = read (sock,tmp,1)) < 0) && (errno == EINTR));
+	   while (((i = *ctr = read (sock,tmp,0)) < 0) && (errno == EINTR));
       }	
       if (i <= 0) {		/* timeout or error? */
 	i = i ? errno : ETIMEDOUT;/* determine error code */
-- 
cgit v1.2.3-54-g00ecf