Gitweb:
https://git.exim.org/exim.git/commitdiff/569a8b23aa46c3d5cabdcd1540cd4c590d592f80
Commit: 569a8b23aa46c3d5cabdcd1540cd4c590d592f80
Parent: 22d6c944c489adf9e13daa05991c5a92545a9750
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Dec 16 16:33:32 2018 +0000
Committer: Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Tue Dec 18 14:59:37 2018 +0100
Log failures to extract envelope addresses from message headers. Bug 2351
(cherry picked from commit 60c02b350a7d325e64ae0a656cfd37a9fbd162a7)
---
doc/doc-txt/ChangeLog | 6 ++++++
src/src/receive.c | 21 ++++++++++---------
test/log/0021 | 50 ++++++++++++++++++++++++--------------------
test/mail/0021.CALLER | 23 ++++++++++++++++++++
test/mail/0021.ok | 16 +++++++-------
test/mail/0021.userx | 28 ++++++++++++-------------
test/mail/0021.x | 4 ++--
test/paniclog/0021 | 1 +
test/rejectlog/0021 | 30 +++++++++++++-------------
test/scripts/0000-Basic/0021 | 8 +++++++
test/stderr/0021 | 1 +
test/stdout/0021 | 4 ++--
12 files changed, 118 insertions(+), 74 deletions(-)
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 12f37a7..e527eeb 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -5,6 +5,12 @@ affect Exim's operation, with an unchanged configuration file. For new
options, and new features, see the NewStuff file next to this ChangeLog.
+Exim version 4.93
+-----------------
+
+JH/01 Bug 2351: Log failures to extract envelope addresses from message headers.
+
+
Exim version 4.92
-----------------
diff --git a/src/src/receive.c b/src/src/receive.c
index 93b350a..6d54ad3 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -3244,16 +3244,16 @@ if (extract_recip && (bad_addresses || recipients_count == 0))
if (recipients_count == 0) debug_printf("*** No recipients\n");
if (bad_addresses)
{
- error_block *eblock = bad_addresses;
+ error_block * eblock;
debug_printf("*** Bad address(es)\n");
- while (eblock != NULL)
- {
+ for (eblock = bad_addresses; eblock; eblock = eblock->next)
debug_printf(" %s: %s\n", eblock->text1, eblock->text2);
- eblock = eblock->next;
- }
}
}
+ log_write(0, LOG_MAIN|LOG_PANIC, "%s %s found in headers",
+ message_id, bad_addresses ? "bad addresses" : "no recipients");
+
fseek(spool_data_file, (long int)SPOOL_DATA_START_OFFSET, SEEK_SET);
/* If configured to send errors to the sender, but this fails, force
@@ -3265,11 +3265,12 @@ if (extract_recip && (bad_addresses || recipients_count == 0))
if (error_handling == ERRORS_SENDER)
{
if (!moan_to_sender(
- (bad_addresses == NULL)?
- (extracted_ignored? ERRMESS_IGADDRESS : ERRMESS_NOADDRESS) :
- (recipients_list == NULL)? ERRMESS_BADNOADDRESS : ERRMESS_BADADDRESS,
- bad_addresses, header_list, spool_data_file, FALSE))
- error_rc = (bad_addresses == NULL)? EXIT_NORECIPIENTS : EXIT_FAILURE;
+ bad_addresses
+ ? recipients_list ? ERRMESS_BADADDRESS : ERRMESS_BADNOADDRESS
+ : extracted_ignored ? ERRMESS_IGADDRESS : ERRMESS_NOADDRESS,
+ bad_addresses, header_list, spool_data_file, FALSE
+ ) )
+ error_rc = bad_addresses ? EXIT_FAILURE : EXIT_NORECIPIENTS;
}
else
{
diff --git a/test/log/0021 b/test/log/0021
index d8dee80..a7f4862 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@???> 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@???> 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@???> 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@???> 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@???> 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 0000000..8cdd7b3
--- /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@???; Tue, 2 Mar 1999 09:44:33 +0000
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@???>
+To: CALLER@???
+Subject: Mail failure - no recipient addresses
+Message-Id: <E10HmbM-0005vi-00@???>
+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@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index 213d0c6..e061f86 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@???>
To: ok@test2
Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbE-0005vi-00@???>
+Message-Id: <E10HmbF-0005vi-00@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
+Message-Id: <E10HmaZ-0005vi-00@???>
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@???>
To: ok@test4
Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbG-0005vi-00@???>
+Message-Id: <E10HmbH-0005vi-00@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@???>
+Message-Id: <E10HmbA-0005vi-00@???>
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 2abd8d3..a290342 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@???>
To: userx@test1
Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbC-0005vi-00@???>
+Message-Id: <E10HmbD-0005vi-00@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@???>
+Message-Id: <E10HmaY-0005vi-00@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@???>
+Message-Id: <E10HmbE-0005vi-00@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@???>
+Message-Id: <E10HmbG-0005vi-00@???>
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@???>
To: userx@test1
Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbI-0005vi-00@???>
+Message-Id: <E10HmbJ-0005vi-00@???>
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@???>
To: userx@test1
Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbJ-0005vi-00@???>
+Message-Id: <E10HmbK-0005vi-00@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@???>
+Message-Id: <E10HmbC-0005vi-00@???>
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 12fcf69..8e8b125 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 d6e91d3..adef7cb 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 0f59e2c..3dbf532 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@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaX-0005vi-00@???>
+I Message-Id: <E10HmaY-0005vi-00@???>
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@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaY-0005vi-00@???>
+I Message-Id: <E10HmaZ-0005vi-00@???>
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@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaZ-0005vi-00@???>
+I Message-Id: <E10HmbA-0005vi-00@???>
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@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmbA-0005vi-00@???>
+I Message-Id: <E10HmbB-0005vi-00@???>
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@???>
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@???; Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmbB-0005vi-00@???>
+I Message-Id: <E10HmbC-0005vi-00@???>
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 0df1f0a..6e4b847 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 207889b..7ddedfe 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 a48644f..64f9a1c 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
