Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / confs / 0461

diff --git a/test/confs/0461 b/test/confs/0461
index 3a890726508e12f7a08bd4332411ca963a1bdd6c..30abd50a9d3a5cd8dc4528c11fb33a47f2a6d33e 100644 (file)
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -2,15 +2,12 @@
 
 FALLBACK=fallback_hosts = 127.0.0.1
 ROUTE_DATA=V4NET.0.0.1
 
 FALLBACK=fallback_hosts = 127.0.0.1
 ROUTE_DATA=V4NET.0.0.1

+RETRY1=1s
+RETRY2=2s
+
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -53,8 +50,8 @@ t2:
 
 begin retry
 
 
 begin retry
 

-V4NET.0.0.1  * F,1s,1s
-V4NET.0.0.2  * F,1s,2s
+V4NET.0.0.1  * F,1s,RETRY1
+V4NET.0.0.2  * F,1s,RETRY2

 *            * F,1d,1s
 
 
 *            * F,1d,1s