CHUNKING: flush input stream after message-fatal error detection. Bug 2201

[exim.git] / src / src / receive.c

diff --git a/src/src/receive.c b/src/src/receive.c
index 2812ea2c87743f5db2171cbf86e00c6c24d08a9e..ad9b6a2351c5ee05c4187da78690dd2bb78e461a 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1020,7 +1020,6 @@ for(;;)
 
 
 
-
 /*************************************************
 *             Swallow SMTP message               *
 *************************************************/
@@ -1037,9 +1036,10 @@ Returns:     nothing
 void
 receive_swallow_smtp(void)
 {
-/*XXX CHUNKING: not enough.  read chunks until RSET? */
 if (message_ended >= END_NOTENDED)
-  message_ended = read_message_data_smtp(NULL);
+  message_ended = chunking_state <= CHUNKING_OFFERED
+     ? read_message_data_smtp(NULL)
+     : read_message_bdat_smtp(NULL);
 }