Logging: support +outgoing_port on defer lines and per-host error lines

[users/jgh/exim.git] / test / stderr / 0021

diff --git a/test/stderr/0021 b/test/stderr/0021
index 70391fd128ed03bde709ab6f7ee31a908091f429..43331d4aa116c9d6aaecf902cd0e9fb5794204e0 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -16,42 +16,46 @@ using ACL "connect"
 processing "deny"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 processing "deny"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)

-deny: condition test failed
+deny: condition test failed in ACL "connect"

 processing "drop"
 processing "drop"

+l_message: forcibly dropped

 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)

-drop: condition test failed
+drop: condition test failed in ACL "connect"

 processing "accept"
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL
 processing "accept"
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL

-accept: condition test succeeded
+accept: condition test succeeded in ACL "connect"
+end of ACL "connect": ACCEPT

 using ACL "mail"
 processing "warn"
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 check senders = ok@test3

-address match: subject=bad@test1 pattern=ok@test3
+address match test: subject=bad@test1 pattern=ok@test3

 bad@test1 in "ok@test3"? no (end of list)
 bad@test1 in "ok@test3"? no (end of list)

-warn: condition test failed
+warn: condition test failed in ACL "mail"

 processing "accept"
 check senders = ok@test1 : ok@test3
 processing "accept"
 check senders = ok@test1 : ok@test3

-address match: subject=bad@test1 pattern=ok@test1
-address match: subject=bad@test1 pattern=ok@test3
+address match test: subject=bad@test1 pattern=ok@test1
+address match test: subject=bad@test1 pattern=ok@test3

 bad@test1 in "ok@test1 : ok@test3"? no (end of list)
 bad@test1 in "ok@test1 : ok@test3"? no (end of list)

-accept: condition test failed
+accept: condition test failed in ACL "mail"

 end of ACL "mail": implicit DENY
 LOG: MAIN REJECT
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 using ACL "mail"
 processing "warn"
 end of ACL "mail": implicit DENY
 LOG: MAIN REJECT
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 check senders = ok@test3

-address match: subject=ok@test1 pattern=ok@test3
+address match test: subject=ok@test1 pattern=ok@test3

 test1 in "test3"? no (end of list)
 ok@test1 in "ok@test3"? no (end of list)
 test1 in "test3"? no (end of list)
 ok@test1 in "ok@test3"? no (end of list)

-warn: condition test failed
+warn: condition test failed in ACL "mail"

 processing "accept"
 check senders = ok@test1 : ok@test3
 processing "accept"
 check senders = ok@test1 : ok@test3

-address match: subject=ok@test1 pattern=ok@test1
+address match test: subject=ok@test1 pattern=ok@test1

 test1 in "test1"? yes (matched "test1")
 ok@test1 in "ok@test1 : ok@test3"? yes (matched "ok@test1")
 check verify = sender
 test1 in "test1"? yes (matched "test1")
 ok@test1 in "ok@test1 : ok@test3"? yes (matched "ok@test1")
 check verify = sender


@@ -62,13 +66,14 @@ check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu
                = :main,reject: mail accepted "mail from:<ok@test1>" "<ok@test1>"
 LOG: MAIN REJECT
   mail accepted "mail from:<ok@test1>" "<ok@test1>"
                = :main,reject: mail accepted "mail from:<ok@test1>" "<ok@test1>"
 LOG: MAIN REJECT
   mail accepted "mail from:<ok@test1>" "<ok@test1>"

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT

 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders
 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders

-address match: subject=ok@test1 pattern=ok@somewhere
+address match test: subject=ok@test1 pattern=ok@somewhere

 test1 in "somewhere"? no (end of list)
 test1 in "somewhere"? no (end of list)

-address match: subject=ok@test1 pattern=ok@test1
+address match test: subject=ok@test1 pattern=ok@test1

 test1 in "test1"? yes (matched "test1")
 ok@test1 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test1")
 ok@test1 in "+ok_senders"? yes (matched "+ok_senders")
 test1 in "test1"? yes (matched "test1")
 ok@test1 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test1")
 ok@test1 in "+ok_senders"? yes (matched "+ok_senders")


@@ -78,7 +83,8 @@ test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
 check logwrite = :panic: rcpt accepted
 LOG: PANIC
   rcpt accepted
 check logwrite = :panic: rcpt accepted
 LOG: PANIC
   rcpt accepted

-accept: condition test succeeded
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT

 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders
 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders


@@ -91,7 +97,8 @@ test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains" - cached)
 check logwrite = :panic: rcpt accepted
 LOG: PANIC
   rcpt accepted
 check logwrite = :panic: rcpt accepted
 LOG: PANIC
   rcpt accepted

-accept: condition test succeeded
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT

 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -114,29 +121,32 @@ using ACL "connect"
 processing "deny"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 processing "deny"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)

-deny: condition test failed
+deny: condition test failed in ACL "connect"

 processing "drop"
 processing "drop"

+l_message: forcibly dropped

 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)

-drop: condition test failed
+drop: condition test failed in ACL "connect"

 processing "accept"
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL
 processing "accept"
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL

-accept: condition test succeeded
+accept: condition test succeeded in ACL "connect"
+end of ACL "connect": ACCEPT

 using ACL "mail"
 processing "warn"
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 check senders = ok@test3

-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3

 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test3"? yes (matched "ok@test3")
 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test3"? yes (matched "ok@test3")

-warn: condition test succeeded
+warn: condition test succeeded in ACL "mail"

 processing "accept"
 check senders = ok@test1 : ok@test3
 processing "accept"
 check senders = ok@test1 : ok@test3

-address match: subject=ok@test3 pattern=ok@test1
+address match test: subject=ok@test3 pattern=ok@test1

 test3 in "test1"? no (end of list)
 test3 in "test1"? no (end of list)

-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3

 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test1 : ok@test3"? yes (matched "ok@test3")
 check verify = sender
 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test1 : ok@test3"? yes (matched "ok@test3")
 check verify = sender


@@ -147,15 +157,16 @@ check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu
                = :main,reject: mail accepted "mail from:<ok@test3>" "<ok@test3>"
 LOG: MAIN REJECT
   mail accepted "mail from:<ok@test3>" "<ok@test3>"
                = :main,reject: mail accepted "mail from:<ok@test3>" "<ok@test3>"
 LOG: MAIN REJECT
   mail accepted "mail from:<ok@test3>" "<ok@test3>"

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT

 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders
 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders

-address match: subject=ok@test3 pattern=ok@somewhere
+address match test: subject=ok@test3 pattern=ok@somewhere

 test3 in "somewhere"? no (end of list)
 test3 in "somewhere"? no (end of list)

-address match: subject=ok@test3 pattern=ok@test1
+address match test: subject=ok@test3 pattern=ok@test1

 test3 in "test1"? no (end of list)
 test3 in "test1"? no (end of list)

-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3

 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test3")
 ok@test3 in "+ok_senders"? yes (matched "+ok_senders")
 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test3")
 ok@test3 in "+ok_senders"? yes (matched "+ok_senders")


@@ -165,7 +176,8 @@ test3 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
 check logwrite = :panic: rcpt accepted
 LOG: PANIC
   rcpt accepted
 check logwrite = :panic: rcpt accepted
 LOG: PANIC
   rcpt accepted

-accept: condition test succeeded
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT

 host in ignore_fromline_hosts? no (option unset)
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: added header line
 host in ignore_fromline_hosts? no (option unset)
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: added header line


@@ -176,7 +188,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-skipping ACL configuration - not needed

 x in "!bad"? yes (end of list)
 LOG: MAIN
   => x <x@y> R=accept T=appendfile
 x in "!bad"? yes (end of list)
 LOG: MAIN
   => x <x@y> R=accept T=appendfile