LDAP: fix taint-check in server list walk. Bug 2646

[exim.git] / test / confs / 0099

diff --git a/test/confs/0099 b/test/confs/0099
index e54cf628c18d805bc6559b616b1f56fff8c79df2..6a59d5994dc6653b988a1c88d96d01e8b39a89bb 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -2,12 +2,8 @@
 
 RETRY =
 
 
 RETRY =
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -21,12 +17,20 @@ log_selector = +received_recipients
 
 begin routers
 
 
 begin routers
 

+bydns:
+  driver = dnslookup
+  domains = mxt2.test.ex : mxnonexist.test.ex
+  transport = smtp
+  fail_defer_domains = *
+

 all:
   driver = manualroute
   route_list = simple  thishost.test.ex  byname \
             ; complex thisloop.test.ex  byname \
 all:
   driver = manualroute
   route_list = simple  thishost.test.ex  byname \
             ; complex thisloop.test.ex  byname \

+            ; nonexist nonexist.test.ex byname \

             ; *       127.0.0.1         byname
   self = send
             ; *       127.0.0.1         byname
   self = send

+  host_find_failed = defer

   transport = smtp
 
 
   transport = smtp
 
 


@@ -36,7 +40,8 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

-  port = 999
+  port = PORT_N
+  hosts_try_fastopen = :

   RETRY
 
 
   RETRY
 
 


@@ -50,6 +55,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
 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
 
 *@\N^\d                      *             F,5d,1m
 *@*.abcd.ex                  *             F,5d,2m


@@ -59,7 +65,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,5d,6m
 lsearch*@;DIR/aux-fixed/TESTNUM.rlist  *             F,1d,3m
 *.star.ex                    *             F,3d,10m

-!*.not.ex                    *             F,2d,15m
+!*.not.ex                    *             F,2d,20m

 *                            *             F,12d,150m
 
 # End
 *                            *             F,12d,150m
 
 # End