diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-06-15 19:27:04 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-06-15 20:34:28 +0100 |
| commit | 2f8e0a5f6bc17ccd0749c0dc28f5da28da5d25a2 (patch) | |
| tree | 317d43b87c1e1e9f4ca315e5680bd10a18e158a2 /test/stderr | |
| parent | b9a2d0dd658cab56e0d1365e1c6a7c5ce9473bcf (diff) | |
hosts_require_helo
Diffstat (limited to 'test/stderr')
82 files changed, 916 insertions, 597 deletions
diff --git a/test/stderr/0002 b/test/stderr/0002 index bd2d8067f..0c34e84c3 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -395,6 +395,7 @@ search_tidyup called >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -408,7 +409,7 @@ LOG: 10HmaX-0005vi-00 Subject is: "" >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaX-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmaX-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -423,7 +424,7 @@ LOG: 10HmaY-0005vi-00 Subject is: "" >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b> +LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -438,7 +439,7 @@ LOG: 10HmaZ-0005vi-00 Subject is: "" >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d> +LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -453,7 +454,7 @@ LOG: 10HmbA-0005vi-00 Subject is: "" >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbA-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbA-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -468,7 +469,7 @@ LOG: 10HmbB-0005vi-00 Subject is: "" >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y> +LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -481,6 +482,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -495,7 +497,7 @@ LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_i >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -508,6 +510,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -522,7 +525,7 @@ LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be enc >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbD-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> Exim version x.yz .... changed uid/gid: -C, -D, -be or -bf forces real uid uid=CALLER_UID gid=CALLER_GID pid=pppp diff --git a/test/stderr/0003 b/test/stderr/0003 index 88fcb9827..b94b975ff 100644 --- a/test/stderr/0003 +++ b/test/stderr/0003 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -17,7 +18,7 @@ >>> a@b.c in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -29,7 +30,7 @@ LOG: H=[1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex> >>> a@B.C in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex> >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) @@ -42,7 +43,7 @@ LOG: H=[1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex> >>> A@b.c in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<A@b.c> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<A@b.c> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -54,7 +55,7 @@ LOG: H=[1.1.1.1] F=<A@b.c> rejected RCPT <x@test.ex> >>> A@B.C in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<A@B.C> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<A@B.C> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -66,7 +67,7 @@ LOG: H=[1.1.1.1] F=<A@B.C> rejected RCPT <x@test.ex> >>> x@y.z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<x@y.z> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<x@y.z> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -78,7 +79,7 @@ LOG: H=[1.1.1.1] F=<x@y.z> rejected RCPT <x@test.ex> >>> x@Y.Z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<x@Y.Z> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<x@Y.Z> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -90,7 +91,7 @@ LOG: H=[1.1.1.1] F=<x@Y.Z> rejected RCPT <x@test.ex> >>> X@y.z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<X@y.z> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<X@y.z> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -102,7 +103,7 @@ LOG: H=[1.1.1.1] F=<X@y.z> rejected RCPT <x@test.ex> >>> X@Y.Z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<X@Y.Z> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<X@Y.Z> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -113,7 +114,7 @@ LOG: H=[1.1.1.1] F=<X@Y.Z> rejected RCPT <x@test.ex> >>> ax@e.f in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -124,7 +125,7 @@ LOG: H=[1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex> >>> ay@g.h in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\DY@G\.H") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<ay@g.h> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<ay@g.h> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -135,7 +136,7 @@ LOG: H=[1.1.1.1] F=<ay@g.h> rejected RCPT <x@test.ex> >>> bX@E.F in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<bX@E.F> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<bX@E.F> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -146,7 +147,7 @@ LOG: H=[1.1.1.1] F=<bX@E.F> rejected RCPT <x@test.ex> >>> bY@G.H in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\DY@G\.H") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<bY@G.H> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<bY@G.H> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -187,7 +188,7 @@ LOG: H=[1.1.1.1] F=<bY@G.H> rejected RCPT <x@test.ex> >>> q@aa.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -198,7 +199,7 @@ LOG: H=[1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex> >>> q@AA.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -209,7 +210,7 @@ LOG: H=[1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex> >>> Q@bb.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -220,7 +221,7 @@ LOG: H=[1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex> >>> Q@BB.Com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -231,7 +232,7 @@ LOG: H=[1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex> >>> cc@dd.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -242,7 +243,7 @@ LOG: H=[1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex> >>> CC@DD.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -268,7 +269,7 @@ LOG: H=[1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex> >>> q@nn.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -279,7 +280,7 @@ LOG: H=[1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex> >>> Q@NN.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -290,7 +291,7 @@ LOG: H=[1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex> >>> q@MM.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -301,7 +302,7 @@ LOG: H=[1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex> >>> Pp@Qq.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -312,7 +313,7 @@ LOG: H=[1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex> >>> abcd@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<abcd@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<abcd@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -323,7 +324,7 @@ LOG: H=[1.1.1.1] F=<abcd@aa.bb> rejected RCPT <x@test.ex> >>> ABCD@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<ABCD@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<ABCD@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -334,7 +335,7 @@ LOG: H=[1.1.1.1] F=<ABCD@aa.bb> rejected RCPT <x@test.ex> >>> ax@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -345,7 +346,7 @@ LOG: H=[1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex> >>> bX@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<bX@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<bX@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -356,7 +357,7 @@ LOG: H=[1.1.1.1] F=<bX@aa.bb> rejected RCPT <x@test.ex> >>> Ay@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Ay@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Ay@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -367,7 +368,7 @@ LOG: H=[1.1.1.1] F=<Ay@aa.bb> rejected RCPT <x@test.ex> >>> BY@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -378,7 +379,7 @@ LOG: H=[1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex> >>> blocked@xy.zz in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<blocked@xy.zz> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<blocked@xy.zz> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -389,4 +390,4 @@ LOG: H=[1.1.1.1] F=<blocked@xy.zz> rejected RCPT <x@test.ex> >>> BLOCKED@zz.xy in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<BLOCKED@zz.xy> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<BLOCKED@zz.xy> rejected RCPT <x@test.ex> diff --git a/test/stderr/0004 b/test/stderr/0004 index 6353e8e12..6945d3190 100644 --- a/test/stderr/0004 +++ b/test/stderr/0004 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -17,7 +18,7 @@ >>> a@b.c in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -29,7 +30,7 @@ LOG: H=[1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex> >>> a@B.C in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex> >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) @@ -133,7 +134,7 @@ LOG: H=[1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex> >>> ax@e.f in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -219,7 +220,7 @@ LOG: H=[1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex> >>> q@aa.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -230,7 +231,7 @@ LOG: H=[1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex> >>> q@AA.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -241,7 +242,7 @@ LOG: H=[1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex> >>> Q@bb.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -252,7 +253,7 @@ LOG: H=[1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex> >>> Q@BB.Com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -263,7 +264,7 @@ LOG: H=[1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex> >>> cc@dd.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -274,7 +275,7 @@ LOG: H=[1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex> >>> CC@DD.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -300,7 +301,7 @@ LOG: H=[1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex> >>> q@nn.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -311,7 +312,7 @@ LOG: H=[1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex> >>> Q@NN.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -322,7 +323,7 @@ LOG: H=[1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex> >>> q@MM.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -333,7 +334,7 @@ LOG: H=[1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex> >>> q@mm.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<q@mm.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<q@mm.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -344,7 +345,7 @@ LOG: H=[1.1.1.1] F=<q@mm.com> rejected RCPT <x@test.ex> >>> Pp@Qq.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -385,7 +386,7 @@ LOG: H=[1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex> >>> AbCd@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<AbCd@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<AbCd@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -396,7 +397,7 @@ LOG: H=[1.1.1.1] F=<AbCd@aa.bb> rejected RCPT <x@test.ex> >>> ax@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -437,7 +438,7 @@ LOG: H=[1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex> >>> BY@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex> +LOG: H=(test) [1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 16) >>> check hosts = : @@ -478,5 +479,5 @@ LOG: H=[1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex> >>> BlOcKeD@zz.xy in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.1.1.1] F=<BlOcKeD@zz.xy> rejected RCPT <x@test.ex> -LOG: unexpected disconnection while reading SMTP command from [1.1.1.1] D=qqs +LOG: H=(test) [1.1.1.1] F=<BlOcKeD@zz.xy> rejected RCPT <x@test.ex> +LOG: unexpected disconnection while reading SMTP command from (test) [1.1.1.1] D=qqs diff --git a/test/stderr/0021 b/test/stderr/0021 index b9104e1c2..b476c0340 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -13,30 +13,31 @@ host in helo_verify_hosts? no (option unset) host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) using ACL "connect" -processing "deny" (TESTSUITE/test-config 50) +processing "deny" (TESTSUITE/test-config 52) check hosts = : 10.9.8.7 host in ": 10.9.8.7"? no (end of list) deny: condition test failed in ACL "connect" -processing "drop" (TESTSUITE/test-config 51) +processing "drop" (TESTSUITE/test-config 53) l_message: forcibly dropped check hosts = 10.9.8.9 host in "10.9.8.9"? no (end of list) drop: condition test failed in ACL "connect" -processing "accept" (TESTSUITE/test-config 53) +processing "accept" (TESTSUITE/test-config 55) 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 in ACL "connect" end of ACL "connect": ACCEPT +host in hosts_require_helo? no (end of list) using ACL "mail" -processing "warn" (TESTSUITE/test-config 61) +processing "warn" (TESTSUITE/test-config 63) message: added header line check senders = ok@test3 address match test: subject=bad@test1 pattern=ok@test3 bad@test1 in "ok@test3"? no (end of list) warn: condition test failed in ACL "mail" -processing "accept" (TESTSUITE/test-config 63) +processing "accept" (TESTSUITE/test-config 65) check senders = ok@test1 : ok@test3 address match test: subject=bad@test1 pattern=ok@test1 address match test: subject=bad@test1 pattern=ok@test3 @@ -45,15 +46,16 @@ 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> +host in hosts_require_helo? no (end of list) using ACL "mail" -processing "warn" (TESTSUITE/test-config 61) +processing "warn" (TESTSUITE/test-config 63) message: added header line check senders = 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) warn: condition test failed in ACL "mail" -processing "accept" (TESTSUITE/test-config 63) +processing "accept" (TESTSUITE/test-config 65) check senders = ok@test1 : ok@test3 address match test: subject=ok@test1 pattern=ok@test1 test1 in "test1"? yes (matched "test1") @@ -69,7 +71,7 @@ LOG: MAIN REJECT accept: condition test succeeded in ACL "mail" end of ACL "mail": ACCEPT using ACL "rcpt" -processing "accept" (TESTSUITE/test-config 68) +processing "accept" (TESTSUITE/test-config 70) check senders = +ok_senders address match test: subject=ok@test1 pattern=ok@somewhere test1 in "somewhere"? no (end of list) @@ -88,7 +90,7 @@ LOG: PANIC accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT using ACL "rcpt" -processing "accept" (TESTSUITE/test-config 68) +processing "accept" (TESTSUITE/test-config 70) check senders = +ok_senders cached yes match for +ok_senders cached lookup data = test1 @@ -121,31 +123,32 @@ host in helo_verify_hosts? no (option unset) host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) using ACL "connect" -processing "deny" (TESTSUITE/test-config 50) +processing "deny" (TESTSUITE/test-config 52) check hosts = : 10.9.8.7 host in ": 10.9.8.7"? no (end of list) deny: condition test failed in ACL "connect" -processing "drop" (TESTSUITE/test-config 51) +processing "drop" (TESTSUITE/test-config 53) l_message: forcibly dropped check hosts = 10.9.8.9 host in "10.9.8.9"? no (end of list) drop: condition test failed in ACL "connect" -processing "accept" (TESTSUITE/test-config 53) +processing "accept" (TESTSUITE/test-config 55) 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 in ACL "connect" end of ACL "connect": ACCEPT +host in hosts_require_helo? no (end of list) using ACL "mail" -processing "warn" (TESTSUITE/test-config 61) +processing "warn" (TESTSUITE/test-config 63) message: added header line check senders = 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") warn: condition test succeeded in ACL "mail" -processing "accept" (TESTSUITE/test-config 63) +processing "accept" (TESTSUITE/test-config 65) check senders = ok@test1 : ok@test3 address match test: subject=ok@test3 pattern=ok@test1 test3 in "test1"? no (end of list) @@ -163,7 +166,7 @@ LOG: MAIN REJECT accept: condition test succeeded in ACL "mail" end of ACL "mail": ACCEPT using ACL "rcpt" -processing "accept" (TESTSUITE/test-config 68) +processing "accept" (TESTSUITE/test-config 70) check senders = +ok_senders address match test: subject=ok@test3 pattern=ok@somewhere test3 in "somewhere"? no (end of list) diff --git a/test/stderr/0022 b/test/stderr/0022 index dc0e12575..c647f7326 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -24,6 +24,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.9.8.7] +sender_rcvhost = [V4NET.9.8.7] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7] +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -47,20 +53,20 @@ search_tidyup called Data file name: TESTSUITE/spool//input//10HmbF-0005vi-00-D Data file written for message 10HmbF-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.9.8.7] +P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) id 10HmbF-0005vi-00 for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN - <= x@y H=[V4NET.9.8.7] P=smtp S=sss + <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbF-0005vi-00 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -89,6 +95,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.9.8.7] +sender_rcvhost = [V4NET.9.8.7] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7] +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -99,7 +111,7 @@ processing "warn" (TESTSUITE/test-config 33) l_message: warn log message warn: condition test succeeded in ACL "warn_log" LOG: MAIN - H=[V4NET.9.8.7] Warning: warn log message + H=(test) [V4NET.9.8.7] Warning: warn log message processing "accept" (TESTSUITE/test-config 34) accept: condition test succeeded in ACL "warn_log" end of ACL "warn_log": ACCEPT @@ -115,20 +127,20 @@ search_tidyup called Data file name: TESTSUITE/spool//input//10HmbG-0005vi-00-D Data file written for message 10HmbG-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.9.8.7] +P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) id 10HmbG-0005vi-00 for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN - <= x@y H=[V4NET.9.8.7] P=smtp S=sss + <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbG-0005vi-00 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -157,6 +169,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.9.8.7] +sender_rcvhost = [V4NET.9.8.7] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7] +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -181,7 +199,7 @@ search_tidyup called Data file name: TESTSUITE/spool//input//10HmbH-0005vi-00-D Data file written for message 10HmbH-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.9.8.7] +P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) id 10HmbH-0005vi-00 @@ -191,13 +209,13 @@ P Received: from [V4NET.9.8.7] X-ACL-Warn: warn user message >> LOG: MAIN - <= x@y H=[V4NET.9.8.7] P=smtp S=sss + <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbH-0005vi-00 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (end of list) @@ -209,12 +227,13 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "defer" >>> processing "defer" (TESTSUITE/test-config 51) >>> message: forcibly deferred >>> defer: condition test succeeded in ACL "defer" >>> end of ACL "defer": DEFER -LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred +LOG: H=(test) [V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred >>> using ACL "accept" >>> processing "accept" (TESTSUITE/test-config 24) >>> accept: condition test succeeded in ACL "accept" @@ -224,8 +243,8 @@ LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly defer >>> message: forcibly dropped >>> drop: condition test succeeded in ACL "drop" >>> end of ACL "drop": DROP -LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped -LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL +LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -235,14 +254,15 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "defer_senders" >>> processing "defer" (TESTSUITE/test-config 54) >>> check senders = : >>> in ":"? yes (matched "") >>> defer: condition test succeeded in ACL "defer_senders" >>> end of ACL "defer_senders": DEFER -LOG: H=[V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y> -LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT +LOG: H=(test) [V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y> +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -252,6 +272,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "delay_accept" >>> processing "accept" (TESTSUITE/test-config 57) >>> check delay = 1s @@ -268,7 +289,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> processing "accept" (TESTSUITE/test-config 61) >>> accept: condition test succeeded in ACL "delay_warn" >>> end of ACL "delay_warn": ACCEPT -LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -278,6 +299,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "host_check" >>> processing "deny" (TESTSUITE/test-config 71) >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts @@ -285,7 +307,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> message: host data >$host_data< >>> deny: condition test succeeded in ACL "host_check" >>> end of ACL "host_check": DENY -LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message< +LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message< >>> using ACL "host_check" >>> processing "deny" (TESTSUITE/test-config 71) >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts @@ -293,7 +315,7 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-spe >>> message: host data >$host_data< >>> deny: condition test succeeded in ACL "host_check" >>> end of ACL "host_check": DENY -LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message< +LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message< >>> using ACL "host_check2" >>> processing "deny" (TESTSUITE/test-config 75) >>> message: host data >$host_data< @@ -302,7 +324,7 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-spe >>> host in "+some_hosts"? yes (matched "+some_hosts") >>> deny: condition test succeeded in ACL "host_check2" >>> end of ACL "host_check2": DENY -LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message< +LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message< >>> using ACL "host_check2" >>> processing "deny" (TESTSUITE/test-config 75) >>> message: host data >$host_data< @@ -310,8 +332,8 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-sp >>> host in "+some_hosts"? yes (matched "+some_hosts" - cached) >>> deny: condition test succeeded in ACL "host_check2" >>> end of ACL "host_check2": DENY -LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message< -LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT +LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message< +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN @@ -349,6 +371,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "nested_drop" >>> processing "accept" (TESTSUITE/test-config 44) >>> check acl = drop @@ -359,8 +382,8 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> end of ACL "drop": DROP >>> accept: condition test yielded "drop" in ACL "nested_drop" >>> accept: endpass encountered - denying access -LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped -LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL +LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -370,6 +393,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "nested_drop_require" >>> processing "require" (TESTSUITE/test-config 48) >>> check acl = drop @@ -380,7 +404,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> end of ACL "drop": DROP >>> require: condition test yielded "drop" in ACL "nested_drop_require" >>> end of ACL "nested_drop_require": not OK -LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped -LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL +LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL ******** SERVER ******** diff --git a/test/stderr/0023 b/test/stderr/0023 index 441422371..07d8126f8 100644 --- a/test/stderr/0023 +++ b/test/stderr/0023 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_1_2_3" >>> processing "require" (TESTSUITE/test-config 44) >>> check domains = !nopass @@ -64,7 +65,7 @@ >>> z in "+relay_domains"? no (end of list) >>> accept: condition test failed in ACL "acl_1_2_3" >>> end of ACL "acl_1_2_3": implicit DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z> +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <z@z> >>> using ACL "acl_1_2_3" >>> processing "require" (TESTSUITE/test-config 44) >>> check domains = !nopass @@ -161,7 +162,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z> >>> deny.test.ex in "deny.test.ex"? yes (matched "deny.test.ex") >>> deny: condition test succeeded in ACL "acl_1_2_3" >>> end of ACL "acl_1_2_3": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITLY DENIED +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITLY DENIED >>> using ACL "acl_1_2_3" >>> processing "require" (TESTSUITE/test-config 44) >>> check domains = !nopass @@ -188,14 +189,14 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITLY DENIE >>> refuse.test.ex in "!refuse.test.ex"? no (matched "!refuse.test.ex") >>> accept: condition test failed in ACL "acl_1_2_3" >>> accept: endpass encountered - denying access -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@refuse.test.ex>: refuse.test.ex gets refused +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@refuse.test.ex>: refuse.test.ex gets refused >>> using ACL "acl_1_2_3" >>> processing "require" (TESTSUITE/test-config 44) >>> check domains = !nopass >>> nopass in "!nopass"? no (matched "!nopass") >>> require: condition test failed in ACL "acl_1_2_3" >>> end of ACL "acl_1_2_3": not OK -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@nopass> +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@nopass> >>> using ACL "acl_1_2_3" >>> processing "require" (TESTSUITE/test-config 44) >>> check domains = !nopass @@ -207,7 +208,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@nopass> >>> wontpass in "!wontpass"? no (matched "!wontpass") >>> require: condition test failed in ACL "acl_1_2_3" >>> end of ACL "acl_1_2_3": not OK -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -216,13 +217,14 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_5_6_7" >>> processing "accept" (TESTSUITE/test-config 64) >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms >>> y in "lsearch;TESTSUITE/aux-fixed/0023.doms"? no (end of list) >>> accept: condition test failed in ACL "acl_5_6_7" >>> end of ACL "acl_5_6_7": implicit DENY -LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@y> +LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@y> >>> using ACL "acl_5_6_7" >>> processing "accept" (TESTSUITE/test-config 64) >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms @@ -231,7 +233,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@y> >>> x in "userx : spqr"? no (end of list) >>> accept: condition test failed in ACL "acl_5_6_7" >>> end of ACL "acl_5_6_7": implicit DENY -LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex> +LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex> >>> using ACL "acl_5_6_7" >>> processing "accept" (TESTSUITE/test-config 64) >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms @@ -256,6 +258,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_9_9_9" >>> processing "accept" (TESTSUITE/test-config 91) >>> check hosts = +ok9_hosts @@ -277,6 +280,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_9_9_9" >>> processing "accept" (TESTSUITE/test-config 91) >>> check hosts = +ok9_hosts @@ -289,7 +293,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex> >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26") >>> deny: condition test succeeded in ACL "acl_9_9_9" >>> end of ACL "acl_9_9_9": DENY -LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host +LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host >>> using ACL "acl_9_9_9" >>> processing "accept" (TESTSUITE/test-config 91) >>> check hosts = +ok9_hosts @@ -301,7 +305,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26") >>> deny: condition test succeeded in ACL "acl_9_9_9" >>> end of ACL "acl_9_9_9": DENY -LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host +LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -310,6 +314,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_9_9_9" >>> processing "accept" (TESTSUITE/test-config 91) >>> check hosts = +ok9_hosts @@ -349,6 +354,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_5_6_8" >>> processing "accept" (TESTSUITE/test-config 68) >>> check senders = user1@domain1 : domain2 : +ok_senders @@ -357,7 +363,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host >>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list) >>> accept: condition test failed in ACL "acl_5_6_8" >>> end of ACL "acl_5_6_8": implicit DENY -LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <x@y> +LOG: H=(test) [5.6.8.1] F=<x@y> rejected RCPT <x@y> >>> using ACL "acl_5_6_8" >>> processing "accept" (TESTSUITE/test-config 68) >>> check senders = user1@domain1 : domain2 : +ok_senders @@ -365,7 +371,7 @@ LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <x@y> >>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list) >>> accept: condition test failed in ACL "acl_5_6_8" >>> end of ACL "acl_5_6_8": implicit DENY -LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <y@x> +LOG: H=(test) [5.6.8.1] F=<x@y> rejected RCPT <y@x> >>> using ACL "acl_5_6_8" >>> processing "accept" (TESTSUITE/test-config 68) >>> check senders = user1@domain1 : domain2 : +ok_senders @@ -382,7 +388,7 @@ LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <y@x> >>> user2@domain1 in "user1@domain1 : domain2 : +ok_senders"? no (end of list) >>> accept: condition test failed in ACL "acl_5_6_8" >>> end of ACL "acl_5_6_8": implicit DENY -LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y> +LOG: H=(test) [5.6.8.1] F=<user2@domain1> rejected RCPT <x@y> >>> using ACL "acl_5_6_8" >>> processing "accept" (TESTSUITE/test-config 68) >>> check senders = user1@domain1 : domain2 : +ok_senders @@ -415,6 +421,7 @@ LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_5_6_11" >>> processing "accept" (TESTSUITE/test-config 71) >>> check condition = ${if match{$local_part}{^x}{yes}{no}} @@ -436,7 +443,7 @@ LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y> >>> message: "local part of wrong type\n(quotes are literal) >>> deny: condition test succeeded in ACL "acl_5_6_11" >>> end of ACL "acl_5_6_11": DENY -LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type +LOG: H=(test) [5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -445,6 +452,7 @@ LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_5_6_12" >>> processing "accept" (TESTSUITE/test-config 75) >>> check hosts = 5.6.12.1 @@ -473,7 +481,7 @@ LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type >>> end of ACL "acl_5_6_12A": implicit DENY >>> accept: condition test failed in ACL "acl_5_6_12" >>> accept: endpass encountered - denying access -LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl +LOG: H=(test) [5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -482,6 +490,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_5_6_12" >>> processing "accept" (TESTSUITE/test-config 75) >>> check hosts = 5.6.12.1 @@ -506,6 +515,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_8_8_8" >>> processing "accept" (TESTSUITE/test-config 88) >>> check acl = acl_8_8_8 @@ -590,7 +600,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl >>> accept: condition test error in ACL "acl_8_8_8" >>> accept: condition test error in ACL "acl_8_8_8" >>> accept: condition test error in ACL "acl_8_8_8" -LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: possible loop +LOG: H=(test) [8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: possible loop >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -599,6 +609,7 @@ LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: p >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_5_6_13" >>> processing "accept" (TESTSUITE/test-config 85) >>> check acl = TESTSUITE/aux-fixed/0023.acl1 @@ -625,7 +636,7 @@ LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: p >>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY >>> accept: condition test failed in ACL "acl_5_6_13" >>> end of ACL "acl_5_6_13": implicit DENY -LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x1@y> +LOG: H=(test) [5.6.13.1] F=<x@y> rejected RCPT <x1@y> >>> using ACL "acl_5_6_13" >>> processing "accept" (TESTSUITE/test-config 85) >>> check acl = TESTSUITE/aux-fixed/0023.acl1 @@ -639,7 +650,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x1@y> >>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY >>> accept: condition test failed in ACL "acl_5_6_13" >>> end of ACL "acl_5_6_13": implicit DENY -LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y> +LOG: H=(test) [5.6.13.1] F=<x@y> rejected RCPT <x2@y> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -648,6 +659,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_V4NET_11_12" >>> processing "deny" (TESTSUITE/test-config 105) >>> message: host in DNS list $dnslist_domain: $dnslist_text @@ -660,7 +672,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y> >>> => that means V4NET.11.12.13 is listed at rbl.test.ex >>> deny: condition test succeeded in ACL "acl_V4NET_11_12" >>> end of ACL "acl_V4NET_11_12": DENY -LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message) +LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message) >>> using ACL "acl_V4NET_11_12" >>> processing "deny" (TESTSUITE/test-config 105) >>> message: host in DNS list $dnslist_domain: $dnslist_text @@ -672,7 +684,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This >>> => that means V4NET.11.12.13 is listed at rbl.test.ex >>> deny: condition test succeeded in ACL "acl_V4NET_11_12" >>> end of ACL "acl_V4NET_11_12": DENY -LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message) +LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message) >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -681,6 +693,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_V4NET_11_12" >>> processing "deny" (TESTSUITE/test-config 105) >>> message: host in DNS list $dnslist_domain: $dnslist_text @@ -716,6 +729,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_20_20_20" >>> processing "accept" (TESTSUITE/test-config 111) >>> message: sender verify failure @@ -729,8 +743,8 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "acl_20_20_20" >>> accept: endpass encountered - denying access -LOG: H=[20.20.20.20] sender verify fail for <x@y>: Unrouteable address -LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed +LOG: H=(test) [20.20.20.20] sender verify fail for <x@y>: Unrouteable address +LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed >>> using ACL "acl_20_20_20" >>> processing "accept" (TESTSUITE/test-config 111) >>> message: sender verify failure @@ -738,7 +752,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed >>> using cached sender verify result >>> accept: condition test failed in ACL "acl_20_20_20" >>> accept: endpass encountered - denying access -LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed +LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -747,6 +761,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_20_20_20" >>> processing "accept" (TESTSUITE/test-config 111) >>> message: sender verify failure @@ -769,7 +784,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "acl_20_20_20" >>> accept: endpass encountered - denying access -LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address +LOG: H=(test) [20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address >>> using ACL "acl_20_20_20" >>> processing "accept" (TESTSUITE/test-config 111) >>> message: sender verify failure @@ -794,6 +809,7 @@ LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_21_21_21" >>> processing "accept" (TESTSUITE/test-config 118) >>> check verify = sender @@ -814,7 +830,7 @@ LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "acl_21_21_21" >>> end of ACL "acl_21_21_21": implicit DENY -LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address +LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address >>> using ACL "acl_21_21_21" >>> processing "accept" (TESTSUITE/test-config 118) >>> check verify = sender @@ -844,7 +860,7 @@ LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "acl_21_21_21" >>> end of ACL "acl_21_21_21": implicit DENY -LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message +LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message >>> using ACL "acl_21_21_21" >>> processing "accept" (TESTSUITE/test-config 118) >>> check verify = sender @@ -857,15 +873,15 @@ LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "acl_21_21_21" >>> end of ACL "acl_21_21_21": implicit DENY -LOG: H=[21.21.21.21] sender verify fail for <x@y>: Unrouteable address -LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x1@y>: Sender verify failed +LOG: H=(test) [21.21.21.21] sender verify fail for <x@y>: Unrouteable address +LOG: H=(test) [21.21.21.21] F=<x@y> rejected RCPT <x1@y>: Sender verify failed >>> using ACL "acl_21_21_21" >>> processing "accept" (TESTSUITE/test-config 118) >>> check verify = sender >>> using cached sender verify result >>> accept: condition test failed in ACL "acl_21_21_21" >>> end of ACL "acl_21_21_21": implicit DENY -LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed +LOG: H=(test) [21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "acl_21_21_21" >>> processing "accept" (TESTSUITE/test-config 118) @@ -880,8 +896,8 @@ LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "acl_21_21_21" >>> end of ACL "acl_21_21_21": implicit DENY -LOG: H=[21.21.21.21] sender verify fail for <fail@y>: here is a fail message -LOG: H=[21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed +LOG: H=(test) [21.21.21.21] sender verify fail for <fail@y>: here is a fail message +LOG: H=(test) [21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -890,13 +906,14 @@ LOG: H=[21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_22_22_22" >>> processing "accept" (TESTSUITE/test-config 123) >>> check recipients = x@y >>> userx@y in "x@y"? no (end of list) >>> accept: condition test failed in ACL "acl_22_22_22" >>> end of ACL "acl_22_22_22": implicit DENY -LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y> +LOG: H=(test) [22.22.22.22] F=<userx@y> rejected RCPT <userx@y> >>> using ACL "acl_22_22_22" >>> processing "accept" (TESTSUITE/test-config 123) >>> check recipients = x@y @@ -912,6 +929,7 @@ LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_23_23_23" >>> processing "deny" (TESTSUITE/test-config 126) >>> check hosts = 23.23.23.0 @@ -927,8 +945,8 @@ LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y> >>> ----------- end verify ------------ >>> deny: condition test succeeded in ACL "acl_23_23_23" >>> end of ACL "acl_23_23_23": DENY -LOG: H=[23.23.23.0] sender verify fail for <x@y>: Unrouteable address -LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed +LOG: H=(test) [23.23.23.0] sender verify fail for <x@y>: Unrouteable address +LOG: H=(test) [23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed >>> using ACL "acl_23_23_23" >>> processing "deny" (TESTSUITE/test-config 126) >>> check hosts = 23.23.23.0 @@ -954,6 +972,7 @@ LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_23_23_23" >>> processing "deny" (TESTSUITE/test-config 126) >>> check hosts = 23.23.23.0 @@ -970,13 +989,14 @@ LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_24_24_24" >>> processing "warn" (TESTSUITE/test-config 132) >>> message: X-Warn: sender didn't verify >>> check condition = yes >>> warn: condition test succeeded in ACL "acl_24_24_24" >>> end of ACL "acl_24_24_24": implicit DENY -LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y> +LOG: H=(test) [24.24.24.24] F=<x@y> rejected RCPT <userx@y> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -985,6 +1005,7 @@ LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_25_25_25" >>> processing "deny" (TESTSUITE/test-config 136) >>> message: denying domains=x @@ -992,7 +1013,7 @@ LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y> >>> y in "x"? no (end of list) >>> deny: condition test failed in ACL "acl_25_25_25" >>> end of ACL "acl_25_25_25": implicit DENY -LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y> +LOG: H=(test) [25.25.25.25] F=<x@y> rejected RCPT <x@y> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -1001,6 +1022,7 @@ LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_26_26_26" >>> processing "deny" (TESTSUITE/test-config 140) >>> check senders = : @@ -1021,7 +1043,7 @@ LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y> >>> = yes >>> deny: condition test succeeded in ACL "acl_26_26_26" >>> end of ACL "acl_26_26_26": DENY -LOG: H=[26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one recipient +LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one recipient >>> using ACL "acl_26_26_26" >>> processing "deny" (TESTSUITE/test-config 140) >>> check senders = : @@ -1031,7 +1053,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one >>> = yes >>> deny: condition test succeeded in ACL "acl_26_26_26" >>> end of ACL "acl_26_26_26": DENY -LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one recipient +LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one recipient >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -1040,6 +1062,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_27_27_27" >>> processing "deny" (TESTSUITE/test-config 147) >>> check hosts = ${if eq {1}{0}{}fail} @@ -1056,6 +1079,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_28_28_28" >>> processing "accept" (TESTSUITE/test-config 151) >>> check sender_domains = : okdomain @@ -1075,7 +1099,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one >>> baddomain in ": okdomain"? no (end of list) >>> accept: condition test failed in ACL "acl_28_28_28" >>> end of ACL "acl_28_28_28": implicit DENY -LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y> +LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -1084,6 +1108,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_V4NET_0_0" >>> processing "require" (TESTSUITE/test-config 97) >>> check verify = reverse_host_lookup @@ -1107,6 +1132,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_V4NET_0_0" >>> processing "require" (TESTSUITE/test-config 97) >>> check verify = reverse_host_lookup @@ -1115,7 +1141,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y> LOG: no host name found for IP address V4NET.0.0.97 >>> require: condition test failed in ACL "acl_V4NET_0_0" >>> end of ACL "acl_V4NET_0_0": not OK -LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse lookup check (failed to find host name from IP address) +LOG: H=(test) [V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse lookup check (failed to find host name from IP address) >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -1124,6 +1150,7 @@ LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse l >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_V4NET_99_99" >>> processing "accept" (TESTSUITE/test-config 100) >>> check local_parts = defer_ok @@ -1137,7 +1164,7 @@ LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse l >>> x.test.again.dns in dns_again_means_nonexist? no (option unset) >>> temporary error for host name lookup >>> accept: condition test deferred in ACL "acl_V4NET_99_99" -LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferred for reverse lookup check +LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferred for reverse lookup check >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -1146,6 +1173,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_V4NET_99_99" >>> processing "accept" (TESTSUITE/test-config 100) >>> check local_parts = defer_ok @@ -1166,6 +1194,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_29_29_29" >>> processing "deny" (TESTSUITE/test-config 154) >>> check dnslists = test.ex/$sender_address_domain @@ -1177,7 +1206,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr >>> => that means localhost is listed at test.ex >>> deny: condition test succeeded in ACL "acl_29_29_29" >>> end of ACL "acl_29_29_29": DENY -LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y> +LOG: H=(test) [29.29.29.29] F=<a@localhost> rejected RCPT <x@y> >>> using ACL "acl_29_29_29" >>> processing "deny" (TESTSUITE/test-config 154) >>> check dnslists = test.ex/$sender_address_domain @@ -1199,6 +1228,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y> >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_30_30_30" >>> processing "deny" (TESTSUITE/test-config 161) >>> message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text" @@ -1211,7 +1241,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y> >>> => that means ten-1 is listed at test.ex >>> deny: condition test succeeded in ACL "acl_30_30_30" >>> end of ACL "acl_30_30_30": DENY -LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex +LOG: H=(test) [30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex >>> using ACL "acl_30_30_30" >>> processing "deny" (TESTSUITE/test-config 161) >>> message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text" @@ -1240,7 +1270,7 @@ LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex >>> => that means 13.12.11.V4NET.rbl is listed at test.ex >>> deny: condition test succeeded in ACL "acl_30_30_30" >>> end of ACL "acl_30_30_30": DENY -LOG: H=[30.30.30.30] F=<a@13.12.11.V4NET.rbl> rejected RCPT <x@y>: domain=test.ex +LOG: H=(test) [30.30.30.30] F=<a@13.12.11.V4NET.rbl> rejected RCPT <x@y>: domain=test.ex >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -1249,6 +1279,7 @@ LOG: H=[30.30.30.30] F=<a@13.12.11.V4NET.rbl> rejected RCPT <x@y>: domain=test.e >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_31_31_31" >>> processing "deny" (TESTSUITE/test-config 167) >>> check dnslists = test.ex/$sender_address_domain+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+END @@ -1267,6 +1298,7 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_33_33_33" >>> processing "accept" (TESTSUITE/test-config 184) >>> message: sender verify failure @@ -1280,7 +1312,7 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+ >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "acl_33_33_33" >>> accept: endpass encountered - denying access -LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed +LOG: H=(test) [33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed >>> using ACL "acl_33_33_33" >>> processing "accept" (TESTSUITE/test-config 184) >>> message: sender verify failure @@ -1288,7 +1320,7 @@ LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed >>> using cached sender verify result >>> accept: condition test failed in ACL "acl_33_33_33" >>> accept: endpass encountered - denying access -LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed +LOG: H=(test) [33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -1297,6 +1329,7 @@ LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_44_44_44" >>> processing "warn" (TESTSUITE/test-config 192) >>> check dnslists = test.again.dns @@ -1328,7 +1361,7 @@ LOG: DNS list lookup defer (probably timeout) for 1.44.44.44.test.again.dns: ass >>> dnslists: using result of previous lookup LOG: DNS list lookup defer (probably timeout) for 1.44.44.44.test.again.dns: returned DEFER >>> warn: condition test deferred in ACL "acl_44_44_44" -LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferred +LOG: H=(test) [44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferred >>> processing "accept" (TESTSUITE/test-config 196) >>> accept: condition test succeeded in ACL "acl_44_44_44" >>> end of ACL "acl_44_44_44": ACCEPT @@ -1340,6 +1373,7 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_60_60_60" >>> processing "accept" (TESTSUITE/test-config 226) >>> check !acl = TESTSUITE/aux-fixed/0023.acl2 @@ -1364,4 +1398,4 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr >>> end of ACL "TESTSUITE/aux-fixed/0023.acl2": ACCEPT >>> accept: condition test failed in ACL "acl_60_60_60" >>> end of ACL "acl_60_60_60": implicit DENY -LOG: H=[60.60.60.60] F=<x@y> rejected RCPT <a@b> +LOG: H=(test) [60.60.60.60] F=<x@y> rejected RCPT <a@b> diff --git a/test/stderr/0026 b/test/stderr/0026 index e1dfdf664..5bd6f0115 100644 --- a/test/stderr/0026 +++ b/test/stderr/0026 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 61) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -25,7 +26,7 @@ LOG: 10HmbI-0005vi-00 $h_from: '@' >>> check verify = header_syntax >>> require: condition test failed in ACL "acl_data" >>> end of ACL "acl_data": not OK -LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ +LOG: 10HmbI-0005vi-00 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -34,6 +35,7 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 61) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -45,4 +47,4 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o >>> = yes >>> deny: condition test succeeded in ACL "acl_data" >>> end of ACL "acl_data": DENY -LOG: 10HmbJ-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: body contains trigger +LOG: 10HmbJ-0005vi-00 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: body contains trigger diff --git a/test/stderr/0056 b/test/stderr/0056 index f23ed97ef..8cb1215cb 100644 --- a/test/stderr/0056 +++ b/test/stderr/0056 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -37,4 +38,4 @@ >>> 3rdhost.example.com in "+relay_domains"? yes (matched "+relay_domains") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss diff --git a/test/stderr/0057 b/test/stderr/0057 index 2f087d7c1..1ad870341 100644 --- a/test/stderr/0057 +++ b/test/stderr/0057 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> test.ex in percent_hack_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) @@ -30,7 +31,7 @@ >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted >>> 3rdhost.example.com in percent_hack_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) @@ -47,5 +48,5 @@ LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@another >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss +LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss diff --git a/test/stderr/0058 b/test/stderr/0058 index 326127bac..828796982 100644 --- a/test/stderr/0058 +++ b/test/stderr/0058 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check domains = +local_domains @@ -18,7 +19,7 @@ >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check domains = +local_domains @@ -30,4 +31,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss >>> host in "+relay_hosts"? yes (matched "+relay_hosts" - cached) >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss diff --git a/test/stderr/0059 b/test/stderr/0059 index b9c3bd9db..835a64e9e 100644 --- a/test/stderr/0059 +++ b/test/stderr/0059 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -33,5 +34,5 @@ >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss +LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss diff --git a/test/stderr/0060 b/test/stderr/0060 index df969e4b2..7060ca8fe 100644 --- a/test/stderr/0060 +++ b/test/stderr/0060 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -33,7 +34,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -42,6 +43,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -76,8 +78,8 @@ MUNGED: ::1 will be omitted in what follows >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss +LOG: H=(test) [V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -86,6 +88,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -117,7 +120,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.5] P=smtp S=sss +LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -126,6 +129,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.5] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -157,7 +161,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.6] P=smtp S=sss +LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -166,6 +170,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.6] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -193,8 +198,8 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.6] P=smtp S=sss >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.255.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=sss +LOG: H=(test) [V4NET.255.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -203,6 +208,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=s >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -230,8 +236,8 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=s >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.255.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=sss +LOG: H=(test) [V4NET.255.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -240,6 +246,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=s >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -267,8 +274,8 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=s >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.255.0.3] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=sss +LOG: H=(test) [V4NET.255.0.3] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -277,6 +284,7 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=s >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -304,5 +312,5 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=s >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.255.0.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.4] P=smtp S=sss +LOG: H=(test) [V4NET.255.0.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.4] P=smtp S=sss diff --git a/test/stderr/0061 b/test/stderr/0061 index 7026031ba..a4ce8be2d 100644 --- a/test/stderr/0061 +++ b/test/stderr/0061 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -33,7 +34,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -42,6 +43,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -72,5 +74,5 @@ MUNGED: ::1 will be omitted in what follows >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss +LOG: H=(test) [V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss diff --git a/test/stderr/0062 b/test/stderr/0062 index 0658dc833..95a1ecfd2 100644 --- a/test/stderr/0062 +++ b/test/stderr/0062 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -38,12 +39,12 @@ >>> 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 +LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted >>> using ACL "check_message" >>> 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 +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -52,6 +53,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1 >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -85,7 +87,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1 >>> 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 +LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -94,6 +96,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2 >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -130,4 +133,4 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2 >>> 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 (test) [V4NET.0.0.3] P=smtp S=sss diff --git a/test/stderr/0063 b/test/stderr/0063 index 56929ff23..3a3410725 100644 --- a/test/stderr/0063 +++ b/test/stderr/0063 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -38,8 +39,8 @@ >>> 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 -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss +LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -48,6 +49,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1 >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 22) >>> check domains = +local_domains @@ -77,4 +79,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1 >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss diff --git a/test/stderr/0064 b/test/stderr/0064 index b19722739..4365563cb 100644 --- a/test/stderr/0064 +++ b/test/stderr/0064 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check domains = +local_domains @@ -38,8 +39,8 @@ >>> 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 -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss +LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -48,6 +49,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1 >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check domains = +local_domains @@ -77,4 +79,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1 >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss diff --git a/test/stderr/0065 b/test/stderr/0065 index e12581d58..50276148f 100644 --- a/test/stderr/0065 +++ b/test/stderr/0065 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -30,7 +31,7 @@ >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -39,6 +40,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -66,8 +68,8 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss +LOG: H=(test) [1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -76,6 +78,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -100,7 +103,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss +LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -109,6 +112,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -136,8 +140,8 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss +LOG: H=(test) [1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -146,6 +150,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -170,7 +175,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss +LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -179,6 +184,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -203,7 +209,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=sss +LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -212,6 +218,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=ss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check domains = +local_domains @@ -236,4 +243,4 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=ss >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[192.153.98.4] P=smtp S=sss +LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [192.153.98.4] P=smtp S=sss diff --git a/test/stderr/0066 b/test/stderr/0066 index 096bd8a48..9769c7126 100644 --- a/test/stderr/0066 +++ b/test/stderr/0066 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -36,7 +37,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -45,6 +46,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -78,8 +80,8 @@ MUNGED: ::1 will be omitted in what follows >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss +LOG: H=(test) [1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -88,6 +90,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -118,7 +121,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss +LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -127,6 +130,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -163,8 +167,8 @@ LOG: no host name found for IP address 1.3.2.4 >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss +LOG: H=(test) [1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -173,6 +177,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -203,7 +208,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss +LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -212,6 +217,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -242,7 +248,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=sss +LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -251,6 +257,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=ss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -286,7 +293,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -295,6 +302,7 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1 >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -325,8 +333,8 @@ MUNGED: ::1 will be omitted in what follows >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.11.12.13] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.11.12.13] P=smtp S=sss +LOG: H=(test) [V4NET.11.12.13] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted +LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.11.12.13] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -335,6 +343,7 @@ LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.11.12.13] P=smtp S= >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check domains = +local_domains @@ -365,4 +374,4 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbF-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.3] P=smtp S=sss +LOG: 10HmbF-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.3] P=smtp S=sss diff --git a/test/stderr/0067 b/test/stderr/0067 index 95106a806..69d05946d 100644 --- a/test/stderr/0067 +++ b/test/stderr/0067 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -72,7 +73,7 @@ >>> y@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@b.c") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<y@b.c> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<y@b.c> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -88,7 +89,7 @@ LOG: H=[1.2.3.4] F=<y@b.c> rejected RCPT <x@test.ex> >>> philip@xy.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<philip@xy.z> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<philip@xy.z> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -104,7 +105,7 @@ LOG: H=[1.2.3.4] F=<philip@xy.z> rejected RCPT <x@test.ex> >>> quilt@patch.work in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<quilt@patch.work> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<quilt@patch.work> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -144,7 +145,7 @@ LOG: H=[1.2.3.4] F=<quilt@patch.work> rejected RCPT <x@test.ex> >>> xx@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<xx@abc.def> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<xx@abc.def> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -160,7 +161,7 @@ LOG: H=[1.2.3.4] F=<xx@abc.def> rejected RCPT <x@test.ex> >>> abc@d.e.f in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<abc@d.e.f> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<abc@d.e.f> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -227,7 +228,7 @@ LOG: H=[1.2.3.4] F=<abc@d.e.f> rejected RCPT <x@test.ex> >>> abc@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<abc@z.z> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<abc@z.z> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -269,7 +270,7 @@ LOG: H=[1.2.3.4] F=<abc@z.z> rejected RCPT <x@test.ex> >>> xyz@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<xyz@z.z> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<xyz@z.z> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -285,7 +286,7 @@ LOG: H=[1.2.3.4] F=<xyz@z.z> rejected RCPT <x@test.ex> >>> 12345678@p.q.r in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<12345678@p.q.r> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<12345678@p.q.r> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -301,7 +302,7 @@ LOG: H=[1.2.3.4] F=<12345678@p.q.r> rejected RCPT <x@test.ex> >>> 12345678@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<12345678@z.z> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<12345678@z.z> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -351,7 +352,7 @@ LOG: H=[1.2.3.4] F=<12345678@z.z> rejected RCPT <x@test.ex> >>> 1234@m.n.o in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "1234@m.n.o") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<1234@m.n.o> rejected RCPT <userx@test.ex> +LOG: H=(test) [1.2.3.4] F=<1234@m.n.o> rejected RCPT <userx@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -396,7 +397,7 @@ LOG: H=[1.2.3.4] F=<1234@m.n.o> rejected RCPT <userx@test.ex> >>> rr01@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "rr01@a.b.c" in TESTSUITE/aux-fixed/0067.rejrec) >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<rr01@a.b.c> rejected RCPT <userx@test.ex> +LOG: H=(test) [1.2.3.4] F=<rr01@a.b.c> rejected RCPT <userx@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -444,7 +445,7 @@ LOG: H=[1.2.3.4] F=<rr01@a.b.c> rejected RCPT <userx@test.ex> >>> qq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^qq" in TESTSUITE/aux-fixed/0067.rejrec) >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<qq@a.b.c> rejected RCPT <userx@test.ex> +LOG: H=(test) [1.2.3.4] F=<qq@a.b.c> rejected RCPT <userx@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -466,7 +467,7 @@ LOG: H=[1.2.3.4] F=<qq@a.b.c> rejected RCPT <userx@test.ex> >>> !excl@z.z in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^!excl" in TESTSUITE/aux-fixed/0067.rejrec) >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<!excl@z.z> rejected RCPT <userx@test.ex> +LOG: H=(test) [1.2.3.4] F=<!excl@z.z> rejected RCPT <userx@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -489,7 +490,7 @@ LOG: H=[1.2.3.4] F=<!excl@z.z> rejected RCPT <userx@test.ex> >>> sh#rp@y.p.s in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "sh#rp@y.p.s" in TESTSUITE/aux-fixed/0067.rejrec) >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<sh#rp@y.p.s> rejected RCPT <userx@test.ex> +LOG: H=(test) [1.2.3.4] F=<sh#rp@y.p.s> rejected RCPT <userx@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -531,7 +532,7 @@ LOG: H=[1.2.3.4] F=<sh#rp@y.p.s> rejected RCPT <userx@test.ex> >>> xyzbc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<xyzbc@xx.yy> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<xyzbc@xx.yy> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -547,7 +548,7 @@ LOG: H=[1.2.3.4] F=<xyzbc@xx.yy> rejected RCPT <x@test.ex> >>> aabc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<aabc@xx.yy> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<aabc@xx.yy> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -590,7 +591,7 @@ LOG: H=[1.2.3.4] F=<aabc@xx.yy> rejected RCPT <x@test.ex> >>> y@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@bb.cc") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<y@bb.cc> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<y@bb.cc> rejected RCPT <x@test.ex> >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -662,4 +663,4 @@ LOG: H=[1.2.3.4] F=<y@bb.cc> rejected RCPT <x@test.ex> >>> z@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "bbb.ccc") >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[1.2.3.4] F=<z@bbb.ccc> rejected RCPT <x@test.ex> +LOG: H=(test) [1.2.3.4] F=<z@bbb.ccc> rejected RCPT <x@test.ex> diff --git a/test/stderr/0068 b/test/stderr/0068 index c65432f3f..d649cda55 100644 --- a/test/stderr/0068 +++ b/test/stderr/0068 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 12) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -21,4 +22,4 @@ >>> processing "accept" (TESTSUITE/test-config 12) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT -LOG: too many recipients: message rejected: sender=<x@y> H=[V4NET.10.10.10] +LOG: too many recipients: message rejected: sender=<x@y> H=(test) [V4NET.10.10.10] diff --git a/test/stderr/0069 b/test/stderr/0069 index 619c7f171..f8b081193 100644 --- a/test/stderr/0069 +++ b/test/stderr/0069 @@ -21,7 +21,7 @@ >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex") >>> deny: condition test succeeded in ACL "check_recipientx" >>> end of ACL "check_recipientx": DENY -LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex> +LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -34,6 +34,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipientx" >>> processing "accept" (TESTSUITE/test-config 24) >>> check hosts = : @@ -46,7 +47,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> deny: condition test succeeded in ACL "check_recipientx" >>> end of ACL "check_recipientx": DENY -LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex> +LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -59,18 +60,19 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipienty" >>> processing "accept" (TESTSUITE/test-config 30) >>> check hosts = not-exist.test.ex : V4NET.0.0.13 ->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) -LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13]) +LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13]) >>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex) >>> accept: condition test failed in ACL "check_recipienty" >>> processing "deny" (TESTSUITE/test-config 31) >>> message: "Denied" >>> deny: condition test succeeded in ACL "check_recipienty" >>> end of ACL "check_recipienty": DENY -LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied" +LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied" >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -83,11 +85,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipientz" >>> processing "accept" (TESTSUITE/test-config 34) >>> check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13 ->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) -LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13]) +LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13]) >>> failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown >>> host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13") >>> accept: condition test succeeded in ACL "check_recipientz" @@ -104,11 +107,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipienty" >>> processing "accept" (TESTSUITE/test-config 30) >>> check hosts = not-exist.test.ex : V4NET.0.0.13 ->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) -LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13]) +LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13]) >>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex) LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex >>> accept: condition test failed in ACL "check_recipienty" @@ -116,7 +120,7 @@ LOG: list matching forced to fail: failed to find IP address for not-exist.test. >>> message: "Denied" >>> deny: condition test succeeded in ACL "check_recipienty" >>> end of ACL "check_recipienty": DENY -LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied" +LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied" >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -129,6 +133,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipienta" >>> processing "accept" (TESTSUITE/test-config 38) >>> check hosts = : @@ -137,12 +142,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> processing "deny" (TESTSUITE/test-config 39) >>> check hosts = +include_defer : test.again.dns >>> test.again.dns in dns_again_means_nonexist? no (option unset) ->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13]) +>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13]) >>> test.again.dns in dns_again_means_nonexist? no (option unset) LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer >>> deny: condition test succeeded in ACL "check_recipienta" >>> end of ACL "check_recipienta": DENY -LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex> +LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -155,15 +160,16 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipientb" >>> processing "accept" (TESTSUITE/test-config 44) >>> check hosts = test.again.dns : V4NET.0.0.13 >>> test.again.dns in dns_again_means_nonexist? no (option unset) ->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13]) +>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13]) >>> test.again.dns in dns_again_means_nonexist? no (option unset) >>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns >>> accept: condition test deferred in ACL "check_recipientb" -LOG: H=[V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred +LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -176,11 +182,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipientc" >>> processing "accept" (TESTSUITE/test-config 48) >>> check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13 >>> test.again.dns in dns_again_means_nonexist? no (option unset) ->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13]) +>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13]) >>> test.again.dns in dns_again_means_nonexist? no (option unset) >>> DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer >>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13") diff --git a/test/stderr/0070 b/test/stderr/0070 index b4e002117..8e6d9e561 100644 --- a/test/stderr/0070 +++ b/test/stderr/0070 @@ -26,8 +26,9 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-2.test.ex address=V4NET.0.0.2 >>> host in helo_try_verify_hosts? no (end of list) >>> host in helo_accept_junk_hosts? no (option unset) +>>> host in hosts_require_helo? no (end of list) >>> using ACL "rcpt" ->>> processing "require" (TESTSUITE/test-config 22) +>>> processing "require" (TESTSUITE/test-config 23) >>> message: helo not verified >>> check verify = helo >>> verifying EHLO/HELO argument "NULL" @@ -56,7 +57,7 @@ MUNGED: ::1 will be omitted in what follows >>> verifying EHLO/HELO argument "[V4NET.0.0.1]" >>> HELO verification failed but host is in helo_try_verify_hosts >>> using ACL "rcpt" ->>> processing "require" (TESTSUITE/test-config 22) +>>> processing "require" (TESTSUITE/test-config 23) >>> message: helo not verified >>> check verify = helo >>> require: condition test failed in ACL "rcpt" @@ -83,11 +84,11 @@ MUNGED: ::1 will be omitted in what follows >>> verifying EHLO/HELO argument "[V4NET.0.0.2]" >>> matched host address >>> using ACL "rcpt" ->>> processing "require" (TESTSUITE/test-config 22) +>>> processing "require" (TESTSUITE/test-config 23) >>> message: helo not verified >>> check verify = helo >>> require: condition test succeeded in ACL "rcpt" ->>> processing "deny" (TESTSUITE/test-config 25) +>>> processing "deny" (TESTSUITE/test-config 26) >>> message: helo did verify >>> deny: condition test succeeded in ACL "rcpt" >>> end of ACL "rcpt": DENY @@ -201,7 +202,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_accept_junk_hosts? no (option unset) >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list) >>> using ACL "rcpt" ->>> processing "require" (TESTSUITE/test-config 22) +>>> processing "require" (TESTSUITE/test-config 23) >>> message: helo not verified >>> check verify = helo >>> verifying EHLO/HELO argument "[V4NET.0.0.99]" @@ -227,13 +228,13 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_accept_junk_hosts? no (option unset) >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list) >>> using ACL "rcpt" ->>> processing "require" (TESTSUITE/test-config 22) +>>> processing "require" (TESTSUITE/test-config 23) >>> message: helo not verified >>> check verify = helo >>> verifying EHLO/HELO argument "[V4NET.0.0.13]" >>> matched host address >>> require: condition test succeeded in ACL "rcpt" ->>> processing "deny" (TESTSUITE/test-config 25) +>>> processing "deny" (TESTSUITE/test-config 26) >>> message: helo did verify >>> deny: condition test succeeded in ACL "rcpt" >>> end of ACL "rcpt": DENY @@ -260,7 +261,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "rcpt" ->>> processing "require" (TESTSUITE/test-config 22) +>>> processing "require" (TESTSUITE/test-config 23) >>> message: helo not verified >>> check verify = helo >>> verifying EHLO/HELO argument "rhubarb" diff --git a/test/stderr/0077 b/test/stderr/0077 index c6362a8bd..a0128bd9f 100644 --- a/test/stderr/0077 +++ b/test/stderr/0077 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 18) >>> check hosts = ! @ : ! localhost @@ -31,6 +32,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 18) >>> check hosts = ! @ : ! localhost @@ -53,6 +55,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 18) >>> check hosts = ! @ : ! localhost @@ -65,4 +68,4 @@ MUNGED: ::1 will be omitted in what follows >>> host in "! @ : ! localhost"? yes (end of list) >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.1] F=<x@test.ex> rejected RCPT <x@test.ex> +LOG: H=(test) [V4NET.0.0.1] F=<x@test.ex> rejected RCPT <x@test.ex> diff --git a/test/stderr/0086 b/test/stderr/0086 index 577c2b9ed..77846d8b4 100644 --- a/test/stderr/0086 +++ b/test/stderr/0086 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 23) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -18,7 +19,7 @@ LOG: 10HmaY-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z +LOG: 10HmaY-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -27,6 +28,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 23) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -39,7 +41,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D LOG: 10HmaZ-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z +LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -48,6 +50,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 23) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -60,7 +63,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D LOG: 10HmbA-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d +LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -69,6 +72,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 23) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -81,7 +85,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D LOG: 10HmbB-0005vi-00 acl_verify_message: 'unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addre' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addre +LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addre >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -90,6 +94,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 23) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -102,7 +107,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D LOG: 10HmbC-0005vi-00 acl_verify_message: 'unqualified address not permitted: failing address in "Cc:" header is: <abcd>' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unqualified address not permitted: failing address in "Cc:" header is: <abcd> +LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unqualified address not permitted: failing address in "Cc:" header is: <abcd> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -111,6 +116,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 23) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -122,4 +128,4 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> processing "accept" (TESTSUITE/test-config 21) >>> accept: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.9] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.9] P=smtp S=sss diff --git a/test/stderr/0087 b/test/stderr/0087 index ec9eeb4e7..18eaf64c0 100644 --- a/test/stderr/0087 +++ b/test/stderr/0087 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -37,7 +38,7 @@ >>> 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 +LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -46,6 +47,7 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -77,7 +79,7 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> 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 +LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -86,6 +88,7 @@ LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -119,7 +122,7 @@ LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> no more routers >>> 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 +LOG: 10HmbA-0005vi-00 H=(test) [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) >>> host in host_reject_connection? no (option unset) @@ -128,6 +131,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA: >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -165,7 +169,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA: >>> 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 +LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -174,6 +178,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -207,4 +212,4 @@ LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> defer router: defer for defer@test.ex >>> message: this is a forced defer >>> 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=(test) [V4NET.10.10.10] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred diff --git a/test/stderr/0091 b/test/stderr/0091 index 660477a59..f105543c1 100644 --- a/test/stderr/0091 +++ b/test/stderr/0091 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 18) >>> check hosts = ! V4NET.0.0.1 @@ -28,7 +29,7 @@ >>> no more routers >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after DATA: there is no valid sender in any header line +LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.1] F=<junk@jink.jonk.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) >>> host in host_reject_connection? no (option unset) @@ -37,6 +38,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 18) >>> check hosts = ! V4NET.0.0.1 @@ -49,8 +51,8 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after >>> ----------- end verify ------------ >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.2] sender verify fail for <junk@jink.jonk.test.ex>: Unrouteable address -LOG: H=[V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.ex>: Sender verify failed +LOG: H=(test) [V4NET.0.0.2] sender verify fail for <junk@jink.jonk.test.ex>: Unrouteable address +LOG: H=(test) [V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.ex>: Sender verify failed >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -59,6 +61,7 @@ LOG: H=[V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.ex>: Se >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 18) >>> check hosts = ! V4NET.0.0.1 @@ -88,7 +91,7 @@ LOG: H=[V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.ex>: Se >>> no more routers >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line +LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.2] 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) >>> host in host_reject_connection? no (option unset) @@ -97,6 +100,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: the >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 18) >>> check hosts = ! V4NET.0.0.1 @@ -129,4 +133,4 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: the >>> processing "accept" (TESTSUITE/test-config 25) >>> accept: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.0.0.2] P=smtp S=sss diff --git a/test/stderr/0092 b/test/stderr/0092 index b97eed8fd..2d6b02a9b 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -15,6 +15,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 27) >>> check hosts = : @@ -31,7 +32,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] >>> test.ex in "+local_domains"? yes (matched "+local_domains") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex> +LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -78,6 +79,12 @@ host in helo_accept_junk_hosts? no (option unset) ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.0.0.1] +sender_rcvhost = [V4NET.0.0.1] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.1] +SMTP>> 250 myhost.test.ex Hello test [V4NET.0.0.1] SMTP<< mail from:userx@test.ex spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -106,7 +113,7 @@ SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called LOG: lost_incoming_connection MAIN - SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex> + SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection. search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> @@ -120,6 +127,7 @@ exim: timed out while reading - message abandoned >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 27) >>> check hosts = : @@ -141,8 +149,8 @@ exim: timed out while reading - message abandoned >>> ----------- end verify ------------ >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.1] F=<userx@test.ex> rejected RCPT verify@test.ex: Unrouteable address -LOG: SMTP command timeout on connection from [V4NET.0.0.1] +LOG: H=(test) [V4NET.0.0.1] F=<userx@test.ex> rejected RCPT verify@test.ex: Unrouteable address +LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1] An error was detected while processing a file of BSMTP input. The error message was: diff --git a/test/stderr/0094 b/test/stderr/0094 index d2b8cc4bc..86569ec94 100644 --- a/test/stderr/0094 +++ b/test/stderr/0094 @@ -8,6 +8,7 @@ LOG: no host name found for IP address V4NET.11.12.13 >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check hosts = : @@ -28,7 +29,7 @@ LOG: no host name found for IP address V4NET.11.12.13 >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted +LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? yes (matched "0.0.0.0/0") >>> looking up host name for V4NET.0.0.1 @@ -60,7 +61,7 @@ LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: rel >>> 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@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted +LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -107,6 +108,11 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +sender_fullhost = oneback.test.ex (test) [V4NET.99.99.90] +sender_rcvhost = oneback.test.ex ([V4NET.99.99.90] helo=test) +set_process_info: pppp handling incoming connection from oneback.test.ex (test) [V4NET.99.99.90] +SMTP>> 250 the.local.host.name Hello oneback.test.ex [V4NET.99.99.90] SMTP<< mail from:<userx@test.ex> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -147,10 +153,10 @@ deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT - H=oneback.test.ex [V4NET.99.99.90] F=<userx@test.ex> rejected RCPT <userx@cam.ac.uk>: relay not permitted + H=oneback.test.ex (test) [V4NET.99.99.90] F=<userx@test.ex> rejected RCPT <userx@cam.ac.uk>: relay not permitted SMTP<< quit SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN - SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT + SMTP connection from oneback.test.ex (test) [V4NET.99.99.90] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0121 b/test/stderr/0121 index f874949df..d96732869 100644 --- a/test/stderr/0121 +++ b/test/stderr/0121 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -19,8 +20,8 @@ >>> ----------- end verify ------------ >>> require: condition test failed in ACL "check_recipient" >>> end of ACL "check_recipient": not OK -LOG: H=[127.0.0.1] sender verify fail for <unknown@test.ex>: Unrouteable address -LOG: H=[127.0.0.1] F=<unknown@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed +LOG: H=(test) [127.0.0.1] sender verify fail for <unknown@test.ex>: Unrouteable address +LOG: H=(test) [127.0.0.1] F=<unknown@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -33,8 +34,8 @@ LOG: H=[127.0.0.1] F=<unknown@test.ex> rejected RCPT <userx@test.ex>: Sender ver >>> ----------- end verify ------------ >>> require: condition test failed in ACL "check_recipient" >>> end of ACL "check_recipient": not OK -LOG: H=[127.0.0.1] sender verify fail for <userx@unknown.dom.ain>: unrouteable mail domain "unknown.dom.ain" -LOG: H=[127.0.0.1] F=<userx@unknown.dom.ain> rejected RCPT <userx@test.ex>: Sender verify failed +LOG: H=(test) [127.0.0.1] sender verify fail for <userx@unknown.dom.ain>: unrouteable mail domain "unknown.dom.ain" +LOG: H=(test) [127.0.0.1] F=<userx@unknown.dom.ain> rejected RCPT <userx@test.ex>: Sender verify failed >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) @@ -49,8 +50,8 @@ LOG: H=[127.0.0.1] F=<userx@unknown.dom.ain> rejected RCPT <userx@test.ex>: Send >>> ----------- end verify ------------ >>> require: condition test failed in ACL "check_recipient" >>> end of ACL "check_recipient": not OK -LOG: H=[127.0.0.1] sender verify fail for <"unknown with spaces"@test.ex>: Unrouteable address -LOG: H=[127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed +LOG: H=(test) [127.0.0.1] sender verify fail for <"unknown with spaces"@test.ex>: Unrouteable address +LOG: H=(test) [127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -84,7 +85,7 @@ LOG: H=[127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx@test.e >>> no more routers >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaX-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line +LOG: 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -111,7 +112,7 @@ LOG: 10HmaX-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> rejected after DATA: there >>> verifying From: header address <> >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaY-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>" +LOG: 10HmaY-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>" >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -125,8 +126,8 @@ LOG: 10HmaY-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> rejected after DATA: synta >>> message: forced defer >>> ----------- end verify ------------ >>> require: condition test deferred in ACL "check_recipient" -LOG: H=[127.0.0.1] sender verify defer for <defer@test.ex>: forced defer -LOG: H=[127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@test.ex>: Could not complete sender verify +LOG: H=(test) [127.0.0.1] sender verify defer for <defer@test.ex>: forced defer +LOG: H=(test) [127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@test.ex>: Could not complete sender verify >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -160,7 +161,7 @@ LOG: H=[127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@test.ex>: >>> defer router: defer for defer@test.ex >>> message: forced defer >>> require: condition test deferred in ACL "check_message" -LOG: 10HmaZ-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred +LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) diff --git a/test/stderr/0124 b/test/stderr/0124 index 82c1e47dd..a1d3cdb6e 100644 --- a/test/stderr/0124 +++ b/test/stderr/0124 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -28,7 +29,7 @@ LOG: no host name found for IP address V4NET.0.0.97 >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted +LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : @@ -47,4 +48,4 @@ LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted +LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted diff --git a/test/stderr/0130 b/test/stderr/0130 index c07f850ab..8ddb23e11 100644 --- a/test/stderr/0130 +++ b/test/stderr/0130 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 21) >>> message: unrouteable address @@ -21,11 +22,11 @@ MUNGED: ::1 will be omitted in what follows >>> get[host|ipnode]byname[2] looked up these IP addresses: >>> name=localhost address=127.0.0.1 -LOG: remote host address is the local host: not.test.ex (while verifying <userx@not.test.ex> from host [V4NET.0.0.0]) +LOG: remote host address is the local host: not.test.ex (while verifying <userx@not.test.ex> from host (test) [V4NET.0.0.0]) >>> islocal router: defer for userx@not.test.ex >>> message: remote host address is the local host >>> ----------- end verify ------------ >>> deny: condition test deferred in ACL "check_recipient" -LOG: H=[V4NET.0.0.0] F=<userx@test.ex> temporarily rejected RCPT <userx@not.test.ex>: remote host address is the local host +LOG: H=(test) [V4NET.0.0.0] F=<userx@test.ex> temporarily rejected RCPT <userx@not.test.ex>: remote host address is the local host LOG: MAIN remote host address is the local host: not.test.ex (while routing <userx@not.test.ex>) diff --git a/test/stderr/0139 b/test/stderr/0139 index eb7315770..663313246 100644 --- a/test/stderr/0139 +++ b/test/stderr/0139 @@ -6,8 +6,9 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> host in hosts_require_helo? no (end of list) >>> using ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 37) +>>> processing "warn" (TESTSUITE/test-config 38) >>> check dnslists = rbl4.test.ex&0.0.0.6 >>> dnslists check: rbl4.test.ex&0.0.0.6 >>> new DNS lookup for 14.12.11.V4NET.rbl4.test.ex @@ -15,32 +16,32 @@ >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex >>> warn: condition test failed in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 38) +>>> processing "warn" (TESTSUITE/test-config 39) >>> check dnslists = rbl4.test.ex&127.0.0.3 >>> dnslists check: rbl4.test.ex&127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex >>> warn: condition test failed in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 39) +>>> processing "warn" (TESTSUITE/test-config 40) >>> check dnslists = rbl4.test.ex!&0.0.0.7 >>> dnslists check: rbl4.test.ex!&0.0.0.7 >>> dnslists: using result of previous lookup >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex >>> warn: condition test failed in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 41) +>>> processing "warn" (TESTSUITE/test-config 42) >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128 >>> dnslists: using result of previous lookup >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex >>> warn: condition test failed in ACL "check_mail" ->>> processing "accept" (TESTSUITE/test-config 43) +>>> processing "accept" (TESTSUITE/test-config 44) >>> accept: condition test succeeded in ACL "check_mail" >>> end of ACL "check_mail": ACCEPT >>> using ACL "check_recipient" ->>> processing "warn" (TESTSUITE/test-config 47) +>>> processing "warn" (TESTSUITE/test-config 48) >>> message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n $dnslist_text}} >>> check dnslists = rbl3.test.ex!=127.0.0.3 >>> dnslists check: rbl3.test.ex!=127.0.0.3 @@ -49,7 +50,7 @@ >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2) >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex >>> warn: condition test succeeded in ACL "check_recipient" ->>> processing "deny" (TESTSUITE/test-config 50) +>>> processing "deny" (TESTSUITE/test-config 51) >>> message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}} >>> check dnslists = rbl3.test.ex=127.0.0.3 >>> dnslists check: rbl3.test.ex=127.0.0.3 @@ -58,7 +59,7 @@ >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.3 >>> deny: condition test failed in ACL "check_recipient" ->>> processing "require" (TESTSUITE/test-config 52) +>>> processing "require" (TESTSUITE/test-config 53) >>> check verify = sender >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing postmaster@exim.test.ex @@ -73,7 +74,7 @@ >>> routed by localuser router >>> ----------- end verify ------------ >>> require: condition test succeeded in ACL "check_recipient" ->>> processing "deny" (TESTSUITE/test-config 53) +>>> processing "deny" (TESTSUITE/test-config 54) >>> message: unrouteable address >>> check !verify = recipient >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -85,14 +86,14 @@ >>> routed by localuser router >>> ----------- end verify ------------ >>> deny: condition test failed in ACL "check_recipient" ->>> processing "accept" (TESTSUITE/test-config 55) +>>> processing "accept" (TESTSUITE/test-config 56) >>> check domains = +local_domains >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex") >>> exim.test.ex in "+local_domains"? yes (matched "+local_domains") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> using ACL "check_recipient" ->>> processing "warn" (TESTSUITE/test-config 47) +>>> processing "warn" (TESTSUITE/test-config 48) >>> message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n $dnslist_text}} >>> check dnslists = rbl3.test.ex!=127.0.0.3 >>> dnslists check: rbl3.test.ex!=127.0.0.3 @@ -100,7 +101,7 @@ >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2) >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex >>> warn: condition test succeeded in ACL "check_recipient" ->>> processing "deny" (TESTSUITE/test-config 50) +>>> processing "deny" (TESTSUITE/test-config 51) >>> message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}} >>> check dnslists = rbl3.test.ex=127.0.0.3 >>> dnslists check: rbl3.test.ex=127.0.0.3 @@ -109,11 +110,11 @@ >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.3 >>> deny: condition test failed in ACL "check_recipient" ->>> processing "require" (TESTSUITE/test-config 52) +>>> processing "require" (TESTSUITE/test-config 53) >>> check verify = sender >>> using cached sender verify result >>> require: condition test succeeded in ACL "check_recipient" ->>> processing "deny" (TESTSUITE/test-config 53) +>>> processing "deny" (TESTSUITE/test-config 54) >>> message: unrouteable address >>> check !verify = recipient >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -122,7 +123,7 @@ >>> routed by system_aliases router >>> ----------- end verify ------------ >>> deny: condition test failed in ACL "check_recipient" ->>> processing "accept" (TESTSUITE/test-config 55) +>>> processing "accept" (TESTSUITE/test-config 56) >>> check domains = +local_domains >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex") >>> exim.test.ex in "+local_domains"? yes (matched "+local_domains") @@ -138,8 +139,9 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> host in hosts_require_helo? no (end of list) >>> using ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 37) +>>> processing "warn" (TESTSUITE/test-config 38) >>> check dnslists = rbl4.test.ex&0.0.0.6 >>> dnslists check: rbl4.test.ex&0.0.0.6 >>> new DNS lookup for 15.12.11.V4NET.rbl4.test.ex @@ -147,32 +149,32 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex >>> warn: condition test failed in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 38) +>>> processing "warn" (TESTSUITE/test-config 39) >>> check dnslists = rbl4.test.ex&127.0.0.3 >>> dnslists check: rbl4.test.ex&127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex >>> warn: condition test failed in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 39) +>>> processing "warn" (TESTSUITE/test-config 40) >>> check dnslists = rbl4.test.ex!&0.0.0.7 >>> dnslists check: rbl4.test.ex!&0.0.0.7 >>> dnslists: using result of previous lookup >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex >>> warn: condition test failed in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 41) +>>> processing "warn" (TESTSUITE/test-config 42) >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128 >>> dnslists: using result of previous lookup >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex >>> warn: condition test failed in ACL "check_mail" ->>> processing "accept" (TESTSUITE/test-config 43) +>>> processing "accept" (TESTSUITE/test-config 44) >>> accept: condition test succeeded in ACL "check_mail" >>> end of ACL "check_mail": ACCEPT >>> using ACL "check_recipient" ->>> processing "warn" (TESTSUITE/test-config 47) +>>> processing "warn" (TESTSUITE/test-config 48) >>> message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n $dnslist_text}} >>> check dnslists = rbl3.test.ex!=127.0.0.3 >>> dnslists check: rbl3.test.ex!=127.0.0.3 @@ -182,7 +184,7 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss >>> => but we are not accepting this block class because >>> => there was an exclude match for =127.0.0.3 >>> warn: condition test failed in ACL "check_recipient" ->>> processing "deny" (TESTSUITE/test-config 50) +>>> processing "deny" (TESTSUITE/test-config 51) >>> message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}} >>> check dnslists = rbl3.test.ex=127.0.0.3 >>> dnslists check: rbl3.test.ex=127.0.0.3 @@ -200,8 +202,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> host in hosts_require_helo? no (end of list) >>> using ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 37) +>>> processing "warn" (TESTSUITE/test-config 38) >>> check dnslists = rbl4.test.ex&0.0.0.6 >>> dnslists check: rbl4.test.ex&0.0.0.6 >>> new DNS lookup for 20.12.11.V4NET.rbl4.test.ex @@ -209,7 +212,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> DNS lookup for 20.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.6) >>> => that means V4NET.11.12.20 is listed at rbl4.test.ex >>> warn: condition test succeeded in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 38) +>>> processing "warn" (TESTSUITE/test-config 39) >>> check dnslists = rbl4.test.ex&127.0.0.3 >>> dnslists check: rbl4.test.ex&127.0.0.3 >>> dnslists: using result of previous lookup @@ -217,7 +220,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> => but we are not accepting this block class because >>> => there was no match for &127.0.0.3 >>> warn: condition test failed in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 39) +>>> processing "warn" (TESTSUITE/test-config 40) >>> check dnslists = rbl4.test.ex!&0.0.0.7 >>> dnslists check: rbl4.test.ex!&0.0.0.7 >>> dnslists: using result of previous lookup @@ -226,7 +229,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> check add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched >>> = DNSlist: rbl4.test.ex V4NET.11.12.20 >>> warn: condition test succeeded in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 41) +>>> processing "warn" (TESTSUITE/test-config 42) >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128 >>> dnslists: using result of previous lookup @@ -234,7 +237,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.128 >>> warn: condition test failed in ACL "check_mail" ->>> processing "accept" (TESTSUITE/test-config 43) +>>> processing "accept" (TESTSUITE/test-config 44) >>> accept: condition test succeeded in ACL "check_mail" >>> end of ACL "check_mail": ACCEPT >>> host in hosts_connection_nolog? no (option unset) @@ -245,8 +248,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> host in hosts_require_helo? no (end of list) >>> using ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 37) +>>> processing "warn" (TESTSUITE/test-config 38) >>> check dnslists = rbl4.test.ex&0.0.0.6 >>> dnslists check: rbl4.test.ex&0.0.0.6 >>> new DNS lookup for 21.12.11.V4NET.rbl4.test.ex @@ -254,14 +258,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7) >>> => that means V4NET.11.12.21 is listed at rbl4.test.ex >>> warn: condition test succeeded in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 38) +>>> processing "warn" (TESTSUITE/test-config 39) >>> check dnslists = rbl4.test.ex&127.0.0.3 >>> dnslists check: rbl4.test.ex&127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7) >>> => that means V4NET.11.12.21 is listed at rbl4.test.ex >>> warn: condition test succeeded in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 39) +>>> processing "warn" (TESTSUITE/test-config 40) >>> check dnslists = rbl4.test.ex!&0.0.0.7 >>> dnslists check: rbl4.test.ex!&0.0.0.7 >>> dnslists: using result of previous lookup @@ -269,7 +273,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> => but we are not accepting this block class because >>> => there was an exclude match for &0.0.0.7 >>> warn: condition test failed in ACL "check_mail" ->>> processing "warn" (TESTSUITE/test-config 41) +>>> processing "warn" (TESTSUITE/test-config 42) >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128 >>> dnslists: using result of previous lookup @@ -277,7 +281,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.128 >>> warn: condition test failed in ACL "check_mail" ->>> processing "accept" (TESTSUITE/test-config 43) +>>> processing "accept" (TESTSUITE/test-config 44) >>> accept: condition test succeeded in ACL "check_mail" >>> end of ACL "check_mail": ACCEPT >>> host in hosts_connection_nolog? no (option unset) @@ -290,7 +294,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> host in helo_accept_junk_hosts? no (option unset) >>> a.b in helo_lookup_domains? no (end of list) >>> using ACL "check_helo" ->>> processing "warn" (TESTSUITE/test-config 21) +>>> processing "warn" (TESTSUITE/test-config 22) >>> check dnslists = rbl2.test.ex!=127.0.0.3 : rbl3.test.ex=127.0.0.3 >>> dnslists check: rbl2.test.ex!=127.0.0.3 >>> new DNS lookup for 15.12.11.V4NET.rbl2.test.ex @@ -303,7 +307,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> DNS lookup for 15.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.3) >>> => that means V4NET.11.12.15 is listed at rbl3.test.ex >>> warn: condition test succeeded in ACL "check_helo" ->>> processing "accept" (TESTSUITE/test-config 22) +>>> processing "accept" (TESTSUITE/test-config 23) >>> accept: condition test succeeded in ACL "check_helo" >>> end of ACL "check_helo": ACCEPT >>> host in hosts_connection_nolog? no (option unset) @@ -316,7 +320,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 25) +>>> processing "warn" (TESTSUITE/test-config 26) >>> check dnslists = rbl.test.ex=127.0.0.1 >>> dnslists check: rbl.test.ex=127.0.0.1 >>> new DNS lookup for 2.13.13.V4NET.rbl.test.ex @@ -324,7 +328,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2) >>> => that means V4NET.13.13.2 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 26) +>>> processing "warn" (TESTSUITE/test-config 27) >>> check dnslists = rbl.test.ex!=127.0.0.1 >>> dnslists check: rbl.test.ex!=127.0.0.1 >>> dnslists: using result of previous lookup @@ -332,14 +336,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> => but we are not accepting this block class because >>> => there was an exclude match for =127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 27) +>>> processing "warn" (TESTSUITE/test-config 28) >>> check dnslists = rbl.test.ex!=127.0.0.3 >>> dnslists check: rbl.test.ex!=127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2) >>> => that means V4NET.13.13.2 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 28) +>>> processing "warn" (TESTSUITE/test-config 29) >>> check dnslists = rbl.test.ex==127.0.0.1 >>> dnslists check: rbl.test.ex==127.0.0.1 >>> dnslists: using result of previous lookup @@ -347,28 +351,28 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 29) +>>> processing "warn" (TESTSUITE/test-config 30) >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2) >>> => that means V4NET.13.13.2 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 30) +>>> processing "warn" (TESTSUITE/test-config 31) >>> check dnslists = rbl.test.ex!==127.0.0.1 >>> dnslists check: rbl.test.ex!==127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2) >>> => that means V4NET.13.13.2 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 31) +>>> processing "warn" (TESTSUITE/test-config 32) >>> check dnslists = rbl.test.ex!==127.0.0.3 >>> dnslists check: rbl.test.ex!==127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2) >>> => that means V4NET.13.13.2 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 32) +>>> processing "warn" (TESTSUITE/test-config 33) >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup @@ -376,14 +380,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> => but we are not accepting this block class because >>> => there were no IP addresses that did not match for ==127.0.0.1,127.0.0.2 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 33) +>>> processing "warn" (TESTSUITE/test-config 34) >>> check dnslists = rbl.test.ex >>> dnslists check: rbl.test.ex >>> dnslists: using result of previous lookup >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2) >>> => that means V4NET.13.13.2 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "accept" (TESTSUITE/test-config 34) +>>> processing "accept" (TESTSUITE/test-config 35) >>> accept: condition test succeeded in ACL "check_vrfy" >>> end of ACL "check_vrfy": ACCEPT >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -403,7 +407,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2] >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 25) +>>> processing "warn" (TESTSUITE/test-config 26) >>> check dnslists = rbl.test.ex=127.0.0.1 >>> dnslists check: rbl.test.ex=127.0.0.1 >>> new DNS lookup for 100.13.13.V4NET.rbl.test.ex @@ -412,21 +416,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2] >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 26) +>>> processing "warn" (TESTSUITE/test-config 27) >>> check dnslists = rbl.test.ex!=127.0.0.1 >>> dnslists check: rbl.test.ex!=127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0) >>> => that means V4NET.13.13.100 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 27) +>>> processing "warn" (TESTSUITE/test-config 28) >>> check dnslists = rbl.test.ex!=127.0.0.3 >>> dnslists check: rbl.test.ex!=127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0) >>> => that means V4NET.13.13.100 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 28) +>>> processing "warn" (TESTSUITE/test-config 29) >>> check dnslists = rbl.test.ex==127.0.0.1 >>> dnslists check: rbl.test.ex==127.0.0.1 >>> dnslists: using result of previous lookup @@ -434,7 +438,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 29) +>>> processing "warn" (TESTSUITE/test-config 30) >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup @@ -442,35 +446,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 30) +>>> processing "warn" (TESTSUITE/test-config 31) >>> check dnslists = rbl.test.ex!==127.0.0.1 >>> dnslists check: rbl.test.ex!==127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0) >>> => that means V4NET.13.13.100 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 31) +>>> processing "warn" (TESTSUITE/test-config 32) >>> check dnslists = rbl.test.ex!==127.0.0.3 >>> dnslists check: rbl.test.ex!==127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0) >>> => that means V4NET.13.13.100 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 32) +>>> processing "warn" (TESTSUITE/test-config 33) >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0) >>> => that means V4NET.13.13.100 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 33) +>>> processing "warn" (TESTSUITE/test-config 34) >>> check dnslists = rbl.test.ex >>> dnslists check: rbl.test.ex >>> dnslists: using result of previous lookup >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0) LOG: DNS list lookup for V4NET.13.13.100 at rbl.test.ex returned 0.0.0.0; not in 127.0/8 and discarded >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "accept" (TESTSUITE/test-config 34) +>>> processing "accept" (TESTSUITE/test-config 35) >>> accept: condition test succeeded in ACL "check_vrfy" >>> end of ACL "check_vrfy": ACCEPT >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -490,7 +494,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100] >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 25) +>>> processing "warn" (TESTSUITE/test-config 26) >>> check dnslists = rbl.test.ex=127.0.0.1 >>> dnslists check: rbl.test.ex=127.0.0.1 >>> new DNS lookup for 101.13.13.V4NET.rbl.test.ex @@ -499,21 +503,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100] >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 26) +>>> processing "warn" (TESTSUITE/test-config 27) >>> check dnslists = rbl.test.ex!=127.0.0.1 >>> dnslists check: rbl.test.ex!=127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255) >>> => that means V4NET.13.13.101 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 27) +>>> processing "warn" (TESTSUITE/test-config 28) >>> check dnslists = rbl.test.ex!=127.0.0.3 >>> dnslists check: rbl.test.ex!=127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255) >>> => that means V4NET.13.13.101 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 28) +>>> processing "warn" (TESTSUITE/test-config 29) >>> check dnslists = rbl.test.ex==127.0.0.1 >>> dnslists check: rbl.test.ex==127.0.0.1 >>> dnslists: using result of previous lookup @@ -521,7 +525,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 29) +>>> processing "warn" (TESTSUITE/test-config 30) >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup @@ -529,35 +533,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 30) +>>> processing "warn" (TESTSUITE/test-config 31) >>> check dnslists = rbl.test.ex!==127.0.0.1 >>> dnslists check: rbl.test.ex!==127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255) >>> => that means V4NET.13.13.101 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 31) +>>> processing "warn" (TESTSUITE/test-config 32) >>> check dnslists = rbl.test.ex!==127.0.0.3 >>> dnslists check: rbl.test.ex!==127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255) >>> => that means V4NET.13.13.101 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 32) +>>> processing "warn" (TESTSUITE/test-config 33) >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255) >>> => that means V4NET.13.13.101 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 33) +>>> processing "warn" (TESTSUITE/test-config 34) >>> check dnslists = rbl.test.ex >>> dnslists check: rbl.test.ex >>> dnslists: using result of previous lookup >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255) LOG: DNS list lookup for V4NET.13.13.101 at rbl.test.ex returned 126.255.255.255; not in 127.0/8 and discarded >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "accept" (TESTSUITE/test-config 34) +>>> processing "accept" (TESTSUITE/test-config 35) >>> accept: condition test succeeded in ACL "check_vrfy" >>> end of ACL "check_vrfy": ACCEPT >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -577,7 +581,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101] >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 25) +>>> processing "warn" (TESTSUITE/test-config 26) >>> check dnslists = rbl.test.ex=127.0.0.1 >>> dnslists check: rbl.test.ex=127.0.0.1 >>> new DNS lookup for 102.13.13.V4NET.rbl.test.ex @@ -586,21 +590,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101] >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 26) +>>> processing "warn" (TESTSUITE/test-config 27) >>> check dnslists = rbl.test.ex!=127.0.0.1 >>> dnslists check: rbl.test.ex!=127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0) >>> => that means V4NET.13.13.102 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 27) +>>> processing "warn" (TESTSUITE/test-config 28) >>> check dnslists = rbl.test.ex!=127.0.0.3 >>> dnslists check: rbl.test.ex!=127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0) >>> => that means V4NET.13.13.102 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 28) +>>> processing "warn" (TESTSUITE/test-config 29) >>> check dnslists = rbl.test.ex==127.0.0.1 >>> dnslists check: rbl.test.ex==127.0.0.1 >>> dnslists: using result of previous lookup @@ -608,7 +612,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 29) +>>> processing "warn" (TESTSUITE/test-config 30) >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup @@ -616,35 +620,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 30) +>>> processing "warn" (TESTSUITE/test-config 31) >>> check dnslists = rbl.test.ex!==127.0.0.1 >>> dnslists check: rbl.test.ex!==127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0) >>> => that means V4NET.13.13.102 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 31) +>>> processing "warn" (TESTSUITE/test-config 32) >>> check dnslists = rbl.test.ex!==127.0.0.3 >>> dnslists check: rbl.test.ex!==127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0) >>> => that means V4NET.13.13.102 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 32) +>>> processing "warn" (TESTSUITE/test-config 33) >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0) >>> => that means V4NET.13.13.102 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 33) +>>> processing "warn" (TESTSUITE/test-config 34) >>> check dnslists = rbl.test.ex >>> dnslists check: rbl.test.ex >>> dnslists: using result of previous lookup >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0) LOG: DNS list lookup for V4NET.13.13.102 at rbl.test.ex returned 128.0.0.0; not in 127.0/8 and discarded >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "accept" (TESTSUITE/test-config 34) +>>> processing "accept" (TESTSUITE/test-config 35) >>> accept: condition test succeeded in ACL "check_vrfy" >>> end of ACL "check_vrfy": ACCEPT >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -664,7 +668,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102] >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 25) +>>> processing "warn" (TESTSUITE/test-config 26) >>> check dnslists = rbl.test.ex=127.0.0.1 >>> dnslists check: rbl.test.ex=127.0.0.1 >>> new DNS lookup for 103.13.13.V4NET.rbl.test.ex @@ -673,21 +677,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102] >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 26) +>>> processing "warn" (TESTSUITE/test-config 27) >>> check dnslists = rbl.test.ex!=127.0.0.1 >>> dnslists check: rbl.test.ex!=127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255) >>> => that means V4NET.13.13.103 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 27) +>>> processing "warn" (TESTSUITE/test-config 28) >>> check dnslists = rbl.test.ex!=127.0.0.3 >>> dnslists check: rbl.test.ex!=127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255) >>> => that means V4NET.13.13.103 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 28) +>>> processing "warn" (TESTSUITE/test-config 29) >>> check dnslists = rbl.test.ex==127.0.0.1 >>> dnslists check: rbl.test.ex==127.0.0.1 >>> dnslists: using result of previous lookup @@ -695,7 +699,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 29) +>>> processing "warn" (TESTSUITE/test-config 30) >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup @@ -703,35 +707,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 30) +>>> processing "warn" (TESTSUITE/test-config 31) >>> check dnslists = rbl.test.ex!==127.0.0.1 >>> dnslists check: rbl.test.ex!==127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255) >>> => that means V4NET.13.13.103 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 31) +>>> processing "warn" (TESTSUITE/test-config 32) >>> check dnslists = rbl.test.ex!==127.0.0.3 >>> dnslists check: rbl.test.ex!==127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255) >>> => that means V4NET.13.13.103 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 32) +>>> processing "warn" (TESTSUITE/test-config 33) >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255) >>> => that means V4NET.13.13.103 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 33) +>>> processing "warn" (TESTSUITE/test-config 34) >>> check dnslists = rbl.test.ex >>> dnslists check: rbl.test.ex >>> dnslists: using result of previous lookup >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255) LOG: DNS list lookup for V4NET.13.13.103 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "accept" (TESTSUITE/test-config 34) +>>> processing "accept" (TESTSUITE/test-config 35) >>> accept: condition test succeeded in ACL "check_vrfy" >>> end of ACL "check_vrfy": ACCEPT >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -751,7 +755,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103] >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 25) +>>> processing "warn" (TESTSUITE/test-config 26) >>> check dnslists = rbl.test.ex=127.0.0.1 >>> dnslists check: rbl.test.ex=127.0.0.1 >>> new DNS lookup for 104.13.13.V4NET.rbl.test.ex @@ -760,21 +764,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103] >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 26) +>>> processing "warn" (TESTSUITE/test-config 27) >>> check dnslists = rbl.test.ex!=127.0.0.1 >>> dnslists check: rbl.test.ex!=127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0) >>> => that means V4NET.13.13.104 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 27) +>>> processing "warn" (TESTSUITE/test-config 28) >>> check dnslists = rbl.test.ex!=127.0.0.3 >>> dnslists check: rbl.test.ex!=127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0) >>> => that means V4NET.13.13.104 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 28) +>>> processing "warn" (TESTSUITE/test-config 29) >>> check dnslists = rbl.test.ex==127.0.0.1 >>> dnslists check: rbl.test.ex==127.0.0.1 >>> dnslists: using result of previous lookup @@ -782,7 +786,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 29) +>>> processing "warn" (TESTSUITE/test-config 30) >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup @@ -790,28 +794,28 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 30) +>>> processing "warn" (TESTSUITE/test-config 31) >>> check dnslists = rbl.test.ex!==127.0.0.1 >>> dnslists check: rbl.test.ex!==127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0) >>> => that means V4NET.13.13.104 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 31) +>>> processing "warn" (TESTSUITE/test-config 32) >>> check dnslists = rbl.test.ex!==127.0.0.3 >>> dnslists check: rbl.test.ex!==127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0) >>> => that means V4NET.13.13.104 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 32) +>>> processing "warn" (TESTSUITE/test-config 33) >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0) >>> => that means V4NET.13.13.104 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 33) +>>> processing "warn" (TESTSUITE/test-config 34) >>> check dnslists = rbl.test.ex >>> dnslists check: rbl.test.ex >>> dnslists: using result of previous lookup @@ -819,7 +823,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103] LOG: DNS list lookup for V4NET.13.13.104 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded >>> => that means V4NET.13.13.104 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "accept" (TESTSUITE/test-config 34) +>>> processing "accept" (TESTSUITE/test-config 35) >>> accept: condition test succeeded in ACL "check_vrfy" >>> end of ACL "check_vrfy": ACCEPT >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -839,7 +843,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104] >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 25) +>>> processing "warn" (TESTSUITE/test-config 26) >>> check dnslists = rbl.test.ex=127.0.0.1 >>> dnslists check: rbl.test.ex=127.0.0.1 >>> new DNS lookup for 105.13.13.V4NET.rbl.test.ex @@ -848,21 +852,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104] >>> => but we are not accepting this block class because >>> => there was no match for =127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 26) +>>> processing "warn" (TESTSUITE/test-config 27) >>> check dnslists = rbl.test.ex!=127.0.0.1 >>> dnslists check: rbl.test.ex!=127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254) >>> => that means V4NET.13.13.105 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 27) +>>> processing "warn" (TESTSUITE/test-config 28) >>> check dnslists = rbl.test.ex!=127.0.0.3 >>> dnslists check: rbl.test.ex!=127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254) >>> => that means V4NET.13.13.105 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 28) +>>> processing "warn" (TESTSUITE/test-config 29) >>> check dnslists = rbl.test.ex==127.0.0.1 >>> dnslists check: rbl.test.ex==127.0.0.1 >>> dnslists: using result of previous lookup @@ -870,7 +874,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 29) +>>> processing "warn" (TESTSUITE/test-config 30) >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup @@ -878,28 +882,28 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104] >>> => but we are not accepting this block class because >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2 >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 30) +>>> processing "warn" (TESTSUITE/test-config 31) >>> check dnslists = rbl.test.ex!==127.0.0.1 >>> dnslists check: rbl.test.ex!==127.0.0.1 >>> dnslists: using result of previous lookup >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254) >>> => that means V4NET.13.13.105 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 31) +>>> processing "warn" (TESTSUITE/test-config 32) >>> check dnslists = rbl.test.ex!==127.0.0.3 >>> dnslists check: rbl.test.ex!==127.0.0.3 >>> dnslists: using result of previous lookup >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254) >>> => that means V4NET.13.13.105 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 32) +>>> processing "warn" (TESTSUITE/test-config 33) >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2 >>> dnslists: using result of previous lookup >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254) >>> => that means V4NET.13.13.105 is listed at rbl.test.ex >>> warn: condition test succeeded in ACL "check_vrfy" ->>> processing "warn" (TESTSUITE/test-config 33) +>>> processing "warn" (TESTSUITE/test-config 34) >>> check dnslists = rbl.test.ex >>> dnslists check: rbl.test.ex >>> dnslists: using result of previous lookup @@ -907,7 +911,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104] LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.254; not in 127.0/8 and discarded >>> warn: condition test failed in ACL "check_vrfy" ->>> processing "accept" (TESTSUITE/test-config 34) +>>> processing "accept" (TESTSUITE/test-config 35) >>> accept: condition test succeeded in ACL "check_vrfy" >>> end of ACL "check_vrfy": ACCEPT >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/0145 b/test/stderr/0145 index 79a6f4ab1..a11705730 100644 --- a/test/stderr/0145 +++ b/test/stderr/0145 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 18) >>> check verify = sender @@ -19,8 +20,8 @@ >>> ----------- end verify ------------ >>> require: condition test failed in ACL "check_recipient" >>> end of ACL "check_recipient": not OK -LOG: H=[V4NET.9.8.7] sender verify fail for <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses -LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify failed +LOG: H=(test) [V4NET.9.8.7] sender verify fail for <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses +LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify failed >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -29,6 +30,7 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 18) >>> check verify = sender @@ -51,4 +53,4 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail >>> ----------- end verify ------------ >>> require: condition test failed in ACL "check_recipient" >>> end of ACL "check_recipient": not OK -LOG: H=[V4NET.9.8.7] F=<x@ten-1.test.ex> rejected RCPT <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses +LOG: H=(test) [V4NET.9.8.7] F=<x@ten-1.test.ex> rejected RCPT <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses diff --git a/test/stderr/0157 b/test/stderr/0157 index df37cedcf..f4565c76c 100644 --- a/test/stderr/0157 +++ b/test/stderr/0157 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check hosts = : @@ -24,7 +25,7 @@ >>> x@y.z in "userx@test.ex"? no (end of list) >>> accept: condition test failed in ACL "check_recipient" >>> accept: endpass encountered - denying access -LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender +LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check hosts = : @@ -52,6 +53,7 @@ LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check hosts = : @@ -99,6 +101,7 @@ LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check hosts = : @@ -122,7 +125,7 @@ LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted +LOG: H=(test) [V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check hosts = : @@ -145,4 +148,4 @@ LOG: H=[V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.3] F=<userx@test.ex> rejected RCPT <a@b.c>: relay not permitted +LOG: H=(test) [V4NET.0.0.3] F=<userx@test.ex> rejected RCPT <a@b.c>: relay not permitted diff --git a/test/stderr/0175 b/test/stderr/0175 index 684b2b428..014979ad5 100644 --- a/test/stderr/0175 +++ b/test/stderr/0175 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 18) >>> check verify = sender @@ -24,8 +25,8 @@ MUNGED: ::1 will be omitted in what follows >>> ----------- end verify ------------ >>> require: condition test failed in ACL "check_recipient" >>> end of ACL "check_recipient": not OK -LOG: H=[V4NET.0.0.0] sender verify fail for <user@bad.domain>: remote host address is the local host -LOG: H=[V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: Sender verify failed +LOG: H=(test) [V4NET.0.0.0] sender verify fail for <user@bad.domain>: remote host address is the local host +LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: Sender verify failed >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -34,6 +35,7 @@ LOG: H=[V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: Sender v >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 18) >>> check verify = sender @@ -55,8 +57,8 @@ MUNGED: ::1 will be omitted in what follows >>> ----------- end verify ------------ >>> require: condition test failed in ACL "check_recipient" >>> end of ACL "check_recipient": not OK -LOG: H=[V4NET.0.0.0] sender verify fail for <user@bad.domain2>: fail_sender2 router forced verify failure -LOG: H=[V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender verify failed +LOG: H=(test) [V4NET.0.0.0] sender verify fail for <user@bad.domain2>: fail_sender2 router forced verify failure +LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender verify failed >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -65,6 +67,7 @@ LOG: H=[V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 18) >>> check verify = sender @@ -91,4 +94,4 @@ LOG: H=[V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender >>> test.ex in "+local_domains"? yes (matched "+local_domains") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= user@ten-1.test.ex H=[V4NET.0.0.0] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= user@ten-1.test.ex H=(test) [V4NET.0.0.0] P=smtp S=sss diff --git a/test/stderr/0227 b/test/stderr/0227 index 36e6ee75d..71b9637ff 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -31,9 +31,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user + H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -50,9 +50,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error + H=(test) [V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout + H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -67,9 +67,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <> + H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -85,9 +85,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line + H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -102,9 +102,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377 + H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377 LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -121,7 +121,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked + H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -139,7 +139,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second + H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -156,7 +156,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377 + H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -164,7 +164,7 @@ LOG: smtp_connection MAIN Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1224 ... failed: Connection refused LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout + H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -181,7 +181,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line + H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -198,7 +198,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line + H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -222,7 +222,7 @@ Cutthrough cancelled by presence of postmaster verify SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted + H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -246,9 +246,9 @@ Cutthrough cancelled by presence of postmaster verify SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster + H=(test) [V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed + H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -345,7 +345,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked + H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -354,17 +354,17 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP(closed)<< SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection + H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout + H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused + H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout + H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT diff --git a/test/stderr/0234 b/test/stderr/0234 index ffc440678..5455bb854 100644 --- a/test/stderr/0234 +++ b/test/stderr/0234 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check domains = +relay_domains @@ -16,7 +17,7 @@ >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY -LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted +LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check domains = +relay_domains diff --git a/test/stderr/0251 b/test/stderr/0251 index a118e5cb3..87595bc90 100644 --- a/test/stderr/0251 +++ b/test/stderr/0251 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 20) >>> message: unrouteable address diff --git a/test/stderr/0281 b/test/stderr/0281 index 5c58bd3af..ccdf4f3d6 100644 --- a/test/stderr/0281 +++ b/test/stderr/0281 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_rcpt_1" >>> processing "require" (TESTSUITE/test-config 19) >>> message: domain doesn't match @ or @[] @@ -31,7 +32,7 @@ >>> else.where in "@ : @[]"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_1" >>> end of ACL "acl_rcpt_1": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match @ or @[] +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match @ or @[] >>> using ACL "acl_rcpt_2" >>> processing "require" (TESTSUITE/test-config 24) >>> message: domain doesn't match @mx_any @@ -78,7 +79,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match >>> mxt9.test.ex in "@mx_any"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_2" >>> end of ACL "acl_rcpt_2": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't match @mx_any +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't match @mx_any >>> using ACL "acl_rcpt_2" >>> processing "require" (TESTSUITE/test-config 24) >>> message: domain doesn't match @mx_any @@ -86,7 +87,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't matc >>> mxnone.test.ex in "@mx_any"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_2" >>> end of ACL "acl_rcpt_2": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't match @mx_any +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't match @mx_any >>> using ACL "acl_rcpt_3" >>> processing "require" (TESTSUITE/test-config 29) >>> message: domain doesn't match @mx_primary @@ -112,7 +113,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't ma >>> mxt6.test.ex in "@mx_primary"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_3" >>> end of ACL "acl_rcpt_3": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't match @mx_primary +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't match @mx_primary >>> using ACL "acl_rcpt_3" >>> processing "require" (TESTSUITE/test-config 29) >>> message: domain doesn't match @mx_primary @@ -123,7 +124,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't matc >>> mxt9.test.ex in "@mx_primary"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_3" >>> end of ACL "acl_rcpt_3": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't match @mx_primary +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't match @mx_primary >>> using ACL "acl_rcpt_3" >>> processing "require" (TESTSUITE/test-config 29) >>> message: domain doesn't match @mx_primary @@ -131,7 +132,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't matc >>> mxnone.test.ex in "@mx_primary"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_3" >>> end of ACL "acl_rcpt_3": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't match @mx_primary +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't match @mx_primary >>> using ACL "acl_rcpt_4" >>> processing "require" (TESTSUITE/test-config 34) >>> message: domain doesn't match @mx_secondary @@ -141,7 +142,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't ma >>> mxt5.test.ex in "@mx_secondary"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_4" >>> end of ACL "acl_rcpt_4": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't match @mx_secondary +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't match @mx_secondary >>> using ACL "acl_rcpt_4" >>> processing "require" (TESTSUITE/test-config 34) >>> message: domain doesn't match @mx_secondary @@ -167,7 +168,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't matc >>> mxt9.test.ex in "@mx_secondary"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_4" >>> end of ACL "acl_rcpt_4": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't match @mx_secondary +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't match @mx_secondary >>> using ACL "acl_rcpt_4" >>> processing "require" (TESTSUITE/test-config 34) >>> message: domain doesn't match @mx_secondary @@ -175,7 +176,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't matc >>> mxnone.test.ex in "@mx_secondary"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_4" >>> end of ACL "acl_rcpt_4": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxnone.test.ex>: domain doesn't match @mx_secondary +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxnone.test.ex>: domain doesn't match @mx_secondary >>> using ACL "acl_rcpt_5" >>> processing "require" (TESTSUITE/test-config 39) >>> message: host doesn't match @ or @[] @@ -186,7 +187,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "@ : @[]"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_5" >>> end of ACL "acl_rcpt_5": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't match @ or @[] +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't match @ or @[] >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -195,6 +196,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't matc >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_rcpt_5" >>> processing "require" (TESTSUITE/test-config 39) >>> message: host doesn't match @ or @[] @@ -215,6 +217,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_rcpt_5" >>> processing "require" (TESTSUITE/test-config 39) >>> message: host doesn't match @ or @[] @@ -235,6 +238,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_rcpt_2" >>> processing "require" (TESTSUITE/test-config 24) >>> message: domain doesn't match @mx_any @@ -259,7 +263,7 @@ MUNGED: ::1 will be omitted in what follows >>> mxt3.test.ex in "@mx_primary"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_3" >>> end of ACL "acl_rcpt_3": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn't match @mx_primary +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn't match @mx_primary >>> using ACL "acl_rcpt_4" >>> processing "require" (TESTSUITE/test-config 34) >>> message: domain doesn't match @mx_secondary diff --git a/test/stderr/0293 b/test/stderr/0293 index a89c4b86a..f12b83795 100644 --- a/test/stderr/0293 +++ b/test/stderr/0293 @@ -1,14 +1,14 @@ LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN - <= x@y U=CALLER P=local-smtp S=sss + <= x1@y U=CALLER P=local-smtp S=sss delivering 10HmaX-0005vi-00 LOG: MAIN => one <one@z> R=r1 T=t1 LOG: MAIN Completed LOG: MAIN - <= x@y U=CALLER P=local-smtp S=sss + <= x2@y U=CALLER P=local-smtp S=sss LOG: delay_delivery MAIN no immediate delivery: more than 1 messages received in one connection LOG: MAIN REJECT diff --git a/test/stderr/0294 b/test/stderr/0294 index c2ffd2d96..8bd1e8c9e 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -8,6 +8,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -38,7 +40,8 @@ F From: x@y Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line -P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test) + by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <x@y>) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 @@ -69,7 +72,8 @@ F From: x@y Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line -P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test) + by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <x@y>) id 10HmaY-0005vi-00 for two@z; @@ -109,6 +113,9 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +SMTP>> 250 myhost.test.ex Hello test [1.2.3.4] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -135,7 +142,7 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [1.2.3.4] closed by QUIT + SMTP connection from (test) [1.2.3.4] closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -155,6 +162,9 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -182,7 +192,7 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -194,6 +204,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 diff --git a/test/stderr/0304 b/test/stderr/0304 index bd33dd746..3760ef7f4 100644 --- a/test/stderr/0304 +++ b/test/stderr/0304 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -48,7 +49,7 @@ >>> b1@x in "b1@x"? yes (matched "b1@x") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7 +LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -98,7 +99,7 @@ LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7 >>> b2@x in "b2@x"? yes (matched "b2@x") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8 +LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -172,7 +173,7 @@ LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8 >>> abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -180,7 +181,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1 >>> abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -189,7 +190,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1 >>> a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -265,7 +266,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1 >>> x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -278,7 +279,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2 >>> abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -359,7 +360,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2 >>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -377,7 +378,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3 >>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -395,7 +396,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3 >>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -482,7 +483,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3 >>> x@domain.only in "domain.only : *.domain2.only"? yes (matched "domain.only") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -507,7 +508,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4 >>> x@abc.domain2.only in "domain.only : *.domain2.only"? yes (matched "*.domain2.only") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -601,7 +602,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4 >>> abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -632,7 +633,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5 >>> xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -797,7 +798,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5 >>> pqr@myhost.test.ex in "pqr@@"? yes (matched "pqr@@") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -913,7 +914,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6 >>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -972,7 +973,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9 >>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10 >>> using ACL "acl1" >>> processing "deny" (TESTSUITE/test-config 16) >>> message: failed 1 @@ -1098,4 +1099,4 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5") >>> deny: condition test succeeded in ACL "acl1" >>> end of ACL "acl1": DENY -LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain7>: failed 11 +LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain7>: failed 11 diff --git a/test/stderr/0305 b/test/stderr/0305 index 4576166b1..9eaa81358 100644 --- a/test/stderr/0305 +++ b/test/stderr/0305 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl1" >>> processing "accept" (TESTSUITE/test-config 18) >>> check domains = +ok_domains @@ -20,4 +21,4 @@ >>> junk.junk in "+ok_domains"? no (end of list) >>> accept: condition test failed in ACL "acl1" >>> end of ACL "acl1": implicit DENY -LOG: H=[V4NET.2.3.4] F=<x@y> rejected RCPT <x@junk.junk> +LOG: H=(test) [V4NET.2.3.4] F=<x@y> rejected RCPT <x@junk.junk> diff --git a/test/stderr/0306 b/test/stderr/0306 index e8e7d4667..ff95f9738 100644 --- a/test/stderr/0306 +++ b/test/stderr/0306 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "rcpt" >>> processing "accept" (TESTSUITE/test-config 18) >>> check verify = recipient @@ -51,7 +52,7 @@ >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "rcpt" >>> accept: endpass encountered - denying access -LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@lists.test.ex is a closed mailing list +LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@lists.test.ex is a closed mailing list >>> using ACL "rcpt" >>> processing "accept" (TESTSUITE/test-config 18) >>> check verify = recipient @@ -68,4 +69,4 @@ LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@ >>> ----------- end verify ------------ >>> accept: condition test failed in ACL "rcpt" >>> accept: endpass encountered - denying access -LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@lists.test.ex>: nonlist@lists.test.ex is a closed mailing list +LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@lists.test.ex>: nonlist@lists.test.ex is a closed mailing list diff --git a/test/stderr/0308 b/test/stderr/0308 index 091b39590..130c02831 100644 --- a/test/stderr/0308 +++ b/test/stderr/0308 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_V4NET_0_0" >>> processing "accept" (TESTSUITE/test-config 17) >>> check hosts = *.test.ex @@ -27,6 +28,7 @@ LOG: no host name found for IP address V4NET.0.0.97 >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_V4NET_0_0" >>> processing "accept" (TESTSUITE/test-config 17) >>> check hosts = *.test.ex diff --git a/test/stderr/0312 b/test/stderr/0312 index 9b147156e..22055ad9a 100644 --- a/test/stderr/0312 +++ b/test/stderr/0312 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_rcpt" >>> processing "deny" (TESTSUITE/test-config 16) >>> check dnslists = +defer_unknown : test.again.dns @@ -16,4 +17,4 @@ >>> dnslists: wrote cache entry, ttl=3600 LOG: DNS list lookup defer (probably timeout) for 1.0.0.V4NET.test.again.dns: returned DEFER >>> deny: condition test deferred in ACL "check_rcpt" -LOG: H=[V4NET.0.0.1] F=<userx@x> temporarily rejected RCPT <userx@y> +LOG: H=(test) [V4NET.0.0.1] F=<userx@x> temporarily rejected RCPT <userx@y> diff --git a/test/stderr/0325 b/test/stderr/0325 index a9d8eb1bc..8ebefffcf 100644 --- a/test/stderr/0325 +++ b/test/stderr/0325 @@ -14,6 +14,7 @@ r4: $local_part_data = LOCAL PART DATA >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "a1" >>> processing "accept" (TESTSUITE/test-config 19) >>> check domains = +test_domains @@ -33,4 +34,4 @@ r4: $local_part_data = LOCAL PART DATA >>> message: \$domain_data=$domain_data \$local_part_data=$local_part_data >>> deny: condition test succeeded in ACL "a1" >>> end of ACL "a1": DENY -LOG: H=[V4NET.0.0.0] F=<a@b.c> rejected RCPT xxx@a.b.c: $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA +LOG: H=(test) [V4NET.0.0.0] F=<a@b.c> rejected RCPT xxx@a.b.c: $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA diff --git a/test/stderr/0342 b/test/stderr/0342 index 3f9891c57..3739f797e 100644 --- a/test/stderr/0342 +++ b/test/stderr/0342 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_rcpt" >>> processing "deny" (TESTSUITE/test-config 17) >>> message: unverifiable diff --git a/test/stderr/0362 b/test/stderr/0362 index 3c6259bea..39fe09628 100644 --- a/test/stderr/0362 +++ b/test/stderr/0362 @@ -24,6 +24,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.0.0.0] +sender_rcvhost = [V4NET.0.0.0] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.0] +SMTP>> 250 the.local.host.name Hello test [V4NET.0.0.0] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -82,6 +88,6 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.0.0.0] closed by QUIT + SMTP connection from (test) [V4NET.0.0.0] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0372 b/test/stderr/0372 index 096049ec8..abec969e9 100644 --- a/test/stderr/0372 +++ b/test/stderr/0372 @@ -1,7 +1,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN - <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss + <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss delivering 10HmaY-0005vi-00 ----- System filter ----- acl_c0="value for c0 is ip: 1.2.3.4" @@ -62,7 +62,7 @@ LOG: MAIN LOG: MAIN Completed LOG: MAIN - <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss + <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss delivering 10HmaZ-0005vi-00 ----- System filter ----- acl_c0="value for c0 is ip: 1.2.3.4" diff --git a/test/stderr/0376 b/test/stderr/0376 index 7315bec96..96c834781 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -62,10 +62,10 @@ callout cache: address record expired for ok@localhost interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused + H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused created log directory TESTSUITE/spool/log LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout + H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -98,9 +98,9 @@ wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 wrote negative callout cache address record for bad@localhost LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED + H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -119,9 +119,9 @@ callout cache: found domain record for localhost callout cache: found address record for bad@localhost callout cache: address record is negative LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost> + H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -151,9 +151,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected wrote callout cache domain record for localhost: result=3 postmaster=0 random=0 LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM + H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -171,9 +171,9 @@ Attempting full verification using callout callout cache: found domain record for localhost callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost> + H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -213,9 +213,9 @@ wrote callout cache domain record for otherhost: result=1 postmaster=2 random=0 wrote positive callout cache address record for ok@otherhost LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK + H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -233,9 +233,9 @@ Attempting full verification using callout callout cache: found domain record for otherhost callout cache: domain does not accept RCPT TO:<postmaster@domain> LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost> + H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost> LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -661,9 +661,9 @@ SMTP timeout wrote callout cache domain record for otherhost51: result=1 postmaster=0 random=0 LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51> + H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51> LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout + H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -735,7 +735,7 @@ wrote callout cache domain record for x.y.z: result=1 postmaster=0 random=0 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain> LOG: MAIN - <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss + <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -767,7 +767,7 @@ SMTP timeout wrote callout cache domain record for x.y.z: result=1 postmaster=0 random=0 LOG: MAIN - <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss + <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0381 b/test/stderr/0381 index 0edf18cf5..19c4e8a3a 100644 --- a/test/stderr/0381 +++ b/test/stderr/0381 @@ -27,6 +27,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.99.99.97] +sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER) +set_process_info: pppp handling incoming connection from (test) [V4NET.99.99.97] U=CALLER +SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.99.99.97] SMTP<< mail from:<notgov@test.ex> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -53,8 +59,9 @@ x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx checking addresses for x.co.uk.test.ex Forward DNS security status: unverified V4NET.99.99.97 OK -sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97] -sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER) +sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97] +sender_rcvhost = x.gov.uk.test.ex + ([V4NET.99.99.97] helo=test ident=CALLER) host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex") warn: condition test succeeded in ACL "check_rcpt" processing "warn" (TESTSUITE/test-config 18) diff --git a/test/stderr/0386 b/test/stderr/0386 index 8b0ca4648..a94214bbc 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -27,6 +27,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.9.8.7] +sender_rcvhost = [V4NET.9.8.7] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7] +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -80,7 +86,7 @@ accept: condition test failed in ACL "chk_rcpt" accept: endpass encountered - denying access SMTP>> 550 No such user here LOG: MAIN REJECT - H=[V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here + H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from:<x@y> @@ -135,11 +141,11 @@ accept: condition test failed in ACL "chk_rcpt" accept: endpass encountered - denying access SMTP>> 550 No such user here LOG: MAIN REJECT - H=[V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here + H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -173,6 +179,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.11.12.13] +sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) +set_process_info: pppp handling incoming connection from (test) [V4NET.11.12.13] U=CALLER +SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.11.12.13] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -203,7 +215,7 @@ DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded => that means V4NET.11.12.13 is listed at rbl.test.ex warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" LOG: MAIN - H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message + H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message created log directory TESTSUITE/spool/log processing "accept" (TESTSUITE/test-config 44) accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" @@ -222,7 +234,7 @@ search_tidyup called Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.11.12.13] (ident=CALLER) +P Received: from [V4NET.11.12.13] (helo=test ident=CALLER) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) id 10HmaX-0005vi-00 @@ -237,7 +249,7 @@ DSN: **** SPOOL_OUT - address: <2@b> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN - <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss + <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss SMTP>> 250 OK id=10HmaX-0005vi-00 search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 @@ -257,8 +269,8 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y -sender_fullhost = [V4NET.11.12.13] -sender_rcvhost = [V4NET.11.12.13] (ident=CALLER) +sender_fullhost = (test) [V4NET.11.12.13] +sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) sender_local=0 ident=CALLER Non-recipients: Empty Tree @@ -394,7 +406,7 @@ DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) => that means V4NET.11.12.13 is listed at rbl.test.ex warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" LOG: MAIN - H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message + H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message processing "accept" (TESTSUITE/test-config 44) accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT @@ -412,7 +424,7 @@ search_tidyup called Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.11.12.13] (ident=CALLER) +P Received: from [V4NET.11.12.13] (helo=test ident=CALLER) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) id 10HmaY-0005vi-00 @@ -427,7 +439,7 @@ DSN: **** SPOOL_OUT - address: <2@b> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN - <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss + <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss SMTP>> 250 OK id=10HmaY-0005vi-00 search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 @@ -447,8 +459,8 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y -sender_fullhost = [V4NET.11.12.13] -sender_rcvhost = [V4NET.11.12.13] (ident=CALLER) +sender_fullhost = (test) [V4NET.11.12.13] +sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) sender_local=0 ident=CALLER Non-recipients: Empty Tree diff --git a/test/stderr/0391 b/test/stderr/0391 index 8bfb22897..8c76173e3 100644 --- a/test/stderr/0391 +++ b/test/stderr/0391 @@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [1.2.3.4] +sender_rcvhost = [1.2.3.4] (helo=test) +set_process_info: pppp handling incoming connection from (test) [1.2.3.4] +SMTP>> 250 myhost.test.ex Hello test [1.2.3.4] SMTP<< mail from:<U@W.x.y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -62,6 +68,6 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [1.2.3.4] closed by QUIT + SMTP connection from (test) [1.2.3.4] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0395 b/test/stderr/0395 index 503b96360..964ce9243 100644 --- a/test/stderr/0395 +++ b/test/stderr/0395 @@ -3,8 +3,8 @@ The error message was: 501 sender address must contain a domain -The SMTP transaction started in line 0. -The error was detected in line 1. +The SMTP transaction started in line 1. +The error was detected in line 2. The SMTP command at fault was: mail from: userx @@ -16,8 +16,8 @@ The error message was: 501 recipient address must contain a domain -The SMTP transaction started in line 0. -The error was detected in line 2. +The SMTP transaction started in line 1. +The error was detected in line 3. The SMTP command at fault was: rcpt to: userx diff --git a/test/stderr/0396 b/test/stderr/0396 index 6afac4c6c..60661f82f 100644 --- a/test/stderr/0396 +++ b/test/stderr/0396 @@ -13,6 +13,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 the.local.host.name Hello CALLER at test SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 diff --git a/test/stderr/0398 b/test/stderr/0398 index d4f6a1c54..d14f1056a 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -15,6 +15,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 mail.test.ex Hello CALLER at test SMTP<< mail from:<qq@remote> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 diff --git a/test/stderr/0432 b/test/stderr/0432 index da8c0b57c..2f55fa252 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "mail" >>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s,maxwait=1s @@ -47,6 +48,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [1.2.3.4] +sender_rcvhost = [1.2.3.4] (helo=test) +set_process_info: pppp handling incoming connection from (test) [1.2.3.4] +SMTP>> 250 myhost.test.ex Hello test [1.2.3.4] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -130,7 +137,7 @@ SMTP>> 250 OK SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [1.2.3.4] closed by QUIT + SMTP connection from (test) [1.2.3.4] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -157,6 +164,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [1.2.3.4] +sender_rcvhost = [1.2.3.4] (helo=test) +set_process_info: pppp handling incoming connection from (test) [1.2.3.4] +SMTP>> 250 myhost.test.ex Hello test [1.2.3.4] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -208,7 +221,7 @@ SMTP>> 250 OK SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [1.2.3.4] closed by QUIT + SMTP connection from (test) [1.2.3.4] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (option unset) @@ -219,6 +232,7 @@ search_tidyup called >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "mail" >>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s,maxwait=1s @@ -245,6 +259,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "mail" >>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s,maxwait=1s @@ -291,6 +306,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "mail" >>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s,maxwait=1s @@ -315,5 +331,5 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP timeout >>> ----------- end verify ------------ >>> accept: condition test deferred in ACL "mail" -LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex -LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout +LOG: H=(test) [1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex +LOG: H=(test) [1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout diff --git a/test/stderr/0443 b/test/stderr/0443 index 2911efa80..974eb9a7e 100644 --- a/test/stderr/0443 +++ b/test/stderr/0443 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "rcpt" >>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s @@ -20,5 +21,5 @@ >>> cannot callout via null transport >>> ----------- end verify ------------ >>> accept: condition test deferred in ACL "rcpt" -LOG: H=[V4NET.0.0.1] sender verify defer for <x@ten-1.test.ex>: Could not complete sender verify callout -LOG: H=[V4NET.0.0.1] F=<x@ten-1.test.ex> temporarily rejected RCPT x@y: Could not complete sender verify callout +LOG: H=(test) [V4NET.0.0.1] sender verify defer for <x@ten-1.test.ex>: Could not complete sender verify callout +LOG: H=(test) [V4NET.0.0.1] F=<x@ten-1.test.ex> temporarily rejected RCPT x@y: Could not complete sender verify callout diff --git a/test/stderr/0445 b/test/stderr/0445 index f493eda33..38410b78e 100644 --- a/test/stderr/0445 +++ b/test/stderr/0445 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "rcpt" >>> processing "deny" (TESTSUITE/test-config 20) >>> check !verify = sender @@ -17,8 +18,8 @@ >>> ----------- end verify ------------ >>> deny: condition test succeeded in ACL "rcpt" >>> end of ACL "rcpt": DENY -LOG: H=[1.2.3.4] sender verify fail for <lp1@x.y>: -LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed +LOG: H=(test) [1.2.3.4] sender verify fail for <lp1@x.y>: +LOG: H=(test) [1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed >>> using ACL "rcpt" >>> processing "deny" (TESTSUITE/test-config 20) >>> check !verify = sender @@ -30,5 +31,5 @@ LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed >>> ----------- end verify ------------ >>> deny: condition test succeeded in ACL "rcpt" >>> end of ACL "rcpt": DENY -LOG: H=[1.2.3.4] sender verify fail for <lp2@x.y>: This is a message -LOG: H=[1.2.3.4] F=<lp2@x.y> rejected RCPT <zz@x.y>: Sender verify failed +LOG: H=(test) [1.2.3.4] sender verify fail for <lp2@x.y>: This is a message +LOG: H=(test) [1.2.3.4] F=<lp2@x.y> rejected RCPT <zz@x.y>: Sender verify failed diff --git a/test/stderr/0462 b/test/stderr/0462 index 7ec8deda8..0cf9bd412 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -34,10 +34,10 @@ wrote callout cache domain record for localhost: result=1 postmaster=2 random=0 wrote positive callout cache address record for Ok@localhost LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO + H=(test) [V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO created log directory TESTSUITE/spool/log LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Verifying Ok@localhost >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -78,9 +78,9 @@ wrote callout cache domain record for elsewhere: result=1 postmaster=0 random=0 wrote negative callout cache address record for NOTok@elsewhere LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO + H=(test) [V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -113,7 +113,7 @@ wrote callout cache domain record for elsewhere: result=1 postmaster=0 random=0 wrote negative callout cache address record for NOTok2@elsewhere LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0464 b/test/stderr/0464 index c156e8736..c77aa978f 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -13,6 +13,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test SMTP<< mail from:<> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 diff --git a/test/stderr/0465 b/test/stderr/0465 index bef0e0290..c1dc8233e 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -16,6 +16,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test SMTP<< mail from:<> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -49,6 +51,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test SMTP<< mail from:<> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -75,7 +79,8 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line -P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test) + by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaY-0005vi-00 for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000 @@ -117,6 +122,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test SMTP<< mail from:<> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -143,7 +150,8 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line -P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test) + by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaX-0005vi-00 for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stderr/0475 b/test/stderr/0475 index 6225b4dd0..c4df1ad5d 100644 --- a/test/stderr/0475 +++ b/test/stderr/0475 @@ -6,17 +6,18 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "a1" >>> processing "deny" (TESTSUITE/test-config 16) >>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8 LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8" >>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? list match deferred for <; 1.2.3.4:5.6.7.8 >>> deny: condition test deferred in ACL "a1" -LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<" +LOG: H=(test) [V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<" >>> using ACL "a2" >>> processing "deny" (TESTSUITE/test-config 19) >>> check hosts = 1.2.3/24 >>> host in "1.2.3/24"? no (malformed IPv4 address or address mask) >>> deny: condition test failed in ACL "a2" >>> end of ACL "a2": implicit DENY -LOG: H=[V4NET.0.0.0] F=<> rejected RCPT <a2@b> +LOG: H=(test) [V4NET.0.0.0] F=<> rejected RCPT <a2@b> diff --git a/test/stderr/0569 b/test/stderr/0569 index 78ef6d30f..4799df036 100644 --- a/test/stderr/0569 +++ b/test/stderr/0569 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_from" >>> processing "accept" (TESTSUITE/test-config 20) >>> check senders = usery@exim.test.ex @@ -26,7 +27,7 @@ >>> 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@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -35,6 +36,7 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_from" >>> processing "accept" (TESTSUITE/test-config 20) >>> check senders = usery@exim.test.ex @@ -53,7 +55,7 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> check verify = header_names_ascii >>> 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@exim.test.ex> rejected after DATA: Invalid character in header "Received" found +LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -62,6 +64,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_from" >>> processing "accept" (TESTSUITE/test-config 20) >>> check senders = usery@exim.test.ex @@ -80,7 +83,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> check verify = header_names_ascii >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found +LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -89,6 +92,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_from" >>> processing "accept" (TESTSUITE/test-config 20) >>> check senders = usery@exim.test.ex @@ -107,7 +111,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after D >>> check verify = header_names_ascii >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found +LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -116,6 +120,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_from" >>> processing "accept" (TESTSUITE/test-config 20) >>> check senders = usery@exim.test.ex @@ -136,7 +141,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D >>> 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@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -145,6 +150,7 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_from" >>> processing "accept" (TESTSUITE/test-config 20) >>> check senders = usery@exim.test.ex @@ -165,4 +171,4 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss >>> 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@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaZ-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss diff --git a/test/stderr/0575 b/test/stderr/0575 index 845b2c362..17f50041f 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.0.0.0] +sender_rcvhost = [V4NET.0.0.0] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.0] +SMTP>> 250 mail.test.ex Hello test [V4NET.0.0.0] SMTP<< mail from:<x@y> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -42,19 +48,19 @@ search_tidyup called Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.0.0.0] +P Received: from [V4NET.0.0.0] (helo=test) by mail.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN - <= x@y H=[V4NET.0.0.0] P=smtp S=sss + <= x@y H=(test) [V4NET.0.0.0] P=smtp S=sss SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< quit SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.0.0.0] closed by QUIT + SMTP connection from (test) [V4NET.0.0.0] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0578 b/test/stderr/0578 index 8a342346b..3be9e2a1c 100644 --- a/test/stderr/0578 +++ b/test/stderr/0578 @@ -64,10 +64,10 @@ callout cache: address record expired for ok@localhost interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused + H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused created log directory TESTSUITE/spool/log LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout + H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -102,9 +102,9 @@ wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 wrote negative callout cache address record for bad@localhost LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt + H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -123,9 +123,9 @@ callout cache: found domain record for localhost callout cache: found address record for bad@localhost callout cache: address record is negative LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost> + H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -159,9 +159,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected wrote callout cache domain record for localhost: result=3 postmaster=0 random=0 LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from + H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -179,9 +179,9 @@ Attempting full verification using callout callout cache: found domain record for localhost callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost> + H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed + H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -223,9 +223,9 @@ wrote callout cache domain record for otherhost: result=1 postmaster=2 random=0 wrote positive callout cache address record for ok@otherhost LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster + H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -243,9 +243,9 @@ Attempting full verification using callout callout cache: found domain record for otherhost callout cache: domain does not accept RCPT TO:<postmaster@domain> LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost> + H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost> LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed + H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -691,9 +691,9 @@ SMTP timeout wrote callout cache domain record for otherhost51: result=1 postmaster=0 random=0 LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51> + H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51> LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout + H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -769,7 +769,7 @@ wrote callout cache domain record for x.y.z: result=1 postmaster=0 random=0 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain> LOG: MAIN - <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss + <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -803,7 +803,7 @@ SMTP timeout wrote callout cache domain record for x.y.z: result=1 postmaster=0 random=0 LOG: MAIN - <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss + <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0584 b/test/stderr/0584 index d3e854e68..73a584a4f 100644 --- a/test/stderr/0584 +++ b/test/stderr/0584 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 20) >>> check verify = sender=userx@test.ex @@ -20,7 +21,7 @@ >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtp S=sss +LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -29,6 +30,7 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtp S=sss >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 20) >>> check verify = sender=fail@test.ex @@ -39,8 +41,8 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtp S=sss >>> ----------- end verify ------------ >>> require: condition test failed in ACL "check_recipient" >>> end of ACL "check_recipient": not OK -LOG: H=[127.0.0.1] sender verify fail for <fail@test.ex>: Unrouteable address -LOG: H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed +LOG: H=(test) [127.0.0.1] sender verify fail for <fail@test.ex>: Unrouteable address +LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -49,6 +51,7 @@ LOG: H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verif >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 20) >>> check verify = sender=$sender_address/defer_ok @@ -64,4 +67,4 @@ LOG: H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verif >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtp S=sss +LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss diff --git a/test/stderr/0609 b/test/stderr/0609 index 5d6f97fd8..f8b8aee0b 100644 --- a/test/stderr/0609 +++ b/test/stderr/0609 @@ -28,7 +28,7 @@ ppppp Listening... ppppp accept: condition test succeeded in ACL "delay4_accept" ppppp end of ACL "delay4_accept": ACCEPT ppppp LOG: smtp_connection MAIN -ppppp SMTP connection from [127.0.0.1] closed by QUIT +ppppp SMTP connection from (test) [127.0.0.1] closed by QUIT ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> ppppp child ppppp ended: status=0x0 ppppp normal exit, 0 @@ -47,7 +47,7 @@ ppppp delay cancelled by peer close ppppp accept: condition test succeeded in ACL "delay4_accept" ppppp end of ACL "delay4_accept": ACCEPT ppppp LOG: lost_incoming_connection MAIN -ppppp unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs +ppppp unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>> ppppp 1 SMTP accept process running ppppp SIGTERM/SIGINT seen diff --git a/test/stderr/1002 b/test/stderr/1002 index d01a05d7b..7e23fe7e7 100644 --- a/test/stderr/1002 +++ b/test/stderr/1002 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_rcpt_1" >>> processing "require" (TESTSUITE/test-config 19) >>> message: domain doesn't match @ or @[] @@ -26,4 +27,4 @@ >>> mxt11a.test.ex in "<+ @mx_any/ignore=<;127.0.0.1;::1"? no (end of list) >>> require: condition test failed in ACL "acl_rcpt_6" >>> end of ACL "acl_rcpt_6": not OK -LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <6@mxt11a.test.ex>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1 +LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <6@mxt11a.test.ex>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1 diff --git a/test/stderr/2202 b/test/stderr/2202 index 3ce137682..9770c0482 100644 --- a/test/stderr/2202 +++ b/test/stderr/2202 @@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [ip4.ip4.ip4.ip4] +sender_rcvhost = [ip4.ip4.ip4.ip4] (helo=test) +set_process_info: pppp handling incoming connection from (test) [ip4.ip4.ip4.ip4] +SMTP>> 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4] SMTP<< mail from:<xx@cioce.test.again.dns> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -59,8 +65,8 @@ the.local.host.name ip4.ip4.ip4.ip4 mx=-1 sort=xx checking addresses for the.local.host.name Forward DNS security status: unverified ip4.ip4.ip4.ip4 OK -sender_fullhost = the.local.host.name [ip4.ip4.ip4.ip4] -sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4]) +sender_fullhost = the.local.host.name (test) [ip4.ip4.ip4.ip4] +sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4] helo=test) using host_fake_gethostbyname for cioce.test.again.dns (IPv4) DNS lookup of cioce.test.again.dns (A) using fakens DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN @@ -70,19 +76,19 @@ DNS: couldn't fake dnsa len DNS: no SOA record found for neg-TTL writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1 host_fake_gethostbyname(af=inet) returned 1 (HOST_NOT_FOUND) -no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4]) +no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4]) LOG: host_lookup_failed MAIN - no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4]) + no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4]) failed to find IP address for cioce.test.again.dns: item ignored by +ignore_unknown host in "+ignore_unknown : *.cioce.test.again.dns : cioce.test.again.dns : "? no (end of list) accept: condition test failed in ACL "rcpt" end of ACL "rcpt": implicit DENY SMTP>> 550 Administrative prohibition LOG: MAIN REJECT - H=the.local.host.name [ip4.ip4.ip4.ip4] F=<xx@cioce.test.again.dns> rejected RCPT <a@b> + H=the.local.host.name (test) [ip4.ip4.ip4.ip4] F=<xx@cioce.test.again.dns> rejected RCPT <a@b> SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4] closed by QUIT + SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2600 b/test/stderr/2600 index 74dab0a1d..c53a5ef8a 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -161,6 +161,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [10.0.0.0] +sender_rcvhost = [10.0.0.0] (helo=test) +set_process_info: pppp handling incoming connection from (test) [10.0.0.0] +SMTP>> 250 myhost.test.ex Hello test [10.0.0.0] SMTP<< mail from:<a@b> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -193,7 +199,7 @@ deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT - H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted + H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted SMTP<< rcpt to:<c@d> using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 32) @@ -223,11 +229,11 @@ deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT - H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted + H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -256,6 +262,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [10.0.0.0] +sender_rcvhost = [10.0.0.0] (helo=test) +set_process_info: pppp handling incoming connection from (test) [10.0.0.0] +SMTP>> 250 myhost.test.ex Hello test [10.0.0.0] SMTP<< mail from:<a@b> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -288,7 +300,7 @@ deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT - H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted + H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted SMTP<< rcpt to:<c@d> using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 32) @@ -318,11 +330,11 @@ deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT - H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted + H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -351,6 +363,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [10.10.10.10] +sender_rcvhost = [10.10.10.10] (helo=test) +set_process_info: pppp handling incoming connection from (test) [10.10.10.10] +SMTP>> 250 myhost.test.ex Hello test [10.10.10.10] SMTP<< mail from:<a@b> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -406,7 +424,7 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [10.10.10.10] closed by QUIT + SMTP connection from (test) [10.10.10.10] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... diff --git a/test/stderr/2610 b/test/stderr/2610 index c768cb321..fdda3b293 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -254,6 +254,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [10.0.0.0] +sender_rcvhost = [10.0.0.0] (helo=test) +set_process_info: pppp handling incoming connection from (test) [10.0.0.0] +SMTP>> 250 myhost.test.ex Hello test [10.0.0.0] SMTP<< mail from:<a@b> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -317,7 +323,7 @@ check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223 {select name lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted processing "warn" (TESTSUITE/test-config 36) check set acl_m0 = ok: hostlist check hosts = net-mysql;select * from them where id='$local_part' @@ -352,7 +358,7 @@ lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted host in "<& net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted processing "warn" (TESTSUITE/test-config 44) check set acl_m0 = FAIL: hostlist check hosts = <& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='$local_part' @@ -369,7 +375,7 @@ lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted host in "<& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted processing "accept" (TESTSUITE/test-config 47) check domains = +local_domains d in "@"? no (end of list) @@ -399,11 +405,11 @@ deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT - H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted + H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called close MYSQL connection: 127.0.0.1:1223/test/root >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2620 b/test/stderr/2620 index a13271156..620aa86b1 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -240,6 +240,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [10.0.0.0] +sender_rcvhost = [10.0.0.0] (helo=test) +set_process_info: pppp handling incoming connection from (test) [10.0.0.0] +SMTP>> 250 myhost.test.ex Hello test [10.0.0.0] SMTP<< mail from:<a@b> spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 @@ -273,7 +279,7 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers processing "warn" (TESTSUITE/test-config 38) check set acl_m0 = ok: hostlist check hosts = net-pgsql;select * from them where id='$local_part' @@ -308,7 +314,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers processing "warn" (TESTSUITE/test-config 46) check set acl_m0 = FAIL: hostlist check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part' @@ -325,7 +331,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers processing "accept" (TESTSUITE/test-config 49) check domains = +local_domains d in "@"? no (end of list) @@ -355,7 +361,7 @@ deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT - H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted + H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted SMTP<< rcpt to:<c@d> using ACL "check_recipient" processing "warn" (TESTSUITE/test-config 27) @@ -382,7 +388,7 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers processing "warn" (TESTSUITE/test-config 38) check set acl_m0 = ok: hostlist check hosts = net-pgsql;select * from them where id='$local_part' @@ -413,7 +419,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers processing "warn" (TESTSUITE/test-config 46) check set acl_m0 = FAIL: hostlist check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part' @@ -430,7 +436,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers processing "accept" (TESTSUITE/test-config 49) check domains = +local_domains d in "@"? no (end of list) @@ -456,11 +462,11 @@ deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT - H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted + H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called close PGSQL connection: localhost:1223/test/CALLER >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3202 b/test/stderr/3202 index 557a0da04..96d8d5fb7 100644 --- a/test/stderr/3202 +++ b/test/stderr/3202 @@ -6,12 +6,13 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_1_1_1" >>> processing "accept" (TESTSUITE/test-config 17) >>> check hosts = net-testdb;defer >>> host in "net-testdb;defer"? list match deferred for net-testdb;defer >>> accept: condition test deferred in ACL "acl_1_1_1" -LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER +LOG: H=(test) [1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -20,12 +21,13 @@ LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_1_1_2" >>> processing "deny" (TESTSUITE/test-config 20) >>> check domains = testdb;defer >>> y in "testdb;defer"? list match deferred for testdb;defer >>> deny: condition test deferred in ACL "acl_1_1_2" -LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER +LOG: H=(test) [1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -34,9 +36,10 @@ LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_1_1_3" >>> processing "require" (TESTSUITE/test-config 23) >>> check local_parts = testdb;defer >>> x in "testdb;defer"? list match deferred for testdb;defer >>> require: condition test deferred in ACL "acl_1_1_3" -LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER +LOG: H=(test) [1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER diff --git a/test/stderr/3204 b/test/stderr/3204 index e285f3d17..cd7db8f87 100644 --- a/test/stderr/3204 +++ b/test/stderr/3204 @@ -6,9 +6,10 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" (TESTSUITE/test-config 17) >>> check senders = testdb;defer >>> userx@somehost.example.com in "testdb;defer"? list match deferred for testdb;defer >>> deny: condition test deferred in ACL "check_recipient" -LOG: H=[1.2.3.4] F=<userx@somehost.example.com> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER +LOG: H=(test) [1.2.3.4] F=<userx@somehost.example.com> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER diff --git a/test/stderr/3205 b/test/stderr/3205 index 012f5aed4..6cc2e9c19 100644 --- a/test/stderr/3205 +++ b/test/stderr/3205 @@ -6,12 +6,13 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_1_2_3_4" >>> processing "deny" (TESTSUITE/test-config 17) >>> check senders = testdb;defer >>> userx@external.test.ex in "testdb;defer"? list match deferred for testdb;defer >>> deny: condition test deferred in ACL "acl_1_2_3_4" -LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER +LOG: H=(test) [1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -20,6 +21,7 @@ LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@tes >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_4_3_2_1" >>> processing "accept" (TESTSUITE/test-config 23) >>> check hosts = : @@ -29,4 +31,4 @@ LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@tes >>> check hosts = testdb;defer >>> host in "testdb;defer"? list match deferred for testdb;defer >>> deny: condition test deferred in ACL "acl_4_3_2_1" -LOG: H=[4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER +LOG: H=(test) [4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER diff --git a/test/stderr/3211 b/test/stderr/3211 index 2ae0bde59..37566d36a 100644 --- a/test/stderr/3211 +++ b/test/stderr/3211 @@ -6,6 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 17) >>> check verify = recipient @@ -21,7 +22,7 @@ >>> message: host lookup did not complete >>> ----------- end verify ------------ >>> accept: condition test deferred in ACL "check_recipient" -LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete +LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -30,6 +31,7 @@ LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.d >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 17) >>> check verify = recipient @@ -43,4 +45,4 @@ LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.d >>> message: host lookup did not complete >>> ----------- end verify ------------ >>> accept: condition test deferred in ACL "check_recipient" -LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete +LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete diff --git a/test/stderr/3400 b/test/stderr/3400 index e5ab777f1..bd048d486 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -14,6 +14,7 @@ >>> processing "accept" (TESTSUITE/test-config 34) >>> accept: condition test succeeded in ACL "check_connect" >>> end of ACL "check_connect": ACCEPT +>>> test in helo_lookup_domains? no (end of list) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" >>> processing "deny" (TESTSUITE/test-config 67) @@ -47,7 +48,7 @@ >>> test.ex in "! +local_domains"? no (matched "! +local_domains") >>> list in "userx"? no (end of list) >>> no more routers -LOG: ETRN #abcd received from [10.0.0.2] +LOG: ETRN #abcd received from (test) [10.0.0.2] >>> using ACL "check_etrn" >>> processing "deny" (TESTSUITE/test-config 53) >>> check hosts = +auth_hosts @@ -60,7 +61,7 @@ LOG: ETRN #abcd received from [10.0.0.2] >>> processing "warn" (TESTSUITE/test-config 57) >>> l_message: accepted ETRN $smtp_command_argument >>> warn: condition test succeeded in ACL "check_etrn" -LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd +LOG: H=(test) [10.0.0.2] Warning: accepted ETRN #abcd >>> processing "accept" (TESTSUITE/test-config 58) >>> accept: condition test succeeded in ACL "check_etrn" >>> end of ACL "check_etrn": ACCEPT diff --git a/test/stderr/3410 b/test/stderr/3410 index 80cf29925..a8470e93c 100644 --- a/test/stderr/3410 +++ b/test/stderr/3410 @@ -6,13 +6,15 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_5_6_9" >>> processing "accept" (TESTSUITE/test-config 19) >>> message: You must authenticate >>> check authenticated = * >>> accept: condition test failed in ACL "acl_5_6_9" >>> accept: endpass encountered - denying access -LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate +LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate +>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> rhu.barb in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") @@ -41,12 +43,14 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "acl_5_6_10" >>> processing "accept" (TESTSUITE/test-config 24) >>> check authenticated = auth1 >>> accept: condition test failed in ACL "acl_5_6_10" >>> end of ACL "acl_5_6_10": implicit DENY -LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y> +LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y> +>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> rhu.barb in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") diff --git a/test/stderr/5820 b/test/stderr/5820 index 7d3ee5627..f5dbbfa2a 100644 --- a/test/stderr/5820 +++ b/test/stderr/5820 @@ -9,6 +9,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 88) >>> check verify = recipient/callout >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -62,7 +63,7 @@ >>> ----------- end verify ------------ >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT -LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs +LOG: unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs ### TLSA (2 0 1) (DANE-TA CERT SHA2-256) ### A server with a nonverifying cert and no TLSA ### A server with a verifying cert and no TLSA diff --git a/test/stderr/5840 b/test/stderr/5840 index 8ece4e42b..633d7c693 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -9,6 +9,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> test in helo_lookup_domains? no (end of list) >>> processing "accept" (TESTSUITE/test-config 93) >>> check verify = recipient/callout >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -62,7 +63,7 @@ >>> ----------- end verify ------------ >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT -LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs +LOG: unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs ### TLSA (2 0 1) (DANE-TA CERT SHA2-256) ### TLSA (2 1 1) ### A server with a nonverifying cert and no TLSA |