git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Callouts: simplfy logging
[users/jgh/exim.git]
/
test
/
stderr
/
0087
diff --git
a/test/stderr/0087
b/test/stderr/0087
index ac1333c17972f9ff5a3bb4bb6df6bdf3644ffad5..ec9eeb4e7d857dcc9ef9ca4ec67b457449f39efa 100644
(file)
--- a/
test/stderr/0087
+++ b/
test/stderr/0087
@@
-7,11
+7,11
@@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept"
(TESTSUITE/test-config 20)
>>> check hosts = :
>>> host in ":"? no (end of list)
>>> check hosts = :
>>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "require"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "require"
(TESTSUITE/test-config 21)
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
@@
-20,21
+20,23
@@
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
->>> require: condition test succeeded
->>> processing "accept"
+>>> require: condition test succeeded
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 22)
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
->>> processing "require"
+>>> processing "require"
(TESTSUITE/test-config 26)
>>> check verify = header_sender
>>> verifying From: header address userx@test.ex
>>> previously checked as envelope sender
>>> check verify = header_sender
>>> verifying From: header address userx@test.ex
>>> previously checked as envelope sender
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "check_message"
+>>> processing "accept" (TESTSUITE/test-config 27)
+>>> accept: condition test succeeded in ACL "check_message"
+>>> end of ACL "check_message": ACCEPT
LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
@@
-45,11
+47,11
@@
LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept"
(TESTSUITE/test-config 20)
>>> check hosts = :
>>> host in ":"? no (end of list)
>>> check hosts = :
>>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "require"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "require"
(TESTSUITE/test-config 21)
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
@@
-58,21
+60,23
@@
LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
->>> require: condition test succeeded
->>> processing "accept"
+>>> require: condition test succeeded
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 22)
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
->>> processing "require"
+>>> processing "require"
(TESTSUITE/test-config 26)
>>> check verify = header_sender
>>> verifying Sender: header address userx@test.ex
>>> previously checked as envelope sender
>>> check verify = header_sender
>>> verifying Sender: header address userx@test.ex
>>> previously checked as envelope sender
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "check_message"
+>>> processing "accept" (TESTSUITE/test-config 27)
+>>> accept: condition test succeeded in ACL "check_message"
+>>> end of ACL "check_message": ACCEPT
LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
@@
-83,11
+87,11
@@
LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept"
(TESTSUITE/test-config 20)
>>> check hosts = :
>>> host in ":"? no (end of list)
>>> check hosts = :
>>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "require"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "require"
(TESTSUITE/test-config 21)
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
@@
-96,15
+100,16
@@
LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
->>> require: condition test succeeded
->>> processing "accept"
+>>> require: condition test succeeded
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 22)
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
->>> processing "require"
+>>> processing "require"
(TESTSUITE/test-config 26)
>>> check verify = header_sender
>>> verifying From: header address badbad@test.ex
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> check verify = header_sender
>>> verifying From: header address badbad@test.ex
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-112,7
+117,8
@@
LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> badbad in "defer"? no (end of list)
>>> badbad in "userx"? no (end of list)
>>> no more routers
>>> badbad in "defer"? no (end of list)
>>> badbad in "userx"? no (end of list)
>>> no more routers
->>> require: condition test failed
+>>> require: condition test failed in ACL "check_message"
+>>> end of ACL "check_message": not OK
LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
@@
-123,11
+129,11
@@
LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA:
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept"
(TESTSUITE/test-config 20)
>>> check hosts = :
>>> host in ":"? no (end of list)
>>> check hosts = :
>>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "require"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "require"
(TESTSUITE/test-config 21)
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
@@
-136,15
+142,16
@@
LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA:
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
->>> require: condition test succeeded
->>> processing "accept"
+>>> require: condition test succeeded
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 22)
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
->>> processing "require"
+>>> processing "require"
(TESTSUITE/test-config 26)
>>> check verify = header_sender
>>> verifying From: header address badbad@test.ex
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> check verify = header_sender
>>> verifying From: header address badbad@test.ex
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-154,9
+161,10
@@
LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA:
>>> no more routers
>>> verifying From: header address userx@test.ex
>>> previously checked as envelope sender
>>> no more routers
>>> verifying From: header address userx@test.ex
>>> previously checked as envelope sender
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "check_message"
+>>> processing "accept" (TESTSUITE/test-config 27)
+>>> accept: condition test succeeded in ACL "check_message"
+>>> end of ACL "check_message": ACCEPT
LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
@@
-167,11
+175,11
@@
LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept"
(TESTSUITE/test-config 20)
>>> check hosts = :
>>> host in ":"? no (end of list)
>>> check hosts = :
>>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "require"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "require"
(TESTSUITE/test-config 21)
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing userx@test.ex
@@
-180,15
+188,16
@@
LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
>>> calling localuser router
>>> routed by localuser router
>>> ----------- end verify ------------
->>> require: condition test succeeded
->>> processing "accept"
+>>> require: condition test succeeded
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 22)
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> check domains = +local_domains
>>> test.ex in "test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_message"
->>> processing "require"
+>>> processing "require"
(TESTSUITE/test-config 26)
>>> check verify = header_sender
>>> verifying From: header address defer@test.ex
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> check verify = header_sender
>>> verifying From: header address defer@test.ex
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-197,5
+206,5
@@
LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
>>> calling defer router
>>> defer router: defer for defer@test.ex
>>> message: this is a forced defer
>>> calling defer router
>>> defer router: defer for defer@test.ex
>>> message: this is a forced defer
->>> require: condition test deferred
+>>> require: condition test deferred
in ACL "check_message"
LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
git://git.exim.org / users / jgh / exim.git / blobdiff