When pipelining under TLS do not treat fd-readability as tls-readability

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 0ffa2193946fb87dbc931647d44f6a3ec2194e82..92dbac4cee8bebcfa2df72e5cbdc4bd6764b8b3e 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -339,8 +339,8 @@ int fd, rc;
 fd_set fds;
 struct timeval tzero;
 
 fd_set fds;
 struct timeval tzero;
 

-if (tls_in.active >= 0 && tls_could_read())
-  return FALSE;
+if (tls_in.active >= 0)
+ return !tls_could_read();

 
 if (smtp_inptr < smtp_inend)
   return FALSE;
 
 if (smtp_inptr < smtp_inend)
   return FALSE;


@@ -3011,7 +3011,7 @@ if (rcpt_in_progress)
   rcpt_in_progress = FALSE;
   }
 
   rcpt_in_progress = FALSE;
   }
 

-/* Not output the message, splitting it up into multiple lines if necessary.
+/* Now output the message, splitting it up into multiple lines if necessary.

 We only handle pipelining these responses as far as nonfinal/final groups,
 not the whole MAIL/RCPT/DATA response set. */
 
 We only handle pipelining these responses as far as nonfinal/final groups,
 not the whole MAIL/RCPT/DATA response set. */