Fix CVE-2016-1531

[exim.git] / test / confs / 0099

diff --git a/test/confs/0099 b/test/confs/0099
index e35ad5fcfbf89e54c76c1c6e5001a791244fc30d..b5cce9c69e914edc8faa4d0b70c0dfe5da629c01 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -1,8 +1,10 @@
 # Exim test configuration 0099
 
+RETRY =
+
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
@@ -13,16 +15,27 @@ gecos_name = CALLER_NAME
 primary_hostname = primary.test.ex
 qualify_domain = test.ex
 retry_data_expire = 2s
+log_selector = +received_recipients
 
 
 # ----- Routers -----
 
 begin routers
 
+bydns:
+  driver = dnslookup
+  domains = mxt2.test.ex
+  transport = smtp
+  fail_defer_domains = *
+
 all:
   driver = manualroute
-  route_list = "* 127.0.0.1 byname"
+  route_list = simple  thishost.test.ex  byname \
+            ; complex thisloop.test.ex  byname \
+            ; nonexist nonexist.test.ex byname \
+            ; *       127.0.0.1         byname
   self = send
+  host_find_failed = defer
   transport = smtp
 
 
@@ -33,6 +46,7 @@ begin transports
 smtp:
   driver = smtp
   port = 999
+  RETRY
 
 
 # ----- Retry -----
@@ -45,6 +59,7 @@ begin retry
 rcpt45x.test.ex              rcpt_45x      F,10d,2m
 rcpt463.test.ex              rcpt_463      F,10d,3m
 rcpt4xx.test.ex              rcpt_4xx      F,10d,1m
+*                            lookup        F,10d,30m
 
 *@\N^\d                      *             F,5d,1m
 *@*.abcd.ex                  *             F,5d,2m
@@ -54,6 +69,7 @@ rcpt4xx.test.ex              rcpt_4xx      F,10d,1m
 *@@                          *             F,5d,6m
 lsearch*@;DIR/aux-fixed/TESTNUM.rlist  *             F,1d,3m
 *.star.ex                    *             F,3d,10m
-*                            *             F,2d,15m
+!*.not.ex                    *             F,2d,15m
+*                            *             F,12d,150m
 
 # End