Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / dnszones-src / db.test.ex

diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex
index 8ac35367e55d5a899d1e285c6054ea141400bf56..843a35b090c8d01cc1a564ffad6c32749e6593f0 100644 (file)
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -1,5 +1,3 @@
-; $Cambridge: exim/test/dnszones-src/db.test.ex,v 1.4 2006/04/18 11:13:19 ph10 Exp $
-
 ; This is a testing zone file for use when testing DNS handling in Exim. This
 ; is a fake zone of no real use - hence no SOA record. The zone name is
 ; test.ex. This file is passed through the substitution mechanism before being
@@ -176,6 +174,11 @@ recurse.test.ex   A  V4NET.99.0.2
 
 20.12.11.V4NET.rbl4   A   127.0.0.6
 21.12.11.V4NET.rbl4   A   127.0.0.7
+22.12.11.V4NET.rbl4   A   127.0.0.128
+                      TXT "This is a test blacklisting4 message"
+
+22.12.11.V4NET.rbl5   A   127.0.0.1
+                      TXT "This is a test blacklisting5 message"
 
 1.13.13.V4NET.rbl     CNAME non-exist.test.ex.
 2.13.13.V4NET.rbl     A   127.0.0.1
@@ -307,6 +310,11 @@ mxt14        MX  4  ten-5-6.test.ex.
              MX  5  ten-5.test.ex.
              MX  6  ten-6.test.ex.
 
+; Non-local hosts with different precedence
+
+mxt15        MX 10  ten-1.test.ex.
+             MX 20  ten-2.test.ex.
+
 ; Large number of IP addresses at one MX value, and then some
 ; at another, to check that hosts_max_try tries the MX different
 ; values if it can.