diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-10-02 14:03:09 +0100 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-10-02 14:05:32 +0100 |
commit | 3cc3f7625d68c169d47dadbefa74233e5fe7ed55 (patch) | |
tree | 6a1743962595a4d9dbad3172d2e92f7575478e41 /test/stderr | |
parent | f1d38a56d8aa122a13f84db36bd1db1ceb489454 (diff) |
Logging: connection_reject log selector should apply also to the connect acl
Diffstat (limited to 'test/stderr')
-rw-r--r-- | test/stderr/0002 | 4 | ||||
-rw-r--r-- | test/stderr/0314 | 12 | ||||
-rw-r--r-- | test/stderr/3201 | 4 |
3 files changed, 4 insertions, 16 deletions
diff --git a/test/stderr/0002 b/test/stderr/0002 index 317b4bd0a..e7c70cfbf 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -227,7 +227,7 @@ host in "< deny: condition test succeeded in ACL "connect1" end of ACL "connect1": DENY SMTP>> 550 Administrative prohibition -LOG: MAIN REJECT +LOG: connection_reject MAIN REJECT H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -271,7 +271,7 @@ host in "net-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? no (end of list) deny: condition test failed in ACL "connect2" end of ACL "connect2": implicit DENY SMTP>> 550 Administrative prohibition -LOG: MAIN REJECT +LOG: connection_reject MAIN REJECT H=[V4NET.0.0.2] rejected connection in "connect" ACL search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0314 b/test/stderr/0314 deleted file mode 100644 index e14297ea5..000000000 --- a/test/stderr/0314 +++ /dev/null @@ -1,12 +0,0 @@ ->>> host in hosts_connection_nolog? no (option unset) ->>> host in host_lookup? no (option unset) ->>> host in host_reject_connection? yes (matched "V4NET.0.0.1") -LOG: refused connection from [V4NET.0.0.1] (host_reject_connection) ->>> host in hosts_connection_nolog? no (option unset) ->>> host in host_lookup? no (option unset) ->>> host in host_reject_connection? no (end of list) ->>> host in sender_unqualified_hosts? no (option unset) ->>> host in recipient_unqualified_hosts? no (option unset) ->>> 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) diff --git a/test/stderr/3201 b/test/stderr/3201 index 096248f45..10fa6f937 100644 --- a/test/stderr/3201 +++ b/test/stderr/3201 @@ -36,7 +36,7 @@ host in "testdb;fail"? no (end of list) deny: condition test failed in ACL "connect1" end of ACL "connect1": implicit DENY SMTP>> 550 Administrative prohibition -LOG: MAIN REJECT +LOG: connection_reject MAIN REJECT H=[10.0.0.1] rejected connection in "connect" ACL search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -78,7 +78,7 @@ host in "net-testdb;fail"? no (end of list) deny: condition test failed in ACL "connect2" end of ACL "connect2": implicit DENY SMTP>> 550 Administrative prohibition -LOG: MAIN REJECT +LOG: connection_reject MAIN REJECT H=[10.0.0.2] rejected connection in "connect" ACL search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> |