diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-01-16 22:17:33 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-01-16 23:20:24 +0000 |
| commit | 4f6ae5c314e5c3e462313f3b53c917f36b131bf4 (patch) | |
| tree | 1d46ff1a265a21c1a0ff3d795d95eb02b6989086 /test | |
| parent | fa01e4f81d44f68f0a92be34b687c05f2ddbc2e9 (diff) | |
VRFY: Permit an ACL to override the default 252 response, to support
verify-by-ACL instead of the more usual verify-by-routers. Bug 1769
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0041 | 5 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0041 | 1 | ||||
| -rw-r--r-- | test/stderr/0041 | 15 | ||||
| -rw-r--r-- | test/stdout/0041 | 1 |
4 files changed, 21 insertions, 1 deletions
diff --git a/test/confs/0041 b/test/confs/0041 index 51cba04ac..ec1067584 100644 --- a/test/confs/0041 +++ b/test/confs/0041 @@ -12,6 +12,7 @@ tls_advertise_hosts = domainlist local_domains = test.ex +acl_smtp_vrfy = check_vrfy acl_smtp_expn = check_expn qualify_domain = test.ex no_write_rejectlog @@ -21,6 +22,10 @@ no_write_rejectlog begin acl +check_vrfy: + deny local_parts = hardfail + message = 599 custom reject + check_expn: accept hosts = 2.2.2.2 diff --git a/test/scripts/0000-Basic/0041 b/test/scripts/0000-Basic/0041 index 5601d6506..3495375cb 100644 --- a/test/scripts/0000-Basic/0041 +++ b/test/scripts/0000-Basic/0041 @@ -1,6 +1,7 @@ # VRFY & EXPN blocking exim -bh 1.1.1.1 vrfy userx@test.ex +vrfy hardfail@test.ex expn postmaster quit **** diff --git a/test/stderr/0041 b/test/stderr/0041 index 4aacae883..b00305212 100644 --- a/test/stderr/0041 +++ b/test/stderr/0041 @@ -7,8 +7,21 @@ >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") ->>> ACL is NULL: implicit DENY +>>> using ACL "check_vrfy" +>>> processing "deny" +>>> check local_parts = hardfail +>>> userx in "hardfail"? no (end of list) +>>> deny: condition test failed in ACL "check_vrfy" +>>> end of ACL "check_vrfy": implicit DENY LOG: H=[1.1.1.1] rejected VRFY userx@test.ex +>>> using ACL "check_vrfy" +>>> processing "deny" +>>> check local_parts = hardfail +>>> hardfail in "hardfail"? yes (matched "hardfail") +>>> message: 599 custom reject +>>> deny: condition test succeeded in ACL "check_vrfy" +>>> end of ACL "check_vrfy": DENY +LOG: H=[1.1.1.1] rejected VRFY hardfail@test.ex: 599 custom reject >>> using ACL "check_expn" >>> processing "accept" >>> check hosts = 2.2.2.2 diff --git a/test/stdout/0041 b/test/stdout/0041 index d43b4501a..b88c93ac7 100644 --- a/test/stdout/0041 +++ b/test/stdout/0041 @@ -5,6 +5,7 @@ 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
252 Administrative prohibition
+599 custom reject
550 Administrative prohibition
221 the.local.host.name closing connection
|