This should fix the multiple-line problem.

diff --git a/win32/sendmail.c b/win32/sendmail.c
index 58182c00e64a0a58ff61aa8004647e656cf6f6b7..0e3ddb34e8c3980ae620afa22e6dd71c185bbfc2 100644 (file)
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -493,9 +493,12 @@ int Ack()
 
        /* Check for newline */
        Index += rlen;
-       if ((buf[Received - 2] != '\r') || (buf[Received - 1] != '\n'))
+       
+       if ((buf[Received - 4] == ' ' && buf[Received - 3] == '-') ||
+           (buf[Received - 2] != '\r') || (buf[Received - 1] != '\n'))
                /* err_msg          fprintf(stderr,"Incomplete server message. Awaiting CRLF\n"); */
-               goto again;                             /* Incomplete data. Line must be terminated by CRLF */
+               goto again;                             /* Incomplete data. Line must be terminated by CRLF
+                                          And not contain a space followed by a '-' */
 
        if (buf[0] > '3')
                return (SMTP_SERVER_ERROR);