summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/00212
-rw-r--r--test/log/002112
-rw-r--r--test/mail/0021.x10
-rw-r--r--test/paniclog/00212
-rw-r--r--test/rejectlog/00216
-rw-r--r--test/scripts/0000-Basic/00219
-rw-r--r--test/stderr/002112
-rw-r--r--test/stdout/00217
8 files changed, 51 insertions, 9 deletions
diff --git a/test/confs/0021 b/test/confs/0021
index 5ff787e28..da9293312 100644
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -65,7 +65,7 @@ mail:
senders = ok@test3
accept senders = ok@test1 : ok@test3
verify = sender
- logwrite = :main,reject: mail accepted
+ logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argument"
rcpt:
accept senders = +ok_senders
diff --git a/test/log/0021 b/test/log/0021
index 77ae6a64f..39eb9610d 100644
--- a/test/log/0021
+++ b/test/log/0021
@@ -19,7 +19,7 @@
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>
-1999-03-02 09:44:33 mail accepted
+1999-03-02 09:44:33 mail accepted "mail from:<ok@test1>" "<ok@test1>"
1999-03-02 09:44:33 H=[10.9.8.9] U=CALLER rejected connection in "connect" ACL: forcibly dropped
1999-03-02 09:44:33 U=CALLER rejected connection in "connect" ACL
1999-03-02 09:44:33 10.9.8.10 accepted by connect ACL
@@ -27,7 +27,7 @@
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=(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
+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
@@ -39,3 +39,11 @@
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 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=1234" "<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
diff --git a/test/mail/0021.x b/test/mail/0021.x
index 9dd43af38..12fcf69e8 100644
--- a/test/mail/0021.x
+++ b/test/mail/0021.x
@@ -8,3 +8,13 @@ X-ACL-Warn: added header line
Some message
+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
+ for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+X-ACL-Warn: added header line
+
+Some message
+
diff --git a/test/paniclog/0021 b/test/paniclog/0021
index 3a0cd7fb8..dae415203 100644
--- a/test/paniclog/0021
+++ b/test/paniclog/0021
@@ -2,3 +2,5 @@
1999-03-02 09:44:33 rcpt accepted
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
+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
diff --git a/test/rejectlog/0021 b/test/rejectlog/0021
index a2e943557..8fdad8e45 100644
--- a/test/rejectlog/0021
+++ b/test/rejectlog/0021
@@ -30,11 +30,11 @@ 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
1999-03-02 09:44:33 H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
-1999-03-02 09:44:33 mail accepted
+1999-03-02 09:44:33 mail accepted "mail from:<ok@test1>" "<ok@test1>"
1999-03-02 09:44:33 H=[10.9.8.9] U=CALLER rejected connection in "connect" ACL: forcibly dropped
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
+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
Envelope-from: <userx@test1>
Envelope-to: <userx@test.ex>
@@ -55,3 +55,5 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
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 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=1234" "<ok@test3> SIZE=1234"
diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021
index 71b334130..8fbf94837 100644
--- a/test/scripts/0000-Basic/0021
+++ b/test/scripts/0000-Basic/0021
@@ -60,3 +60,12 @@ exim -DBR=no_bounce_return_body -odi -f userx@test1 userx
Test message 1.
.
****
+exim -odi -bs -oMa 10.9.8.8
+ehlo test.ex
+mail from: <ok@test3> SIZE=1234
+rcpt to:<x@y>
+data
+Some message
+.
+quit
+****
diff --git a/test/stderr/0021 b/test/stderr/0021
index c1ebc4d0c..70391fd12 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -58,9 +58,10 @@ check verify = sender
ok in "!bad"? yes (end of list)
----------- end verify ------------
sender ok@test1 verified ok
-check logwrite = :main,reject: mail accepted
+check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argument"
+ = :main,reject: mail accepted "mail from:<ok@test1>" "<ok@test1>"
LOG: MAIN REJECT
- mail accepted
+ mail accepted "mail from:<ok@test1>" "<ok@test1>"
accept: condition test succeeded
using ACL "rcpt"
processing "accept"
@@ -142,9 +143,10 @@ check verify = sender
ok in "!bad"? yes (end of list)
----------- end verify ------------
sender ok@test3 verified ok
-check logwrite = :main,reject: mail accepted
+check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argument"
+ = :main,reject: mail accepted "mail from:<ok@test3>" "<ok@test3>"
LOG: MAIN REJECT
- mail accepted
+ mail accepted "mail from:<ok@test3>" "<ok@test3>"
accept: condition test succeeded
using ACL "rcpt"
processing "accept"
@@ -184,3 +186,5 @@ LOG: MAIN
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp 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
diff --git a/test/stdout/0021 b/test/stdout/0021
index 490d13fad..5fff92b0a 100644
--- a/test/stdout/0021
+++ b/test/stdout/0021
@@ -16,3 +16,10 @@
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbH-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
+221 myhost.test.ex closing connection
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-19 21:27:32 +0000