summaryrefslogtreecommitdiff
path: root/test/stderr
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2007-02-20 11:37:16 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2007-02-20 11:37:16 +0000
commitca86f471bf30f4630e96e24f6c13de269f380f41 (patch)
tree69e429391bb764e2aab6316453f639eedbbd1571 /test/stderr
parent5a11a7b41649e95629fa9944a2fa81b3e50707e4 (diff)
$smtp_command and $smtp_command_argument were incomplete for MAIL
commands with extra options such as SIZE.
Diffstat (limited to 'test/stderr')
-rw-r--r--test/stderr/002112
1 files changed, 8 insertions, 4 deletions
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