Fix bug in previous patch: following data is permitted after '.' so it

must not be diagnosed as an error. The check for vanished socket can
only be applied when there is no data pending.

5 files changed, 2 insertions, 92 deletions

diff --git a/test/stdout/0300 b/test/stdout/0300
index 8dd5a3cc1..a41df39d3 100644
--- a/test/stdout/0300
+++ b/test/stdout/0300
@@ -27,9 +27,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 354
 <<< 354 Enter message, ending with "." on a line by itself
 >>> the message
->>> .
+>>> .\r\nmail from:<userx@test.ex>
 +++ 1
->>> mail from:<userx@test.ex>
 >>> rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
 ??? 250
 <<< 250 OK id=10HmaX-0005vi-00
diff --git a/test/stdout/0301 b/test/stdout/0301
index 964f0c17b..198962d06 100644
--- a/test/stdout/0301
+++ b/test/stdout/0301
@@ -36,10 +36,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 354
 <<< 354 Enter message, ending with "." on a line by itself
 >>> the message
->>> .
+>>> .\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
 ??? 250
 <<< 250 OK id=10HmaX-0005vi-00
->>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
 ??? 250
 <<< 250 OK
 ??? 250
diff --git a/test/stdout/0559 b/test/stdout/0559
index eee1b2e43..71f5c4541 100644
--- a/test/stdout/0559
+++ b/test/stdout/0559
@@ -21,27 +21,3 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> .
 +++ 1
 End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo abcd
-??? 250-
-<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-PIPELINING
-??? 250
-<<< 250 HELP
->>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
-??? 250
-<<< 250 OK
-??? 250
-<<< 250 Accepted
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> This is a test message.
->>> .\r\nrset
-??? 550
-<<< 550 Synchronization error (data after final dot)
-End of script
diff --git a/test/stdout/2029 b/test/stdout/2029
index dd1bdaef8..1efa5cd7c 100644
--- a/test/stdout/2029
+++ b/test/stdout/2029
@@ -30,35 +30,3 @@ Succeeded in starting TLS
 >>> .
 +++ 1
 End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo abcd
-??? 250-
-<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 250
-<<< 250 Accepted
->>> data
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> This is a test message.
->>> .\r\nrset
-+++ 1
-End of script
diff --git a/test/stdout/2150 b/test/stdout/2150
index dd1bdaef8..1efa5cd7c 100644
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -30,35 +30,3 @@ Succeeded in starting TLS
 >>> .
 +++ 1
 End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo abcd
-??? 250-
-<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 250
-<<< 250 Accepted
->>> data
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> This is a test message.
->>> .\r\nrset
-+++ 1
-End of script