Testsuite: nail down hostname for CHUNKING test cases

6 files changed, 100 insertions, 100 deletions

diff --git a/test/stdout/0900 b/test/stdout/0900
index 28f479c22..bf6010f82 100644
--- a/test/stdout/0900
+++ b/test/stdout/0900
@@ -1,9 +1,9 @@
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -17,7 +17,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 88 last
@@ -31,14 +31,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250 OK id=10HmaX-0005vi-00
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -52,7 +52,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 100
@@ -74,7 +74,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 10
@@ -91,14 +91,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250 OK id=10HmaZ-0005vi-00
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -112,7 +112,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 89 last
@@ -121,14 +121,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Subject: This is a bodyless test message
 >>> 
 ??? 421
-<<< 421 the.local.host.name SMTP incoming data timeout - closing connection.
+<<< 421 testhost.test.ex SMTP incoming data timeout - closing connection.
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -142,7 +142,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 88
@@ -157,14 +157,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 504 zero size for BDAT command
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -178,7 +178,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 88
@@ -196,7 +196,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250 Reset OK
 >>> EHLO tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -210,7 +210,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 88
@@ -228,14 +228,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 503 only RSET accepted now
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -246,7 +246,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-CHUNKING
 ??? 250 HELP
 <<< 250 HELP
->>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@the.local.host.name>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
+>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
 ??? 250
 <<< 250 OK
 ??? 250
@@ -257,5 +257,5 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250 OK id=10HmbB-0005vi-00
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
diff --git a/test/stdout/0901 b/test/stdout/0901
index c1b40a430..88f2c40de 100644
--- a/test/stdout/0901
+++ b/test/stdout/0901
@@ -3,14 +3,14 @@
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250 CHUNKING
 MAIL FROM:<>
 250 OK
 RCPT TO:<a@test.ex>
 250 OK
-BDAT ddd LAST
+BDAT 343 LAST
 250 OK
 QUIT
 225 OK
@@ -19,26 +19,26 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250 CHUNKING
 MAIL FROM:<>
 250 good mail cmd
 RCPT TO:<b@test.ex>
 250 acceptable rcpt cmd
-BDAT ddd LAST
+BDAT 343 LAST
 Unxpected EOF read from client
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250 CHUNKING
 MAIL FROM:<>
 250 OK
 RCPT TO:<c@test.ex>
 250 OK
-BDAT ddd LAST
+BDAT 343 LAST
 250 OK
 
 Comparison failed - bailing out
@@ -46,14 +46,14 @@ Expected: QUIT
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250 CHUNKING
 MAIL FROM:<>
 250 OK
 RCPT TO:<d@test.ex>
 250 OK
-BDAT ddd LAST
+BDAT 343 LAST
 500 oops
 QUIT
 225 OK
@@ -61,14 +61,14 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250 CHUNKING
 MAIL FROM:<>
 250 OK
 RCPT TO:<e@test.ex>
 250 OK
-BDAT ddd LAST
+BDAT 343 LAST
 400 not right now
 QUIT
 225 OK
@@ -76,13 +76,13 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<p@test.ex>
-BDAT ddd LAST
+BDAT 343 LAST
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -93,24 +93,24 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<q@test.ex>
-BDAT ddd LAST
+BDAT 343 LAST
 Unxpected EOF read from client
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<r@test.ex>
-BDAT ddd LAST
+BDAT 343 LAST
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -120,13 +120,13 @@ Expected: QUIT
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s@test.ex>
-BDAT ddd LAST
+BDAT 343 LAST
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -136,13 +136,13 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s1@test.ex>
-BDAT ddd LAST
+BDAT 344 LAST
 450 greylisted mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -152,13 +152,13 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<t@test.ex>
-BDAT ddd LAST
+BDAT 343 LAST
 250 OK mail
 550 no such recipient
 500 oops bdat
@@ -168,13 +168,13 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<u@test.ex>
-BDAT ddd LAST
+BDAT 343 LAST
 250 OK mail
 250 OK rcpt
 500 oops bdat
@@ -184,13 +184,13 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<v@test.ex>
-BDAT ddd LAST
+BDAT 343 LAST
 250 OK mail
 250 OK rcpt
 400 not right now bdat
diff --git a/test/stdout/0902 b/test/stdout/0902
index 2c3a25381..5ab9a33f9 100644
--- a/test/stdout/0902
+++ b/test/stdout/0902
@@ -3,16 +3,16 @@
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250 CHUNKING
 MAIL FROM:<>
 250 OK
 RCPT TO:<a@test.ex>
 250 OK
-BDAT ddd
+BDAT 337
 250 OK nonlast bdat
-BDAT ddd LAST
+BDAT 8380 LAST
 250 OK bdat
 QUIT
 225 OK
@@ -21,14 +21,14 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250 CHUNKING
 MAIL FROM:<>
 250 OK
 RCPT TO:<d@test.ex>
 250 OK
-BDAT ddd
+BDAT 337
 500 oops bdat-nonlast
 QUIT
 225 OK
@@ -36,17 +36,17 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<p@test.ex>
-BDAT ddd
+BDAT 337
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
-BDAT ddd LAST
+BDAT 8380 LAST
 250 OK bdat
 QUIT
 225 OK
@@ -55,13 +55,13 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s@test.ex>
-BDAT ddd
+BDAT 337
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat (nonlast) ungood lacking mail-from
@@ -71,13 +71,13 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<t@test.ex>
-BDAT ddd
+BDAT 337
 250 OK mail
 550 no such recipient
 500 oops nonlast bdat - no rcpt
@@ -87,19 +87,19 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<t1@test.ex>
 RCPT TO:<t2@test.ex>
-BDAT ddd
+BDAT 321
 250 OK mail
 550 no such recipient
 250 good recipient
 200 OK nonlast bdat
-BDAT ddd LAST
+BDAT 8380 LAST
 250 OK bdat
 QUIT
 225 OK
@@ -107,13 +107,13 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<u@test.ex>
-BDAT ddd
+BDAT 337
 250 OK mail
 250 OK rcpt
 500 oops nonlast bdat
@@ -123,17 +123,17 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<v@test.ex>
-BDAT ddd
+BDAT 337
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
-BDAT ddd LAST
+BDAT 8380 LAST
 500 oops bdat
 QUIT
 225 OK
@@ -141,17 +141,17 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<p@test.ex>
-BDAT ddd
+BDAT 8191
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
-BDAT ddd LAST
+BDAT 849 LAST
 250 OK bdat
 QUIT
 225 OK
diff --git a/test/stdout/2090 b/test/stdout/2090
index e198f1279..7bf70310a 100644
--- a/test/stdout/2090
+++ b/test/stdout/2090
@@ -1,9 +1,9 @@
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -23,7 +23,7 @@ Attempting to start TLS
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -37,7 +37,7 @@ Succeeded in starting TLS
 >>> MAIL FROM:<someone@some.domain>
 ??? 250
 <<< 250 OK
->>> RCPT TO:<CALLER@the.local.host.name>
+>>> RCPT TO:<CALLER@test.ex>
 ??? 250
 <<< 250 Accepted
 >>> BDAT 88 LAST
@@ -51,14 +51,14 @@ Succeeded in starting TLS
 <<< 250 OK id=10HmaX-0005vi-00
 >>> QUIT
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -78,7 +78,7 @@ Attempting to start TLS
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -90,7 +90,7 @@ Succeeded in starting TLS
 ??? 250 HELP
 <<< 250 HELP
 >>> MAIL FROM:<someone@some.domain>
->>> RCPT TO:<CALLER@the.local.host.name>
+>>> RCPT TO:<CALLER@test.ex>
 >>> BDAT 88 LAST
 >>> To: Susan@random.com
 >>> From: Sam@random.com
@@ -106,5 +106,5 @@ Succeeded in starting TLS
 <<< 250 OK id=10HmaY-0005vi-00
 >>> QUIT
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
diff --git a/test/stdout/2190 b/test/stdout/2190
index 7942a8ce5..c1ee9ffcf 100644
--- a/test/stdout/2190
+++ b/test/stdout/2190
@@ -1,9 +1,9 @@
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -37,7 +37,7 @@ SSL connection using AES256-SHA
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -51,7 +51,7 @@ Succeeded in starting TLS
 >>> MAIL FROM:<someone@some.domain>
 ??? 250
 <<< 250 OK
->>> RCPT TO:<CALLER@the.local.host.name>
+>>> RCPT TO:<CALLER@test.ex>
 ??? 250
 <<< 250 Accepted
 >>> BDAT 88 LAST
@@ -65,14 +65,14 @@ Succeeded in starting TLS
 <<< 250 OK id=10HmaX-0005vi-00
 >>> QUIT
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -106,7 +106,7 @@ SSL connection using AES256-SHA
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -118,7 +118,7 @@ Succeeded in starting TLS
 ??? 250 HELP
 <<< 250 HELP
 >>> MAIL FROM:<someone@some.domain>
->>> RCPT TO:<CALLER@the.local.host.name>
+>>> RCPT TO:<CALLER@test.ex>
 >>> BDAT 88 LAST
 >>> To: Susan@random.com
 >>> From: Sam@random.com
@@ -134,5 +134,5 @@ Succeeded in starting TLS
 <<< 250 OK id=10HmaY-0005vi-00
 >>> QUIT
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
diff --git a/test/stdout/5591 b/test/stdout/5591
index b756ab32c..32cd8da8f 100644
--- a/test/stdout/5591
+++ b/test/stdout/5591
@@ -3,18 +3,18 @@
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Server ready
-EHLO the.local.host.name
+EHLO testhost.test.ex
 250-hiya matey
 250-PRDR
 250-CHUNKING
 250 OK
 MAIL FROM:<> PRDR
 250 OK
-RCPT TO:<usery@the.local.host.name>
+RCPT TO:<usery@testhost.test.ex>
 250 OK
-RCPT TO:<userz@the.local.host.name>
+RCPT TO:<userz@testhost.test.ex>
 250 OK
-BDAT ddd LAST
+BDAT 337 LAST
 353 prdr responses coming up
 250 first rcpt was good
 250 second rcpt was good