git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACL: Fix parsing of control=queue_only
[exim.git]
/
test
/
stderr
/
0062
diff --git
a/test/stderr/0062
b/test/stderr/0062
index 7aea13d29c11b9b3214880d852e5069c69f399d3..0658dc83349e2468d5c82d87aaecbe09a8a3bfd5 100644
(file)
--- a/
test/stderr/0062
+++ b/
test/stderr/0062
@@
-7,41
+7,42
@@
>>> 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 23)
>>> check domains = +local_domains
>>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> check domains = +local_domains
>>> test.ex in "test.ex : myhost.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
>>> using ACL "check_recipient"
>>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept"
(TESTSUITE/test-config 23)
>>> check domains = +local_domains
>>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
>>> anotherhost.example.com in "+local_domains"? no (end of list)
>>> check domains = +local_domains
>>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
>>> anotherhost.example.com in "+local_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 24)
>>> check domains = +relay_domains
>>> anotherhost.example.com in "test.ex"? no (end of list)
>>> anotherhost.example.com in "+relay_domains"? no (end of list)
>>> check domains = +relay_domains
>>> anotherhost.example.com in "test.ex"? no (end of list)
>>> anotherhost.example.com in "+relay_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 25)
>>> check hosts = +relay_hosts
>>> sender host name required, to match against *-2.test.ex
>>> looking up host name for V4NET.0.0.1
>>> check hosts = +relay_hosts
>>> sender host name required, to match against *-2.test.ex
>>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded ten-1.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>> name=ten-1.test.ex address=V4NET.0.0.1
+>>> IP address lookup yielded "ten-1.test.ex"
>>> checking addresses for ten-1.test.ex
>>> V4NET.0.0.1 OK
>>> host in "*-2.test.ex : *-3-alias.test.ex"? no (end of list)
>>> host in "+relay_hosts"? no (end of list)
>>> checking addresses for ten-1.test.ex
>>> V4NET.0.0.1 OK
>>> host in "*-2.test.ex : *-3-alias.test.ex"? no (end of list)
>>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed
->>> processing "deny"
->>> deny: condition test succeeded
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "deny" (TESTSUITE/test-config 26)
+>>> message: relay not permitted
+>>> deny: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": DENY
LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
>>> using ACL "check_message"
LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
>>> using ACL "check_message"
->>> processing "accept"
->>> accept: condition test succeeded
+>>> processing "accept" (TESTSUITE/test-config 29)
+>>> accept: condition test succeeded in ACL "check_message"
+>>> end of ACL "check_message": ACCEPT
LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
@@
-52,38
+53,38
@@
LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1
>>> 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 23)
>>> check domains = +local_domains
>>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> check domains = +local_domains
>>> test.ex in "test.ex : myhost.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
>>> using ACL "check_recipient"
>>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept"
(TESTSUITE/test-config 23)
>>> check domains = +local_domains
>>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
>>> anotherhost.example.com in "+local_domains"? no (end of list)
>>> check domains = +local_domains
>>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
>>> anotherhost.example.com in "+local_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 24)
>>> check domains = +relay_domains
>>> anotherhost.example.com in "test.ex"? no (end of list)
>>> anotherhost.example.com in "+relay_domains"? no (end of list)
>>> check domains = +relay_domains
>>> anotherhost.example.com in "test.ex"? no (end of list)
>>> anotherhost.example.com in "+relay_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 25)
>>> check hosts = +relay_hosts
>>> sender host name required, to match against *-2.test.ex
>>> looking up host name for V4NET.0.0.2
>>> check hosts = +relay_hosts
>>> sender host name required, to match against *-2.test.ex
>>> looking up host name for V4NET.0.0.2
->>> IP address lookup yielded ten-2.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>> name=ten-2.test.ex address=V4NET.0.0.2
+>>> IP address lookup yielded "ten-2.test.ex"
>>> checking addresses for ten-2.test.ex
>>> V4NET.0.0.2 OK
>>> host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-2.test.ex")
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> checking addresses for ten-2.test.ex
>>> V4NET.0.0.2 OK
>>> host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-2.test.ex")
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
>>> using ACL "check_message"
>>> using ACL "check_message"
->>> processing "accept"
->>> accept: condition test succeeded
+>>> processing "accept" (TESTSUITE/test-config 29)
+>>> accept: condition test succeeded in ACL "check_message"
+>>> end of ACL "check_message": ACCEPT
LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
@@
-94,42
+95,39
@@
LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2
>>> 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 23)
>>> check domains = +local_domains
>>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> check domains = +local_domains
>>> test.ex in "test.ex : myhost.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
>>> using ACL "check_recipient"
>>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept"
(TESTSUITE/test-config 23)
>>> check domains = +local_domains
>>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
>>> anotherhost.example.com in "+local_domains"? no (end of list)
>>> check domains = +local_domains
>>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
>>> anotherhost.example.com in "+local_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 24)
>>> check domains = +relay_domains
>>> anotherhost.example.com in "test.ex"? no (end of list)
>>> anotherhost.example.com in "+relay_domains"? no (end of list)
>>> check domains = +relay_domains
>>> anotherhost.example.com in "test.ex"? no (end of list)
>>> anotherhost.example.com in "+relay_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed
in ACL "check_recipient"
+>>> processing "accept"
(TESTSUITE/test-config 25)
>>> check hosts = +relay_hosts
>>> sender host name required, to match against *-2.test.ex
>>> looking up host name for V4NET.0.0.3
>>> check hosts = +relay_hosts
>>> sender host name required, to match against *-2.test.ex
>>> looking up host name for V4NET.0.0.3
->>> IP address lookup yielded ten-3.test.ex
->>> alias ten-3-alias.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>> name=ten-3.test.ex address=V4NET.0.0.3
+>>> IP address lookup yielded "ten-3.test.ex"
+>>> alias "ten-3-alias.test.ex"
>>> checking addresses for ten-3.test.ex
>>> V4NET.0.0.3 OK
>>> checking addresses for ten-3.test.ex
>>> V4NET.0.0.3 OK
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>> name=ten-3-alias.test.ex address=V4NET.0.0.3
>>> checking addresses for ten-3-alias.test.ex
>>> V4NET.0.0.3 OK
>>> host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-3-alias.test.ex")
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> checking addresses for ten-3-alias.test.ex
>>> V4NET.0.0.3 OK
>>> host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-3-alias.test.ex")
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
>>> using ACL "check_message"
>>> using ACL "check_message"
->>> processing "accept"
->>> accept: condition test succeeded
+>>> processing "accept" (TESTSUITE/test-config 29)
+>>> accept: condition test succeeded in ACL "check_message"
+>>> end of ACL "check_message": ACCEPT
LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=ten-3.test.ex [V4NET.0.0.3] P=smtp S=sss
LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=ten-3.test.ex [V4NET.0.0.3] P=smtp S=sss
git://git.exim.org / exim.git / blobdiff