summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-07-05 14:30:05 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2017-07-09 16:23:24 +0100
commita09f294202729d7e532a1584536fa14e491a0b71 (patch)
tree7f9fdad88216ecbf8cb8d88f0f6a00dfcefe34cb /test
parentef698bf6a7a59d28c93fca18e4509ca6c67d7dca (diff)
Add $smtp_command_history variable
Diffstat (limited to 'test')
-rw-r--r--test/confs/00212
-rw-r--r--test/paniclog/00218
-rw-r--r--test/stderr/002117
3 files changed, 15 insertions, 12 deletions
diff --git a/test/confs/0021 b/test/confs/0021
index ae5a309b9..cb057386e 100644
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -67,7 +67,7 @@ mail:
rcpt:
accept senders = +ok_senders
sender_domains = +ok_sender_domains
- logwrite = :panic: rcpt accepted
+ logwrite = :panic: rcpt accepted C=$smtp_command_history
# ----- Routers -----
diff --git a/test/paniclog/0021 b/test/paniclog/0021
index dae415203..d6e91d346 100644
--- a/test/paniclog/0021
+++ b/test/paniclog/0021
@@ -1,6 +1,6 @@
-1999-03-02 09:44:33 rcpt accepted
-1999-03-02 09:44:33 rcpt accepted
+1999-03-02 09:44:33 rcpt accepted C=MAIL,MAIL,RCPT
+1999-03-02 09:44:33 rcpt accepted C=MAIL,MAIL,RCPT,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
+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
+1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT
diff --git a/test/stderr/0021 b/test/stderr/0021
index 7c5a79ee9..299cc4974 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -80,9 +80,10 @@ ok@test1 in "+ok_senders"? yes (matched "+ok_senders")
check sender_domains = +ok_sender_domains
test1 in "somewhere : test1 : test3"? yes (matched "test1")
test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
-check logwrite = :panic: rcpt accepted
+check logwrite = :panic: rcpt accepted C=$smtp_command_history
+ = :panic: rcpt accepted C=MAIL,MAIL,RCPT
LOG: PANIC
- rcpt accepted
+ rcpt accepted C=MAIL,MAIL,RCPT
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
using ACL "rcpt"
@@ -94,9 +95,10 @@ ok@test1 in "+ok_senders"? yes (matched "+ok_senders" - cached)
check sender_domains = +ok_sender_domains
cached yes match for +ok_sender_domains
test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains" - cached)
-check logwrite = :panic: rcpt accepted
+check logwrite = :panic: rcpt accepted C=$smtp_command_history
+ = :panic: rcpt accepted C=MAIL,MAIL,RCPT,RCPT
LOG: PANIC
- rcpt accepted
+ rcpt accepted C=MAIL,MAIL,RCPT,RCPT
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
LOG: smtp_connection MAIN
@@ -173,9 +175,10 @@ ok@test3 in "+ok_senders"? yes (matched "+ok_senders")
check sender_domains = +ok_sender_domains
test3 in "somewhere : test1 : test3"? yes (matched "test3")
test3 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
-check logwrite = :panic: rcpt accepted
+check logwrite = :panic: rcpt accepted C=$smtp_command_history
+ = :panic: rcpt accepted C=MAIL,RCPT
LOG: PANIC
- rcpt accepted
+ rcpt accepted C=MAIL,RCPT
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
>>Headers added by MAIL or RCPT ACL:
@@ -197,4 +200,4 @@ 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
+1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT