Merge branch 'SMTPUTF8_1516'. Bug 1516

[users/jgh/exim.git] / test / confs / 0099

diff --git a/test/confs/0099 b/test/confs/0099
index ebd6e891592a5b746076ae79a4ae06fd702119c8..c4e1a8339a0845ac4f46fc920185b4c00bcaf231 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -1,8 +1,9 @@
 # Exim test configuration 0099
 
 # Exim test configuration 0099
 

+RETRY =
+

 exim_path = EXIM_PATH
 host_lookup_order = bydns
 exim_path = EXIM_PATH
 host_lookup_order = bydns

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""


@@ -13,16 +14,27 @@ gecos_name = CALLER_NAME
 primary_hostname = primary.test.ex
 qualify_domain = test.ex
 retry_data_expire = 2s
 primary_hostname = primary.test.ex
 qualify_domain = test.ex
 retry_data_expire = 2s

+log_selector = +received_recipients

 
 
 # ----- Routers -----
 
 begin routers
 
 
 
 # ----- Routers -----
 
 begin routers
 

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

 all:
   driver = manualroute
 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
   self = send

+  host_find_failed = defer

   transport = smtp
 
 
   transport = smtp
 
 


@@ -33,6 +45,7 @@ begin transports
 smtp:
   driver = smtp
   port = 999
 smtp:
   driver = smtp
   port = 999

+  RETRY

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----


@@ -45,6 +58,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