From 40394cc11a826278cef2e205313f9339ca90d16d Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 25 Mar 2018 16:42:34 +0100 Subject: Add non-mtp source info to ${authres } --- test/confs/0571 | 4 ++-- test/log/0571 | 1 + test/scripts/0000-Basic/0571 | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/confs/0571 b/test/confs/0571 index cf4881a0a..a818257f5 100644 --- a/test/confs/0571 +++ b/test/confs/0571 @@ -27,8 +27,8 @@ acl_not_smtp = ${if def:sender_address \ begin acl acl_29_29_29: - deny dnslists = test.ex/$sender_address_domain - accept + deny dnslists = test.ex/$sender_address_domain + accept logwrite = authresults: ${authresults {$primary_hostname}} acl_29_29_0: deny dnslists = test.ex diff --git a/test/log/0571 b/test/log/0571 index afae80f19..e402d75a0 100644 --- a/test/log/0571 +++ b/test/log/0571 @@ -1,4 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 F= rejected by non-SMTP ACL: cannot test auto-keyed dnslists condition in non-SMTP ACL 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL +1999-03-02 09:44:33 10HmaZ-0005vi-00 authresults: Authentication-Results: myhost.test.ex;\n local=pass (non-smtp, myhost.test.ex) u=CALLER 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= bill@29.29.29.com U=CALLER P=local S=sss diff --git a/test/scripts/0000-Basic/0571 b/test/scripts/0000-Basic/0571 index 3eab04cbf..f8422c8b9 100644 --- a/test/scripts/0000-Basic/0571 +++ b/test/scripts/0000-Basic/0571 @@ -6,7 +6,7 @@ should fail . **** # -exim -f bill@29.29.29.com -odq ok1@test.ex +exim -oMai CALLER -f bill@29.29.29.com -odq ok1@test.ex should pass . **** -- cgit v1.2.3