Log failures to extract envelope addresses from message headers. Bug 2351

10 files changed, 101 insertions, 64 deletions

diff --git a/test/log/0021 b/test/log/0021
index d8dee8002..a7f4862ad 100644
--- a/test/log/0021
+++ b/test/log/0021
@@ -1,21 +1,21 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 => userx <userx@test1> R=accept T=appendfile
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= ok@test1 U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 => userx <userx@test.ex> R=accept T=appendfile
+1999-03-02 09:44:33 10HmaY-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmbD-0005vi-00 => userx <userx@test1> R=accept T=appendfile
 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmbE-0005vi-00 => ok <ok@test2> R=accept T=appendfile
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= ok@test1 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbE-0005vi-00 => userx <userx@test.ex> R=accept T=appendfile
 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= ok@test3 U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 => userx <userx@test.ex> R=accept T=appendfile
+1999-03-02 09:44:33 10HmaZ-0005vi-00 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmbF-0005vi-00 => ok <ok@test2> R=accept T=appendfile
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmbG-0005vi-00 => ok <ok@test4> R=accept T=appendfile
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= ok@test3 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 => userx <userx@test.ex> R=accept T=appendfile
 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmbH-0005vi-00 => ok <ok@test4> R=accept T=appendfile
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
 1999-03-02 09:44:33 H=[10.9.8.7] U=CALLER rejected connection in "connect" ACL
 1999-03-02 09:44:33 10.9.8.8 accepted by connect ACL
 1999-03-02 09:44:33 H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
@@ -28,22 +28,26 @@
 1999-03-02 09:44:33 H=(x.y.z) [10.9.8.10] U=CALLER rejected EHLO or HELO x.y.z
 1999-03-02 09:44:33 10.9.8.8 accepted by connect ACL
 1999-03-02 09:44:33 mail accepted "mail from:<ok@test3>" "<ok@test3>"
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbH-0005vi-00 => x <x@y> R=accept T=appendfile
-1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmbI-0005vi-00 => userx <userx@test1> R=accept T=appendfile
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbI-0005vi-00 => x <x@y> R=accept T=appendfile
 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx <userx@test1> R=accept T=appendfile
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbC-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmbK-0005vi-00 => userx <userx@test1> R=accept T=appendfile
+1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
 1999-03-02 09:44:33 10.9.8.8 accepted by connect ACL
 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER Warning: This warning is from a HELO ACL (command ehlo test.ex)
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex
 1999-03-02 09:44:33 mail accepted "mail from: <ok@test3> SIZE=ssss" "<ok@test3> SIZE=1234"
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbK-0005vi-00 => x <x@y> R=accept T=appendfile
-1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbL-0005vi-00 => x <x@y> R=accept T=appendfile
+1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmbM-0005vi-00 => CALLER <CALLER@test.ex> R=accept T=appendfile
+1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
diff --git a/test/mail/0021.CALLER b/test/mail/0021.CALLER
new file mode 100644
index 000000000..8cdd7b30f
--- /dev/null
+++ b/test/mail/0021.CALLER
@@ -0,0 +1,23 @@
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbM-0005vi-00
+	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@test.ex>
+To: CALLER@test.ex
+Subject: Mail failure - no recipient addresses
+Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+A message that you sent contained no recipient addresses, and therefore no
+delivery could be attempted.
+
+------ This is a copy of your message, including all the headers. ------
+
+From: userx@test1
+To:
+Subject: this should get a bounce, too
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index 213d0c60a..e061f8670 100644
--- a/test/mail/0021.ok
+++ b/test/mail/0021.ok
@@ -1,12 +1,12 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbE-0005vi-00
+	id 10HmbF-0005vi-00
 	for ok@test2; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test2
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
@@ -18,9 +18,9 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test2>)
-	id 10HmaY-0005vi-00
+	id 10HmaZ-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: ok@test2
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -28,13 +28,13 @@ Test message 3.
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbG-0005vi-00
+	id 10HmbH-0005vi-00
 	for ok@test4; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test4
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
@@ -46,9 +46,9 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test4>)
-	id 10HmaZ-0005vi-00
+	id 10HmbA-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: ok@test4
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index 2abd8d315..a290342b0 100644
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -1,12 +1,12 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbC-0005vi-00
+	id 10HmbD-0005vi-00
 	for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
@@ -18,9 +18,9 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
-	id 10HmaX-0005vi-00
+	id 10HmaY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -29,9 +29,9 @@ Test message 1.
 From ok@test1 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test1>)
-	id 10HmbD-0005vi-00
+	id 10HmbE-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: ok@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -40,9 +40,9 @@ Test message 2.
 From ok@test3 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test3>)
-	id 10HmbF-0005vi-00
+	id 10HmbG-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: ok@test3
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -50,13 +50,13 @@ Test message 4.
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbI-0005vi-00
+	id 10HmbJ-0005vi-00
 	for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
@@ -66,13 +66,13 @@ checks incoming messages on this system. The following error was given:
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbJ-0005vi-00
+	id 10HmbK-0005vi-00
 	for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
@@ -85,9 +85,9 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
-	id 10HmbB-0005vi-00
+	id 10HmbC-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
diff --git a/test/mail/0021.x b/test/mail/0021.x
index 12fcf69e8..8e8b1256d 100644
--- a/test/mail/0021.x
+++ b/test/mail/0021.x
@@ -2,7 +2,7 @@ From ok@test3 Tue Mar 02 09:44:33 1999
 Received: from [10.9.8.8] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <ok@test3>)
-	id 10HmbH-0005vi-00
+	id 10HmbI-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL-Warn: added header line
 
@@ -12,7 +12,7 @@ From ok@test3 Tue Mar 02 09:44:33 1999
 Received: from [10.9.8.8] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <ok@test3>)
-	id 10HmbK-0005vi-00
+	id 10HmbL-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL-Warn: added header line
 
diff --git a/test/paniclog/0021 b/test/paniclog/0021
index d6e91d346..adef7cbd5 100644
--- a/test/paniclog/0021
+++ b/test/paniclog/0021
@@ -4,3 +4,4 @@
 1999-03-02 09:44:33 rcpt accepted C=MAIL,RCPT
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT
+1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers
diff --git a/test/rejectlog/0021 b/test/rejectlog/0021
index 0f59e2c5d..3dbf53292 100644
--- a/test/rejectlog/0021
+++ b/test/rejectlog/0021
@@ -1,31 +1,31 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
+1999-03-02 09:44:33 10HmaY-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
 Envelope-from: <userx@test1>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
-	id 10HmaX-0005vi-00
+	id 10HmaY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmaY-0005vi-00 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL
+1999-03-02 09:44:33 10HmaZ-0005vi-00 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL
 Envelope-from: <ok@test2>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test2>)
-	id 10HmaY-0005vi-00
+	id 10HmaZ-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: ok@test2
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmaZ-0005vi-00 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate
+1999-03-02 09:44:33 10HmbA-0005vi-00 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate
 Envelope-from: <ok@test4>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test4>)
-	id 10HmaZ-0005vi-00
+	id 10HmbA-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: ok@test4
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 H=[10.9.8.7] U=CALLER rejected connection in "connect" ACL
@@ -36,24 +36,24 @@ F From: ok@test4
 1999-03-02 09:44:33 U=CALLER rejected connection in "connect" ACL
 1999-03-02 09:44:33 H=(x.y.z) [10.9.8.10] U=CALLER rejected EHLO or HELO x.y.z
 1999-03-02 09:44:33 mail accepted "mail from:<ok@test3>" "<ok@test3>"
-1999-03-02 09:44:33 10HmbA-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
+1999-03-02 09:44:33 10HmbB-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
 Envelope-from: <userx@test1>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
-	id 10HmbA-0005vi-00
+	id 10HmbB-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmbB-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
+1999-03-02 09:44:33 10HmbC-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
 Envelope-from: <userx@test1>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
-	id 10HmbB-0005vi-00
+	id 10HmbC-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex
diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021
index 0df1f0ae6..6e4b8474e 100644
--- a/test/scripts/0000-Basic/0021
+++ b/test/scripts/0000-Basic/0021
@@ -72,3 +72,11 @@ Some message
 .
 quit
 ****
+#
+# Test returncode and logginf for no extractable recipients
+1
+exim -odi -t
+From: userx@test1
+To:
+Subject: this should get a bounce, too
+****
diff --git a/test/stderr/0021 b/test/stderr/0021
index 207889b0d..7ddedfee3 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -201,3 +201,4 @@ LOG: smtp_connection MAIN
 >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT
+1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers
diff --git a/test/stdout/0021 b/test/stdout/0021
index a48644f83..64f9a1c1d 100644
--- a/test/stdout/0021
+++ b/test/stdout/0021
@@ -15,12 +15,12 @@
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmbH-0005vi-00

+250 OK id=10HmbI-0005vi-00

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 550 Administrative prohibition

 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmbK-0005vi-00

+250 OK id=10HmbL-0005vi-00

 221 myhost.test.ex closing connection