diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-06-14 14:18:19 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-06-14 14:18:19 +0000 |
| commit | 93655c46a6d1c1931c50fe6e17fd711578d4f07e (patch) | |
| tree | 657156e172d33c9fa62f0a921cadbe908d6418bf /test | |
| parent | 2b85bce7b396f5bdcb873a9faef7d54ea33ce26f (diff) | |
Added $dnslist_matched.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0023 | 1 | ||||
| -rw-r--r-- | test/confs/0139 | 4 | ||||
| -rw-r--r-- | test/mail/0139.userx | 4 | ||||
| -rw-r--r-- | test/stderr/0139 | 4 | ||||
| -rw-r--r-- | test/stdout/0023 | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/test/confs/0023 b/test/confs/0023 index 17c88ff6a..4f79a87b5 100644 --- a/test/confs/0023 +++ b/test/confs/0023 @@ -156,6 +156,7 @@ acl_29_29_29: acl_30_30_30: deny message = domain=$dnslist_domain\n\ value=$dnslist_value\n\ + matched=$dnslist_matched\n\ text="$dnslist_text" dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain accept diff --git a/test/confs/0139 b/test/confs/0139 index 2f844b5f0..5327de987 100644 --- a/test/confs/0139 +++ b/test/confs/0139 @@ -41,9 +41,9 @@ check_mail: warn dnslists = rbl4.test.ex&0.0.0.6 warn dnslists = rbl4.test.ex&127.0.0.3 warn dnslists = rbl4.test.ex!&0.0.0.7 - add_header = DNSlist: $dnslist_domain $dnslist_text + add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched warn dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128 - add_header = DNSlist: $dnslist_domain $dnslist_text + add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched accept check_recipient: diff --git a/test/mail/0139.userx b/test/mail/0139.userx index f527841d2..cf8d04bff 100644 --- a/test/mail/0139.userx +++ b/test/mail/0139.userx @@ -7,8 +7,8 @@ Received: from [V4NET.11.12.22] (ident=CALLER) (envelope-from <postmaster@exim.test.ex>) id 10HmaX-0005vi-00 for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -DNSlist: rbl4.test.ex This is a test blacklisting4 message -DNSlist: rbl5.test.ex This is a test blacklisting5 message +DNSlist: rbl4.test.ex This is a test blacklisting4 message V4NET.11.12.22 +DNSlist: rbl5.test.ex This is a test blacklisting5 message V4NET.11.12.22 test data diff --git a/test/stderr/0139 b/test/stderr/0139 index 42ebd686d..00e8d2645 100644 --- a/test/stderr/0139 +++ b/test/stderr/0139 @@ -205,8 +205,8 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> using result of previous DNS lookup >>> 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 ->>> check add_header = DNSlist: $dnslist_domain $dnslist_text ->>> = DNSlist: rbl4.test.ex +>>> check add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched +>>> = DNSlist: rbl4.test.ex V4NET.11.12.20 >>> warn: condition test succeeded >>> processing "warn" >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128 diff --git a/test/stdout/0023 b/test/stdout/0023 index 266184af0..74ef7a0f6 100644 --- a/test/stdout/0023 +++ b/test/stdout/0023 @@ -322,6 +322,7 @@ 250 OK
550-domain=test.ex
550-value=V4NET.0.0.1
+550-matched=ten-1
550 text=""
250 Reset OK
250 OK
@@ -330,6 +331,7 @@ 250 OK
550-domain=test.ex
550-value=127.0.0.2
+550-matched=13.12.11.V4NET.rbl
550 text="This is a test blacklisting message"
221 myhost.test.ex closing connection
|