testsuite: abstract out common conf settings

diff --git a/test/aux-var-src/std_conf_prefix b/test/aux-var-src/std_conf_prefix
new file mode 100644 (file)
index 0000000..2565c26
--- /dev/null
+++ b/test/aux-var-src/std_conf_prefix
@@ -0,0 +1,2 @@
+.include DIR/aux-var/tls_conf_prefix
+tls_advertise_hosts =

diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix
new file mode 100644 (file)
index 0000000..3beafd9
--- /dev/null
+++ b/test/aux-var-src/tls_conf_prefix
@@ -0,0 +1,13 @@
+exim_path = EXIM_PATH
+keep_environment =
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME

diff --git a/test/confs/0003 b/test/confs/0003
index ccf723761930ada922ee5ec0fa900066d5948e61..af93db7c6d7a5a8105296f9a6ab6bf5a121332d6 100644 (file)
--- a/test/confs/0003
+++ b/test/confs/0003
@@ -1,13 +1,7 @@
 # Exim test configuration 0003
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 acl_smtp_rcpt = check_recipient
 domainlist local_domains = test.ex

diff --git a/test/confs/0004 b/test/confs/0004
index 12cd8dba952effa8808f14ef031c31654f98987c..8ebec4d981b438cba1d1954d689c6bd03ce2cad0 100644 (file)
--- a/test/confs/0004
+++ b/test/confs/0004
@@ -1,13 +1,7 @@
 # Exim test configuration 0004
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 acl_smtp_rcpt = check_recipient
 domainlist local_domains = test.ex

diff --git a/test/confs/0005 b/test/confs/0005
index b503b81a512b4e05410d4ccee118bd98e9c71281..7c0689c1675945292129a9bbcdcd9c0bee167ea2 100644 (file)
--- a/test/confs/0005
+++ b/test/confs/0005
@@ -1,13 +1,7 @@
 # Exim test configuration 0005
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0006 b/test/confs/0006
index 4cd84a275286e062cd3bc04dc2d46b5c59e77bbc..c01a2fe2e7a4d463ebbf48cd2c406bd0639829b4 100644 (file)
--- a/test/confs/0006
+++ b/test/confs/0006
@@ -1,13 +1,7 @@
 # Exim test configuration 0006
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0007 b/test/confs/0007
index 910c5a7f0ff35a690feec70ad2965f716e76daac..05631cc3982e1312861110b54384c1f7f8169163 100644 (file)
--- a/test/confs/0007
+++ b/test/confs/0007
@@ -1,13 +1,7 @@
 # Exim test configuration 0007
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0008 b/test/confs/0008
index de228d31e1a17ecd6975436bc2910bf3617a5183..91db09111b530e4b82a42984fed03f49482ebdcd 100644 (file)
--- a/test/confs/0008
+++ b/test/confs/0008
@@ -1,13 +1,7 @@
 # Exim test configuration 0008
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0009 b/test/confs/0009
index 34dee6e0af71e5727753348dacdc82669a19733b..422fe3d1d2271a6815cf7d145e9c64d62a032439 100644 (file)
--- a/test/confs/0009
+++ b/test/confs/0009
@@ -1,13 +1,7 @@
 # Exim test configuration 0009
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0010 b/test/confs/0010
index 9bf862dd445d2545a059f297b3c91dd4b6d0e03a..39e3fcf88ec8428470c16e4e3822140a3a5e615e 100644 (file)
--- a/test/confs/0010
+++ b/test/confs/0010
@@ -1,13 +1,7 @@
 # Exim test configuration 0010
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0011 b/test/confs/0011
index f1aa77a5e65c5c421e924c03e0bc8ba844923ff6..f8c04763d927ff29737bb09005b3632193b6fe99 100644 (file)
--- a/test/confs/0011
+++ b/test/confs/0011
@@ -1,13 +1,7 @@
 # Exim test configuration 0011
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0012 b/test/confs/0012
index 7df08cb097c04ea69884375df41dfae00da42b16..b367e8992a92ea7273cc6e2775bdf56f517030fa 100644 (file)
--- a/test/confs/0012
+++ b/test/confs/0012
@@ -1,13 +1,7 @@
 # Exim test configuration 0012
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0013 b/test/confs/0013
index 61f0d579d7fc638e125fe7e4c8d05d16aefa8f8f..1b2cec88f8acf9bab2581abce51c014a6a0e0627 100644 (file)
--- a/test/confs/0013
+++ b/test/confs/0013
@@ -1,15 +1,9 @@
 # Exim test configuration 0013
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0014 b/test/confs/0014
index 7f15c410855f1891b0bff7d2e5ac6baf8efcbbbf..1fdd92d0c29c6087bc2aeaa46cd476aa1ee11304 100644 (file)
--- a/test/confs/0014
+++ b/test/confs/0014
@@ -1,14 +1,8 @@
 # Exim test configuration 0014
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0015 b/test/confs/0015
index 593c29555462c71a51ede82a1094ba9ce84d0d6b..c6fccd3162a19c829bfa14893264c55b8db388e7 100644 (file)
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -1,13 +1,7 @@
 # Exim test configuration 0015
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0016 b/test/confs/0016
index 7001b97749d3bb2dfb9369798ae2220cf06dee1e..4260c88be97859afb055fa2d60d73abc60684622 100644 (file)
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -1,13 +1,7 @@
 # Exim test configuration 0016
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0017 b/test/confs/0017
index 6e36a38ea3a0f2b87623c092735d29391c251cb7..74585c6892eede38a7764a28b18b069b162d8a95 100644 (file)
--- a/test/confs/0017
+++ b/test/confs/0017
@@ -1,13 +1,7 @@
 # Exim test configuration 0017
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0018 b/test/confs/0018
index 6fbfb4342263a0a85658974df476b4f3eefff878..4b85cf3d3bd2d98d259b4952f6b4b0529f66b639 100644 (file)
--- a/test/confs/0018
+++ b/test/confs/0018
@@ -1,13 +1,7 @@
 # Exim test configuration 0018
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0019 b/test/confs/0019
index 5757c1cf6870900b23b395b9e36832f8f8e1cd38..dbb303b6e4ef6b2d5536f247cba2401ead10cfe1 100644 (file)
--- a/test/confs/0019
+++ b/test/confs/0019
@@ -1,13 +1,7 @@
-# Exim test configuration 2409
+# Exim test configuration 0019
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0020 b/test/confs/0020
index 6672ccf2f6a5f7440a19ee60ddd9b95b699b533b..ce48c884c00b9bccb5812e040d9cd5b4a750df4b 100644 (file)
--- a/test/confs/0020
+++ b/test/confs/0020
@@ -1,14 +1,8 @@
 # Exim test configuration 0020
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0021 b/test/confs/0021
index c48c0e08e9680f641488e4e98066f343f3568f2d..6205eae631b3cc51338f53b7ffd58b4844c0751d 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -3,15 +3,9 @@
 SERVER=
 BR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0022 b/test/confs/0022
index 7a2742790dc4f4ddc0c6c837cd4235bf030e77f8..bd04442aa783bffb01dc27761566bfbd19b70ba2 100644 (file)
--- a/test/confs/0022
+++ b/test/confs/0022
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0023 b/test/confs/0023
index b59a52f92d7c37b39b509a0ddb44a9c4dac8f352..2481976ce09531ea3c38431ef8340392b09c3224 100644 (file)
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -2,15 +2,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0024 b/test/confs/0024
index ee60a322e8d886393dbea2991caa40ebd6b44be0..3dbbc2c258a464c2d2b13e130fa0fb02e898b56b 100644 (file)
--- a/test/confs/0024
+++ b/test/confs/0024
@@ -1,14 +1,8 @@
 # Exim test configuration 0024
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0025 b/test/confs/0025
index 6477950becb6ca6e30f05e76f94749fd6cadaf71..3ecc5dd6898a1b6377d1826ed0afd8162b24498b 100644 (file)
--- a/test/confs/0025
+++ b/test/confs/0025
@@ -1,14 +1,8 @@
 # Exim test configuration 0025
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0026 b/test/confs/0026
index 2b1763f87c8434073127c790f0bca622847a8900..07fa409760ef9f23067182fa4313b78530295fc5 100644 (file)
--- a/test/confs/0026
+++ b/test/confs/0026
@@ -1,14 +1,8 @@
 # Exim test configuration 0026
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0027 b/test/confs/0027
index f671831b0d0d793c8f3249d94bbf26e72a36ce61..9c775bd5d45351b43c6b982b6d8d55fd22d2635b 100644 (file)
--- a/test/confs/0027
+++ b/test/confs/0027
@@ -1,14 +1,8 @@
 # Exim test configuration 0027
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0028 b/test/confs/0028
index 6308f8358693962733925454af6715df6d1251ea..149d8eda8277ec2014676d66c8a7789ce20ce75d 100644 (file)
--- a/test/confs/0028
+++ b/test/confs/0028
@@ -1,14 +1,8 @@
 # Exim test configuration 0028
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0029 b/test/confs/0029
index d65cf1181a9d166c31dde670d11f74b3b4576493..09e77963fc034e7ae17396aeaf72f240b51d8f68 100644 (file)
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -1,14 +1,8 @@
 # Exim test configuration 0029
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0030 b/test/confs/0030
index 89ced1f25bcd4e73cf21e8c92c47fd9e6057434a..446a7ede8fcc92b740dc63df884429ccc62bd560 100644 (file)
--- a/test/confs/0030
+++ b/test/confs/0030
@@ -1,14 +1,8 @@
 # Exim test configuration 0030
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0031 b/test/confs/0031
index 2716b59cb1430ead5b8ea5183aee0e126d4431ef..e3f0360fc5cc85d8152fec3f1dd2f2746e0fd4ae 100644 (file)
--- a/test/confs/0031
+++ b/test/confs/0031
@@ -1,14 +1,8 @@
 # Exim test configuration 0031
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0032 b/test/confs/0032
index 8368f155a0cad422471693ecdc656188dea62f40..961cefadd8758c3fa58602629480a13734d577ea 100644 (file)
--- a/test/confs/0032
+++ b/test/confs/0032
@@ -1,14 +1,8 @@
 # Exim test configuration 0032
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0033 b/test/confs/0033
index 825126bb7d51272e48a8667c933e3dad5a568329..ca06da772d831cabea2daa4d6c6fae855f7868fe 100644 (file)
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -1,14 +1,8 @@
 # Exim test configuration 0033
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0034 b/test/confs/0034
index 8dbe9ea1d8884c159179dd9088179faacbd06561..8eb9dce69d0cd3f5817a3cba359cfa9e53bf2941 100644 (file)
--- a/test/confs/0034
+++ b/test/confs/0034
@@ -1,14 +1,8 @@
 # Exim test configuration 0034
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0035 b/test/confs/0035
index a8cd5c66a15754459f10182a145533e2c771fcaf..8d34269a2f2e67e81ac263b07905937a6abdd8b3 100644 (file)
--- a/test/confs/0035
+++ b/test/confs/0035
@@ -3,15 +3,9 @@
 SERVER=
 SUBMISSION_OPTIONS=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0036 b/test/confs/0036
index 7d54acbee203385ee5dd2e788ba8faabc2665ce3..48479c7876dbb2666ceddfda9fe8971c4ec0c953 100644 (file)
--- a/test/confs/0036
+++ b/test/confs/0036
@@ -2,15 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0037 b/test/confs/0037
index 56323db4bb5204eda7f688832f93c6a3c6932384..8ba94ded1defca8afaa6c131d541f16cdb940354 100644 (file)
--- a/test/confs/0037
+++ b/test/confs/0037
@@ -2,14 +2,8 @@
 
 FILTER_PREPEND_HOME=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0038 b/test/confs/0038
index b95b140b51c2499b8086ef0bb2ca5e1c0cf18af0..0ef9028f163792ec24af2dbf81a7b22da88c6eda 100644 (file)
--- a/test/confs/0038
+++ b/test/confs/0038
@@ -4,15 +4,9 @@ RRATELIMIT=0/1h/strict
 DRATELIMIT=0/1h/per_byte/strict
 ACLRCPT=check_rcpt
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0039 b/test/confs/0039
index 5ca25b2e4a509e9607c489b71161e18740b9d9f8..8ca8b1eeca3f851a244025a045f64e3f7cb0721d 100644 (file)
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -2,15 +2,9 @@
 
 QDG=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0040 b/test/confs/0040
index 88b63f1f79cc339ae772a0b237e841fdcc8af73f..35453a0dd3373d65c19e7dc89fb18a2129ab4fdf 100644 (file)
--- a/test/confs/0040
+++ b/test/confs/0040
@@ -1,13 +1,7 @@
 # Exim test configuration 0040
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0041 b/test/confs/0041
index e0b820fb2741eef445d2b2c44d239377f0209779..5157170f2cb70bd60d6441ce5c26950c52071569 100644 (file)
--- a/test/confs/0041
+++ b/test/confs/0041
@@ -1,13 +1,7 @@
 # Exim test configuration 0041
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0042 b/test/confs/0042
index a4a81bfbe9ac2df68c300f05b07266d034368ef5..14c8a963567fd51dd55ebc0c8710da3b4ac98d5e 100644 (file)
--- a/test/confs/0042
+++ b/test/confs/0042
@@ -1,13 +1,7 @@
 # Exim test configuration 0042
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0043 b/test/confs/0043
index 4db392cd13743d64d940d37dc00958ca3a428ba4..0bf3547c7192cde61fed8e8c7f82c2393f2e3cf0 100644 (file)
--- a/test/confs/0043
+++ b/test/confs/0043
@@ -1,13 +1,7 @@
 # Exim test configuration 0043
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0044 b/test/confs/0044
index 9e3f020c9d13318f0884e3f20bb1f5869976d109..e4db43db01662f6eecec92249c7d7f8e2979e3fc 100644 (file)
--- a/test/confs/0044
+++ b/test/confs/0044
@@ -1,13 +1,7 @@
 # Exim test configuration 0044
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0045 b/test/confs/0045
index f8caf1419fd3f1a9a034fe14c538af1e1c60184a..a59c8e2c11ff2a80d45b1b3584ceb2ef4b7ae752 100644 (file)
--- a/test/confs/0045
+++ b/test/confs/0045
@@ -1,13 +1,7 @@
 # Exim test configuration 0045
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0046 b/test/confs/0046
index 4e7ff862a4a97a044234d785ffebf4e1ea88d748..9fff3b91b92432986015610fd42fedf726a50a25 100644 (file)
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -2,14 +2,8 @@
 
 NL=FALSE
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0047 b/test/confs/0047
index 5e7d27d9707fb3017746a1ab03fb5e1f2ddb418d..187f855ef8c2008a77a5b428c495fcdce3495bca 100644 (file)
--- a/test/confs/0047
+++ b/test/confs/0047
@@ -1,13 +1,7 @@
 # Exim test configuration 0047
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0048 b/test/confs/0048
index 86560d587cf97a1bca9d66e69357025bb6540e19..9c2d4428fd904d8f31e2db61a6bc98ad0b90d36c 100644 (file)
--- a/test/confs/0048
+++ b/test/confs/0048
@@ -2,14 +2,8 @@
 
 MESSAGE_LOGS = true
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0049 b/test/confs/0049
index 0de91eeed23bdb41ab8395d3bd9bb24b66b7c508..a00dde1f52b438633c92787d8e7004f5fff9922e 100644 (file)
--- a/test/confs/0049
+++ b/test/confs/0049
@@ -1,14 +1,8 @@
 # Exim test configuration 0049
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0050 b/test/confs/0050
index f709ad674831d67bf5b4dc340940f90c4965dd73..32a822a9b06c212ce9caa727ce0f843e29342d1f 100644 (file)
--- a/test/confs/0050
+++ b/test/confs/0050
@@ -1,15 +1,9 @@
 # Exim test configuration 0050
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0051 b/test/confs/0051
index 34016ab81f3b557bcb90deb86103b47b93d63028..2fde9e5572355981a41a8277e3e37b9945568ea9 100644 (file)
--- a/test/confs/0051
+++ b/test/confs/0051
@@ -1,15 +1,9 @@
 # Exim test configuration 0051
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0052 b/test/confs/0052
index 2e2c13133c49cbab9286c7b32bfc7b63b74bbb3b..2af555ccae3a35dbbefba5ee81c9945e6874a22b 100644 (file)
--- a/test/confs/0052
+++ b/test/confs/0052
@@ -1,15 +1,9 @@
 # Exim test configuration 0052
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0053 b/test/confs/0053
index 16702ffeb7aabce5ba3d8b2e630b4ea2e919d03f..04263a59f85f4dac1eb7ae1d8f87600e7170ba77 100644 (file)
--- a/test/confs/0053
+++ b/test/confs/0053
@@ -1,15 +1,9 @@
 # Exim test configuration 0053
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0054 b/test/confs/0054
index ee63ec24bb4aea6bcdd37e8a410f9a071cda63c7..3ad8751572a12c02b753ab0c7abd4d5e8efa6cce 100644 (file)
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -1,15 +1,9 @@
 # Exim test configuration 0054
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0055 b/test/confs/0055
index ce1b22514daf74b9e2b0df07d9807a38db1e9882..72a2be7402b7ddf9ceb2c0c3a81f7fd855146275 100644 (file)
--- a/test/confs/0055
+++ b/test/confs/0055
@@ -1,14 +1,8 @@
 # Exim test configuration 0055
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0056 b/test/confs/0056
index 299448369e780de3e07c0b1dabe703df2a664bf0..1678e206323f74ede066dbb276a885396191fa5d 100644 (file)
--- a/test/confs/0056
+++ b/test/confs/0056
@@ -1,14 +1,8 @@
 # Exim test configuration 0056
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0057 b/test/confs/0057
index f2bc88f8a2acbae47050eb1ad47137ed0da73922..db09830adef8e0958d071406b394ec7f73634b97 100644 (file)
--- a/test/confs/0057
+++ b/test/confs/0057
@@ -1,14 +1,8 @@
 # Exim test configuration 0057
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0058 b/test/confs/0058
index 2b15f6290a27fb68f4992dae5ecd467efec9520a..2b52453a0934a8496ffaeb99883f1ca468f3c1c2 100644 (file)
--- a/test/confs/0058
+++ b/test/confs/0058
@@ -1,14 +1,8 @@
 # Exim test configuration 0058
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0059 b/test/confs/0059
index f591bf6b350bede8e0fad9fde8757174ebe55809..40e877be8188e596d8b524c8a281953a44c12e74 100644 (file)
--- a/test/confs/0059
+++ b/test/confs/0059
@@ -1,14 +1,8 @@
 # Exim test configuration 0059
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0060 b/test/confs/0060
index 8ce8d1012d474ff0829fce7c7665a2eb5187c996..6ff220906a5b03a1479f56bffd7d32f7e661db8e 100644 (file)
--- a/test/confs/0060
+++ b/test/confs/0060
@@ -1,14 +1,8 @@
 # Exim test configuration 0060
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0061 b/test/confs/0061
index 70d21834e257a237d740a708dec51a958669c73b..07c85e4a9c7e9164b5bd29e74c64f59b8a2aa959 100644 (file)
--- a/test/confs/0061
+++ b/test/confs/0061
@@ -1,14 +1,8 @@
 # Exim test configuration 0061
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = ten-1.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0062 b/test/confs/0062
index 7e64746554d44e43512b0120c0aa5699d137408c..b5d47c862b764be7af5aee4a31762916199dccb3 100644 (file)
--- a/test/confs/0062
+++ b/test/confs/0062
@@ -1,14 +1,8 @@
 # Exim test configuration 0062
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0063 b/test/confs/0063
index be66b1a3fcdbcef9bd0530d91a2838e67d97e97d..b297ec01172af12f847ef5dbf10f4497dd9b68bc 100644 (file)
--- a/test/confs/0063
+++ b/test/confs/0063
@@ -1,14 +1,8 @@
 # Exim test configuration 0063
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0064 b/test/confs/0064
index 4feaed25d0c81da54a75f4ff433db83c36a4ef69..f0d9e9618d5af3838506fd7901242656b2eb282b 100644 (file)
--- a/test/confs/0064
+++ b/test/confs/0064
@@ -1,14 +1,8 @@
 # Exim test configuration 0064
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0065 b/test/confs/0065
index 7d08f964090073e3d3b54dffd0ca59bef54d67a4..fb01f377267e627821e27ba4908ac4f809a961c2 100644 (file)
--- a/test/confs/0065
+++ b/test/confs/0065
@@ -1,14 +1,8 @@
 # Exim test configuration 0065
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0066 b/test/confs/0066
index 959b878e3e7ae45f44241f94407e1245aa67a213..dcf3bcffc65c72b78f3c95fe29c8832a32397f99 100644 (file)
--- a/test/confs/0066
+++ b/test/confs/0066
@@ -1,14 +1,8 @@
 # Exim test configuration 0066
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0067 b/test/confs/0067
index ac2af9c198283a22636efe71a290ff309798cd27..35bd3b24c31aba7e897d95b92187dd0cb77e9b5e 100644 (file)
--- a/test/confs/0067
+++ b/test/confs/0067
@@ -1,14 +1,8 @@
 # Exim test configuration 0067
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0068 b/test/confs/0068
index 2de360fbdee56d567dac4eaaf2f3f4fc5818961b..f8078fdf3848c10950d8a818b291d60600aebd4a 100644 (file)
--- a/test/confs/0068
+++ b/test/confs/0068
@@ -1,13 +1,7 @@
 # Exim test configuration 0068
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0069 b/test/confs/0069
index 23685e40ec0b25ca592453050c01b0634fc589c4..ca81da915b8308de8e002b6b8367d7e07ad34729 100644 (file)
--- a/test/confs/0069
+++ b/test/confs/0069
@@ -2,15 +2,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0070 b/test/confs/0070
index 4ffe3668ca63ffd5c992e3235e7603edfa4122ec..9ef3b2ad825fbfd2fd16dc9860188cc03d871e45 100644 (file)
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -2,15 +2,9 @@
 
 HVH=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0071 b/test/confs/0071
index e18ab0bbfb04c37c19c80df75642c60c7fe9cf67..d7ab2ff5d624713177c77234da5487a6084e7453 100644 (file)
--- a/test/confs/0071
+++ b/test/confs/0071
@@ -1,13 +1,7 @@
 # Exim test configuration 0071
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0072 b/test/confs/0072
index 94c4dcbe5cc71557b58b992f219d4b2d12b75ad9..9bb73984d6cd90aa58c62725f935cc313641a5d1 100644 (file)
--- a/test/confs/0072
+++ b/test/confs/0072
@@ -4,14 +4,8 @@ ONCE=once=DIR/spool/autolog
 ONLY=
 RETURN=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0073 b/test/confs/0073
index f6c18247dedc321b4f47a37ea7a7b7b98ff61971..da716efb6b94548839b33a30757ed335caffa4a6 100644 (file)
--- a/test/confs/0073
+++ b/test/confs/0073
@@ -1,13 +1,7 @@
 # Exim test configuration 0073
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0074 b/test/confs/0074
index ab300745540cdd183bee66b15a5ea61540c5cf89..3102206b0b4476c3bdd02cfc0e0bb66125223d09 100644 (file)
--- a/test/confs/0074
+++ b/test/confs/0074
@@ -1,13 +1,7 @@
 # Exim test configuration 0074
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0075 b/test/confs/0075
index cb9d472ff4fba1d38c30a11385dc28bbe686485b..8b8c77ca6783f4ff275f46987389bc7624be73af 100644 (file)
--- a/test/confs/0075
+++ b/test/confs/0075
@@ -1,13 +1,7 @@
 # Exim test configuration 0075
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0076 b/test/confs/0076
index bd3863cf784f72f7a498681277e87356419d8170..1415280f9def6bbf27ddb37c5749d36455dc7678 100644 (file)
--- a/test/confs/0076
+++ b/test/confs/0076
@@ -1,13 +1,7 @@
 # Exim test configuration 0076
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0077 b/test/confs/0077
index b2138536e06bee37ca042ae83b0bd3330b9316d0..564554e3924539ae22c416d170f82af5e4627465 100644 (file)
--- a/test/confs/0077
+++ b/test/confs/0077
@@ -1,14 +1,8 @@
 # Exim test configuration 0077
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0078 b/test/confs/0078
index 1be361abdd3b35f5aeb4b4530b2cb54a9bce5b6b..aa1e445f358963735644ac26a4dee310c6dd5584 100644 (file)
--- a/test/confs/0078
+++ b/test/confs/0078
@@ -1,14 +1,8 @@
 # Exim test configuration 0078
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0079 b/test/confs/0079
index f9be0824403f55a95bb0aa84cf8ba0203e7150cd..25ef65879c5d2f6afbc77b96554f7b17944e3554 100644 (file)
--- a/test/confs/0079
+++ b/test/confs/0079
@@ -1,13 +1,7 @@
 # Exim test configuration 0079
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0080 b/test/confs/0080
index 4bc2e3a3b5b227cf0dd131936259f694bdfe792d..fbe026c262dc338015621b6b01be7c4347347c6d 100644 (file)
--- a/test/confs/0080
+++ b/test/confs/0080
@@ -1,13 +1,7 @@
 # Exim test configuration 0080
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0081 b/test/confs/0081
index 4e2f4949e14469a04d08494acd0b6f7a4c262e9f..f403728c3c4b28a9f93e56258df7be5ab945aa34 100644 (file)
--- a/test/confs/0081
+++ b/test/confs/0081
@@ -1,13 +1,7 @@
 # Exim test configuration 0081
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0082 b/test/confs/0082
index b4bfc76934dc400ef1f2ea2eafdc8f43d377f81b..29ff8d15cafa3ded3d4c954c79db0c715c57cced 100644 (file)
--- a/test/confs/0082
+++ b/test/confs/0082
@@ -1,13 +1,7 @@
 # Exim test configuration 0082
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0083 b/test/confs/0083
index 37c7bac2e4153587fd4dfbc32c872ae9abf4aa9c..fcae1f5d1bef283ce5af7c7ec608f91b61738602 100644 (file)
--- a/test/confs/0083
+++ b/test/confs/0083
@@ -1,13 +1,7 @@
 # Exim test configuration 0083
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0084 b/test/confs/0084
index b4530996f59bdc59fbd7a79bd8e9d2fff37440a2..94e386e02434bc656ef7c7858a49a81b6fefb345 100644 (file)
--- a/test/confs/0084
+++ b/test/confs/0084
@@ -1,14 +1,8 @@
 # Exim test configuration 0084
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0085 b/test/confs/0085
index 0a74e159131aa6835903ad698da716b9dc8574c2..25eea9e903f0bb65b8fb094448f1f7fc2f2c1b05 100644 (file)
--- a/test/confs/0085
+++ b/test/confs/0085
@@ -1,14 +1,8 @@
 # Exim test configuration 0085
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0086 b/test/confs/0086
index 256cc6047ff2d481eaeaf6db0100cad156d360a6..a0a29b62d6ca7f572f95214524be6eac3a9bba70 100644 (file)
--- a/test/confs/0086
+++ b/test/confs/0086
@@ -1,14 +1,8 @@
 # Exim test configuration 0086
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0087 b/test/confs/0087
index f59143e3f473ee9a6b08ec030d2c941ef301f264..8141edb98ba2dfd5ad33275a9948dafe2985b473 100644 (file)
--- a/test/confs/0087
+++ b/test/confs/0087
@@ -1,14 +1,8 @@
 # Exim test configuration 0087
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0088 b/test/confs/0088
index 0c1d5884ebef7c612bc7c28ef0022f02d75c8e82..054944d95a9e9c7a671d8c21eec6623a30fb9a99 100644 (file)
--- a/test/confs/0088
+++ b/test/confs/0088
@@ -1,14 +1,8 @@
 # Exim test configuration 0088
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0089 b/test/confs/0089
index ccb0283e21eb945605f395af1873b314817b680a..b8bd142dbebc1fee02a36a590209cc3e3c14631e 100644 (file)
--- a/test/confs/0089
+++ b/test/confs/0089
@@ -1,14 +1,8 @@
 # Exim test configuration 0089
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0090 b/test/confs/0090
index 3612e8aa88e9da9f595d120b1285ce9c1a00c872..907d275440575b411bc0ede0d730a21e74df0e0f 100644 (file)
--- a/test/confs/0090
+++ b/test/confs/0090
@@ -1,14 +1,8 @@
 # Exim test configuration 0090
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0091 b/test/confs/0091
index 3dcc12b0a9b86624df27560872a16d842e8029e5..2ef91af8f80e35b0d8a4fbd699a4bab345b7a690 100644 (file)
--- a/test/confs/0091
+++ b/test/confs/0091
@@ -1,14 +1,8 @@
 # Exim test configuration 0091
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0092 b/test/confs/0092
index 8497dc0442db6fde82a367711c7ab6bda03aa63d..e5cdf119a9bb48054d8b6a5629100d9aa949285d 100644 (file)
--- a/test/confs/0092
+++ b/test/confs/0092
@@ -7,15 +7,9 @@ domainlist local_domains = test.ex : *.test.ex
 
 domainlist relay_domains = test.ex
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0093 b/test/confs/0093
index 0cdc58b38b2c183225e6f0fa4f6f126a53bb9f5d..2ed0a520742a46f0d4fae7341e545e0485988307 100644 (file)
--- a/test/confs/0093
+++ b/test/confs/0093
@@ -1,13 +1,7 @@
 # Exim test configuration 0093
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0094 b/test/confs/0094
index b586dc4341a1144349b784cce55426661dd99a4f..04c9d80789997d17a36808ca99440cba3f50344f 100644 (file)
--- a/test/confs/0094
+++ b/test/confs/0094
@@ -1,13 +1,7 @@
 # Exim test configuration 0094
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0095 b/test/confs/0095
index fb79c9d289206413f1def7ca4744da50de0878a2..c20b06d7cc100c257bdd7f8d93e26b2aeaee55a9 100644 (file)
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -3,15 +3,9 @@
 ERT=
 QWM=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0096 b/test/confs/0096
index 5ef2ec20e202adf62b2af243978a52e5edc4722c..ff5f5cebc1dff8e7fcbef31d838fe0846f56f371 100644 (file)
--- a/test/confs/0096
+++ b/test/confs/0096
@@ -1,13 +1,7 @@
 # Exim test configuration 0096
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0097 b/test/confs/0097
index 2ad1b5e1fb3d8dbcad0fe2492c4a6586fe1ad57d..0841952bf1cefb1d1c9ce5bec8f44766411ddac2 100644 (file)
--- a/test/confs/0097
+++ b/test/confs/0097
@@ -1,13 +1,7 @@
 # Exim test configuration 0097
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0098 b/test/confs/0098
index 60402deaf362a4a8c18d5f233bcc553dd383bef4..465c2310aea7b831c8b8fa6e77c607939f984b03 100644 (file)
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -2,14 +2,8 @@
 
 WMF=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0099 b/test/confs/0099
index 122856ce7a9d6de1e2a5e62da3f234fe0caaa16a..8db58dcb0c90c3116b703806cadb12ae5b0d47b7 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -2,14 +2,8 @@
 
 RETRY =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0100 b/test/confs/0100
index 55cd947b5a3167d4b1d16911798a2128b891bf26..c404d5a73f663c2bd5db8b7b36735ba89f2cd97a 100644 (file)
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -1,13 +1,7 @@
 # Exim test configuration 0100
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0101 b/test/confs/0101
index 05832fb45122cafbde2eef9c4068b54e902f63b3..377eae705246c33d505d1b080ebff7821f2cad1b 100644 (file)
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -1,13 +1,7 @@
 # Exim test configuration 0101
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0102 b/test/confs/0102
index ac33f72f443135d12956687179dda24dffbdcf47..dde11a5e9e84aa600f23778723c7fd2dee0b2315 100644 (file)
--- a/test/confs/0102
+++ b/test/confs/0102
@@ -1,13 +1,7 @@
 # Exim test configuration 0102
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0103 b/test/confs/0103
index 9d40134e7b4412447c856473637d608892243062..9a136c7bc0979b7c9137eb5668df3cdadccc2124 100644 (file)
--- a/test/confs/0103
+++ b/test/confs/0103
@@ -1,13 +1,7 @@
 # Exim test configuration 0103
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0104 b/test/confs/0104
index 6101f0c1cd1ca89a19ff21e8a4dc3eb533006394..de0889adb41e7a7bc5b66f7dce5e60431bcb0381 100644 (file)
--- a/test/confs/0104
+++ b/test/confs/0104
@@ -1,13 +1,7 @@
 # Exim test configuration 0104
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0105 b/test/confs/0105
index a6763313fdebd490e6fe0c6f07862028ece16061..1b954f4605e824a86c9f9589e3000637226a7ee8 100644 (file)
--- a/test/confs/0105
+++ b/test/confs/0105
@@ -1,13 +1,7 @@
 # Exim test configuration 0105
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0106 b/test/confs/0106
index 52130ede0a000f189f42878884cc4bf96e83dfb1..ef91e8b106deeb52ef7ebea72e1990369fb3ab2d 100644 (file)
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -1,14 +1,8 @@
 # Exim test configuration 0106
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0107 b/test/confs/0107
index 06e7b83ae734ce26c517d100c74e4db962116995..9bbb7e7a3b2fc4fefa065ad74332690e76700677 100644 (file)
--- a/test/confs/0107
+++ b/test/confs/0107
@@ -1,13 +1,7 @@
 # Exim test configuration 0107
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0108 b/test/confs/0108
index 37c53de6e8a765f0cb961391deb84ee18d1c208f..a4ee442e2428c872cc9ebf5f31065310b4706d49 100644 (file)
--- a/test/confs/0108
+++ b/test/confs/0108
@@ -1,13 +1,7 @@
 # Exim test configuration 0108
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0109 b/test/confs/0109
index 38401bdb9b66c9d683c230bfb14536ea67c7ed01..59957b96b319a3d230230e92d67ff7cd12758176 100644 (file)
--- a/test/confs/0109
+++ b/test/confs/0109
@@ -1,13 +1,7 @@
 # Exim test configuration 0109
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0110 b/test/confs/0110
index d8fb4a9e7aab81e1962bbdf5d0a5a7fb93fa0488..361c12fb40f5549b904d172f69492e989b556aa9 100644 (file)
--- a/test/confs/0110
+++ b/test/confs/0110
@@ -1,13 +1,7 @@
 # Exim test configuration 0110
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0111 b/test/confs/0111
index 377a9a0626bbb703d4daf4e385d2a251008e84ff..61fc9a887f8ad9bbd174609f3f40385cd2487f9d 100644 (file)
--- a/test/confs/0111
+++ b/test/confs/0111
@@ -1,13 +1,7 @@
 # Exim test configuration 0111
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0112 b/test/confs/0112
index bb133227f883d46898d340d3492bdd8147c1e92a..06e436abb6efcf2dcf12eb87d40106a5968e1ceb 100644 (file)
--- a/test/confs/0112
+++ b/test/confs/0112
@@ -1,13 +1,7 @@
 # Exim test configuration 0112
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0113 b/test/confs/0113
index a24c029b588473e6856c6e16fc198302b6a04d77..1fd61009fce35b00b0f47e7efb70325656e9184a 100644 (file)
--- a/test/confs/0113
+++ b/test/confs/0113
@@ -1,13 +1,7 @@
 # Exim test configuration 0113
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0114 b/test/confs/0114
index acaf05c03e6a1337b8afe8de226cee06064744e7..d5a60bb004062c83249c10343ea1fe81499ad1d7 100644 (file)
--- a/test/confs/0114
+++ b/test/confs/0114
@@ -1,13 +1,7 @@
 # Exim test configuration 0114
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0115 b/test/confs/0115
index ad4d469a168e181227544a204f4fc87d3d7eafb6..799112f08c8dd323536b6940168faf1dbf4f2e27 100644 (file)
--- a/test/confs/0115
+++ b/test/confs/0115
@@ -1,13 +1,7 @@
 # Exim test configuration 0115
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0116 b/test/confs/0116
index da70ac0e51fb26b50c429b78cc43fe3c7b54a3f8..313d32c6301c0fb8b69aad0792ca62dda1f2caf4 100644 (file)
--- a/test/confs/0116
+++ b/test/confs/0116
@@ -1,13 +1,7 @@
 # Exim test configuration 0116
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0117 b/test/confs/0117
index f0bcd89f30b9f837d54b92d636a3a19eaa81109f..5a266d32bd25b026c7817ab808a9bcb5350986c3 100644 (file)
--- a/test/confs/0117
+++ b/test/confs/0117
@@ -1,13 +1,7 @@
 # Exim test configuration 0117
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0118 b/test/confs/0118
index 0223df01f69fead49a4a64fa09dd28ea357ccbc2..cf8838f32a2bc9fc992d66bb8a389f179388844e 100644 (file)
--- a/test/confs/0118
+++ b/test/confs/0118
@@ -1,13 +1,7 @@
 # Exim test configuration 0118
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0119 b/test/confs/0119
index 74cd7ae2c5b0f48688061b23d1ee5203cc0874ef..4514635e5d9d7aa30ad3badf3f701a0c8274b6e3 100644 (file)
--- a/test/confs/0119
+++ b/test/confs/0119
@@ -1,13 +1,7 @@
 # Exim test configuration 0119
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0120 b/test/confs/0120
index ddba4d32de2054da6195c01173f942b0c43c6af4..95a5b3e8ae5a9dbc6a0c50233eb59cc09f5cf590 100644 (file)
--- a/test/confs/0120
+++ b/test/confs/0120
@@ -1,13 +1,7 @@
 # Exim test configuration 0120
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0121 b/test/confs/0121
index 3d5e8472149eac76cbe12851e5a3dec7841e8019..ca2d338a1e82b25dc42f939445886c9fd1c4dafa 100644 (file)
--- a/test/confs/0121
+++ b/test/confs/0121
@@ -1,13 +1,7 @@
 # Exim test configuration 0121
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0122 b/test/confs/0122
index bec8032f7d79f3302b4b7314961f0edd12c9280b..3fec1235d4d552a79d9c6fe0c3b17f3549b445ed 100644 (file)
--- a/test/confs/0122
+++ b/test/confs/0122
@@ -1,13 +1,7 @@
 # Exim test configuration 0122
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0123 b/test/confs/0123
index 250ac1d168d8b8408a4f48770e45c43fb91f9cee..6eae763a148e64940a05844d3a5c3c97876e5935 100644 (file)
--- a/test/confs/0123
+++ b/test/confs/0123
@@ -1,13 +1,7 @@
 # Exim test configuration 0123
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0124 b/test/confs/0124
index 5cc80384170dbbed040e390deb4a57996adca93c..da81a998a5dad90064ff4e200de6155a810a4b85 100644 (file)
--- a/test/confs/0124
+++ b/test/confs/0124
@@ -1,13 +1,7 @@
 # Exim test configuration 0124
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0125 b/test/confs/0125
index 9bc55c728ea820a81b2b0aad955dae03ac6556d6..69fe2d6747d90525e84df5f5bf1512aaa689c728 100644 (file)
--- a/test/confs/0125
+++ b/test/confs/0125
@@ -1,13 +1,7 @@
 # Exim test configuration 0125
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0126 b/test/confs/0126
index 8a8474aa3a679718d96ec3ba5f791e7b5117cb7c..5370606080e8e9890a33b10746301d0aac28b4c3 100644 (file)
--- a/test/confs/0126
+++ b/test/confs/0126
@@ -1,14 +1,8 @@
 # Exim test configuration 0126
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0127 b/test/confs/0127
index 33c72e35208766b3518a37a2b6e0dd3aa2f2c046..1906bb430376f5da0369ec6970a5003e816d3f31 100644 (file)
--- a/test/confs/0127
+++ b/test/confs/0127
@@ -1,14 +1,8 @@
 # Exim test configuration 0127
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0128 b/test/confs/0128
index d0e8cc4c42c2a1ea249fbc13367b024117dbb52c..9acfb5e9ddcd16cb001b1ff9c20ff692a502c1bd 100644 (file)
--- a/test/confs/0128
+++ b/test/confs/0128
@@ -1,13 +1,7 @@
 # Exim test configuration 0128
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0129 b/test/confs/0129
index 378a6b9042d06bbf523a22428c25e71d6e82921d..c91b02587093bc13d726f00e3f0bf5a0de2fd940 100644 (file)
--- a/test/confs/0129
+++ b/test/confs/0129
@@ -1,13 +1,7 @@
 # Exim test configuration 0129
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0130 b/test/confs/0130
index 5871fc75f5eb1b488a7d67f0dee2ef520cac9153..02a095358d849d0bb211c7856244467657254483 100644 (file)
--- a/test/confs/0130
+++ b/test/confs/0130
@@ -1,13 +1,7 @@
 # Exim test configuration 0130
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0131 b/test/confs/0131
index 4ca5af5f4cfc0037daf6b20f7c01566a4bdcacfe..c55813e7734c2d2c862a18c9d01c720c9dc68ea2 100644 (file)
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -1,13 +1,7 @@
 # Exim test configuration 0131
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0132 b/test/confs/0132
index 50bce7969c7f94f580577c0f901d3518a86d969f..83bbb3608f12682fc15a3e52e07e880757690427 100644 (file)
--- a/test/confs/0132
+++ b/test/confs/0132
@@ -1,13 +1,7 @@
 # Exim test configuration 0132
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0133 b/test/confs/0133
index 7150db724c446affac2e4cc80755f935a992cc47..bc4e6283f5370b6464bd9e7ecb2d56269d1d151c 100644 (file)
--- a/test/confs/0133
+++ b/test/confs/0133
@@ -1,13 +1,7 @@
 # Exim test configuration 0133
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0134 b/test/confs/0134
index c8f8227b01ba807a664965dfc93398faf7247c30..9530df65273942117c2e4ccd3550015717d39afc 100644 (file)
--- a/test/confs/0134
+++ b/test/confs/0134
@@ -1,13 +1,7 @@
 # Exim test configuration 0134
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0135 b/test/confs/0135
index 913373d8aaaac64869573e6d271c9fed3cf05755..2c62f04732f5c72341cd74aabf83d27ed9f67bf6 100644 (file)
--- a/test/confs/0135
+++ b/test/confs/0135
@@ -1,13 +1,7 @@
 # Exim test configuration 0135
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0136 b/test/confs/0136
index c6bd5f557ccec7555c930da5a1a677750cc23fb1..efc73c58d09de49cb65dc024422eb65065bdc725 100644 (file)
--- a/test/confs/0136
+++ b/test/confs/0136
@@ -2,14 +2,8 @@
 
 BRB=true
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0137 b/test/confs/0137
index b36a701c2dd93910b2c01c83581112137bc76d0e..1a2094ef372227b7de9108bbb32399032cfc66d2 100644 (file)
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -1,13 +1,7 @@
 # Exim test configuration 0137
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0138 b/test/confs/0138
index 9de30ce7dfd63c673fd9332beb1afbb9b82cd993..66539d6b049649db734605eaf14299e195bc715d 100644 (file)
--- a/test/confs/0138
+++ b/test/confs/0138
@@ -1,13 +1,7 @@
 # Exim test configuration 0138
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0139 b/test/confs/0139
index b1a243e425fe7aab74dc117ff254ef97eff239f6..eb3990c7281c54c2430ef748435d265e87e26c9a 100644 (file)
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -1,13 +1,7 @@
 # Exim test configuration 0139
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0140 b/test/confs/0140
index 8ab406add3d940d9be9207c7ce84023e29a9bd48..fbc64b43bccb531d7ab2c6a836c161af7ec1cfb1 100644 (file)
--- a/test/confs/0140
+++ b/test/confs/0140
@@ -1,13 +1,7 @@
 # Exim test configuration 0140
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0141 b/test/confs/0141
index ddb05cd663f6bccdaf681a8085ab2d02859f6a55..96f6ef1122aafed24bce6827679fc74219b0d8e4 100644 (file)
--- a/test/confs/0141
+++ b/test/confs/0141
@@ -1,13 +1,7 @@
 # Exim test configuration 0141
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0142 b/test/confs/0142
index 2e25d4438fcdc077a6cc065a2e58e2a8d39da33b..748e76b8baa6bd5d3209756835a80147fbda6dcb 100644 (file)
--- a/test/confs/0142
+++ b/test/confs/0142
@@ -1,13 +1,7 @@
 # Exim test configuration 0142
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0143 b/test/confs/0143
index a6dfbb61f8ae0361a0db694d21db5ee963ae690c..5a6ee34a956a2a1cc351fcc25c3c9993167400b7 100644 (file)
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -1,14 +1,8 @@
 # Exim test configuration 0143
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0144 b/test/confs/0144
index 3c5c4d03578dedf7d43f1015bc1468393a494122..34b38230f88919c2398092da98f17bb8ffff386e 100644 (file)
--- a/test/confs/0144
+++ b/test/confs/0144
@@ -1,15 +1,9 @@
 # Exim test configuration 0144
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0145 b/test/confs/0145
index f4f96590d835ff056569cd41027ec645334ab960..16b02a8582bb6301978f92ad626fe6f804feb6da 100644 (file)
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -1,15 +1,9 @@
 # Exim test configuration 0145
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0146 b/test/confs/0146
index a0f8a4c404ae4f6a9027e10a0cb3471066802e9d..d8b6067e765e81fbd42ce304d739e8b4ee2e931d 100644 (file)
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -1,15 +1,9 @@
 # Exim test configuration 0146
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0147 b/test/confs/0147
index bf78500f4fe874d656ba2da929af1987e54d6370..996d064be0848515b550179db5ee6a0731e06216 100644 (file)
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -6,16 +6,10 @@ x#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ABCD_XYZ = abcdxyz
 ABCD=abcd + ABCD_XYZ
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0148 b/test/confs/0148
index a01bbf26aa9fcc133d9986b8889091e2037d7991..ea31cddbe67b55eb2a1ddfb523858da2964df047 100644 (file)
--- a/test/confs/0148
+++ b/test/confs/0148
@@ -1,15 +1,9 @@
 # Exim test configuration 0148
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0149 b/test/confs/0149
index 30c35b40054f03a6d0c3b033d909e3530904b912..60c742acf90d3048efe76d9f5d4799b4f6fd7b7a 100644 (file)
--- a/test/confs/0149
+++ b/test/confs/0149
@@ -1,15 +1,9 @@
 # Exim test configuration 0149
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0150 b/test/confs/0150
index 818f1a28b1d35cf86a5e5ed0886b1a93e3428173..dd421a12513ff5f1eb4618d36b3646cd839f9531 100644 (file)
--- a/test/confs/0150
+++ b/test/confs/0150
@@ -1,13 +1,7 @@
 # Exim test configuration 0150
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0151 b/test/confs/0151
index 5c8565e2ef14b94dba33c69fadc9ad2df1fac5a0..d5d17865410c17f0ea34be95df73731b08b7723f 100644 (file)
--- a/test/confs/0151
+++ b/test/confs/0151
@@ -1,13 +1,7 @@
 # Exim test configuration 0151
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0152 b/test/confs/0152
index f8ca251044f85422344f452a3979a0cf460b04fa..7671d52ed3455937d7edaaedf90895dbd5f3acb5 100644 (file)
--- a/test/confs/0152
+++ b/test/confs/0152
@@ -1,13 +1,7 @@
 # Exim test configuration 0152
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0153 b/test/confs/0153
index 171d6f5ac47001e229c2967802a5a4f029ed8be5..c16f88fe95a98f0f58b7f4896350ed4b74c6bc9d 100644 (file)
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -1,13 +1,7 @@
 # Exim test configuration 0153
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0154 b/test/confs/0154
index 3e9006eaa4d23b3fac10f83b9649c16643086c68..bc5ffb89989413321358b753d48a5a70b3fbd442 100644 (file)
--- a/test/confs/0154
+++ b/test/confs/0154
@@ -1,13 +1,7 @@
 # Exim test configuration 0154
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0155 b/test/confs/0155
index 3fe4bb3c6ec0f074c36841b2891242c914f2c8b4..a85ebe5d79c6c9f473a038b1537e530f50e0fe69 100644 (file)
--- a/test/confs/0155
+++ b/test/confs/0155
@@ -1,13 +1,7 @@
 # Exim test configuration 0155
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0156 b/test/confs/0156
index e718552d602e5b4d1239035c19095464a01183b0..d1faa7514fc5b1109c874cadc8820808d973c91c 100644 (file)
--- a/test/confs/0156
+++ b/test/confs/0156
@@ -1,13 +1,7 @@
 # Exim test configuration 0156
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0157 b/test/confs/0157
index 674ed171e873b7b8b7fe520ac9b4475e386078a0..1589f82edcec3efc090162d34c491d881d0de425 100644 (file)
--- a/test/confs/0157
+++ b/test/confs/0157
@@ -1,13 +1,7 @@
 # Exim test configuration 0157
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0158 b/test/confs/0158
index e9001bc278e9fbf2bb79f2ea42f059d15303e796..ccd261e5602dfc3bb87bb06caf00b4e57830ac1e 100644 (file)
--- a/test/confs/0158
+++ b/test/confs/0158
@@ -1,13 +1,7 @@
 # Exim test configuration 0158
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0159 b/test/confs/0159
index d5eb44a7baa88d55f3a5c15d34c56f648df8d24b..e648d9304fe5e00052d981d529fb17de873c3485 100644 (file)
--- a/test/confs/0159
+++ b/test/confs/0159
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0160 b/test/confs/0160
index f1ab669d0f9c5d2e6aaa87c169666b2df683a5f3..f6488372916fa5875f3906d627f206cd91a06943 100644 (file)
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -1,14 +1,8 @@
 # Exim test configuration 0160
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0161 b/test/confs/0161
index 3a5626ad9eaacead6a10938179521996f77be1ae..8b91ea053435adede9429458c08925b841669fcc 100644 (file)
--- a/test/confs/0161
+++ b/test/confs/0161
@@ -1,14 +1,8 @@
 # Exim test configuration 0161
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0162 b/test/confs/0162
index d62d8a1c9e17fb37ad20789f7466d5688b635016..0ec376230acb0774ec1933512d40c370f2139572 100644 (file)
--- a/test/confs/0162
+++ b/test/confs/0162
@@ -1,14 +1,8 @@
 # Exim test configuration 0162
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0163 b/test/confs/0163
index 923968659bd723166177bc31043601033fec9259..7b19d9f16b43c523a50241bf6b45c9d1d78258c0 100644 (file)
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -1,14 +1,8 @@
 # Exim test configuration 0163
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0164 b/test/confs/0164
index c81cc617e2c5cdaa06f1cb6aa01075a6b01709e1..6d94efdfd386f98f3f0300c1a13b48c791af73df 100644 (file)
--- a/test/confs/0164
+++ b/test/confs/0164
@@ -1,13 +1,7 @@
 # Exim test configuration 0164
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0165 b/test/confs/0165
index dd9ec9ff148946316cd9577cc5fcde931c1637d9..03e9a825e1279b451c3f2436c5edbce4c07e4370 100644 (file)
--- a/test/confs/0165
+++ b/test/confs/0165
@@ -1,13 +1,7 @@
 # Exim test configuration 0165
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0166 b/test/confs/0166
index 85a75fe9ed2a1fffafbf547e30719219fc5e970a..93489dc56baaefef9c56361d5dd98b8a55b67bf5 100644 (file)
--- a/test/confs/0166
+++ b/test/confs/0166
@@ -1,13 +1,7 @@
 # Exim test configuration 0166
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0167 b/test/confs/0167
index 06b857efc35b7d1d0e5be3a39b7269203f2f928e..a65b9ed65d8851af22fa2073f0bf2d0741f984da 100644 (file)
--- a/test/confs/0167
+++ b/test/confs/0167
@@ -1,13 +1,7 @@
 # Exim test configuration 0167
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0168 b/test/confs/0168
index a16aa98138b4deca731e0b408c35e8de04fec253..196b8e60c331ecb382a96aac304867f849945560 100644 (file)
--- a/test/confs/0168
+++ b/test/confs/0168
@@ -1,13 +1,7 @@
 # Exim test configuration 0168
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0169 b/test/confs/0169
index db212a2e5dfecfa68f8b538d3ceea0ff5e2d4a4f..beafec56d7e886866ad1010fef51de2422e9491c 100644 (file)
--- a/test/confs/0169
+++ b/test/confs/0169
@@ -1,14 +1,8 @@
 # Exim test configuration 0169
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0170 b/test/confs/0170
index 227acdbf2645869a7c175fecb9dc9ce8c5cdff00..5e25e24d813ffa6f7e0ba461c07d69348f5baa93 100644 (file)
--- a/test/confs/0170
+++ b/test/confs/0170
@@ -1,14 +1,8 @@
 # Exim test configuration 0170
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0171 b/test/confs/0171
index 37f4b5c917cf4c7e16c00a0d6d871f1d3d6569b1..fe4fc2c158939251deba247dabdccd27453989a1 100644 (file)
--- a/test/confs/0171
+++ b/test/confs/0171
@@ -1,13 +1,7 @@
 # Exim test configuration 0171
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0172 b/test/confs/0172
index 96567f25e2c40f0d8034bce82ebcd0525ae8e4f1..9dcc42f811071efcb4586ac625b729c55850229c 100644 (file)
--- a/test/confs/0172
+++ b/test/confs/0172
@@ -1,13 +1,7 @@
 # Exim test configuration 0172
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0173 b/test/confs/0173
index 7fd9179dd2839bbb79d8ebafed851bbc1c67cf4a..1b423e152b57ebe1c637178abcc14e1ec8e4e477 100644 (file)
--- a/test/confs/0173
+++ b/test/confs/0173
@@ -1,13 +1,7 @@
 # Exim test configuration 0173
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0174 b/test/confs/0174
index ece486e34a53c85813df682c52eb267c6d326409..b7fe882e2c4e0cb2cce85bf8f7d413ff0dfe3714 100644 (file)
--- a/test/confs/0174
+++ b/test/confs/0174
@@ -1,13 +1,7 @@
 # Exim test configuration 0174
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0175 b/test/confs/0175
index 838a0736dfd4700913a6f46be1bd9013b594dbf0..b20e4fe1a2d67532bd9382d2b85f2862b09f13b0 100644 (file)
--- a/test/confs/0175
+++ b/test/confs/0175
@@ -1,13 +1,7 @@
 # Exim test configuration 0175
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0176 b/test/confs/0176
index 2b76446f46f305ab05fee139a763f3c198af72e4..81d0b5ddf5705725461e72a2003aa4e43172abd3 100644 (file)
--- a/test/confs/0176
+++ b/test/confs/0176
@@ -1,13 +1,7 @@
 # Exim test configuration 0176
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0177 b/test/confs/0177
index 3bc3ab0248037b166b6b7f88655b3edeaabc9e6c..7921a8b55d4e8600975c19fe14900a9e6df8a5f3 100644 (file)
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -1,13 +1,7 @@
 # Exim test configuration 0177
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0178 b/test/confs/0178
index e931379304b502a52261e1fa1a49148422a2244b..bdabf6afad18acfd2fa9c246716d2f4fd4700dd4 100644 (file)
--- a/test/confs/0178
+++ b/test/confs/0178
@@ -1,13 +1,7 @@
 # Exim test configuration 0178
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0179 b/test/confs/0179
index 14539bec4369f7e99edc500ac9245df6e86a1adb..fdd5fb10c5039ce00dd91c9b6d5731060bb537c3 100644 (file)
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -1,14 +1,8 @@
 # Exim test configuration 0179
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0180 b/test/confs/0180
index 29014f7e9717f0236464257f28d3addcfa2c3c6d..dd47db6a319991c4536578a587c8bac0063a79ed 100644 (file)
--- a/test/confs/0180
+++ b/test/confs/0180
@@ -2,15 +2,9 @@
 
 CSS=check_spool_space=100000000K
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0181 b/test/confs/0181
index 5e1624a3285bce63bd26be72864c62f3f6d85ec4..f00a9b28a506d191ad2ede38af65c434b503b442 100644 (file)
--- a/test/confs/0181
+++ b/test/confs/0181
@@ -1,14 +1,8 @@
 # Exim test configuration 0181
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0182 b/test/confs/0182
index ed75a6ca87da865b55d99b9d14ba6a72bfe279a1..17d60789c6ea42554d3ec5613f886c73a57b3a51 100644 (file)
--- a/test/confs/0182
+++ b/test/confs/0182
@@ -1,14 +1,8 @@
 # Exim test configuration 0182
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0183 b/test/confs/0183
index 6ca0ed027c35239e2f1e9c8abdb8ac036127e89d..6699237a2123a5b24cf696e0771fc991dcdc7747 100644 (file)
--- a/test/confs/0183
+++ b/test/confs/0183
@@ -1,14 +1,8 @@
 # Exim test configuration 0183
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0184 b/test/confs/0184
index 95aaa14f2d47be2719bab328bf7f6c7521deca0f..9e15a48955f6bc8327b77cd3154b93f94c1e7169 100644 (file)
--- a/test/confs/0184
+++ b/test/confs/0184
@@ -1,13 +1,7 @@
 # Exim test configuration 0184
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0185 b/test/confs/0185
index b17f72a977904afd2a3ba401d6f8112e310b24fb..d6e9fe0203e87f92edf1394608abd77319db9b7f 100644 (file)
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -1,13 +1,7 @@
 # Exim test configuration 0185
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0186 b/test/confs/0186
index 8e88ab1094e0cea7967070e2f20bd9240d0c1297..21b31060cc746960417692f75f8b30e884e3c22a 100644 (file)
--- a/test/confs/0186
+++ b/test/confs/0186
@@ -1,13 +1,7 @@
 # Exim test configuration 0186
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0187 b/test/confs/0187
index 6731b6230712a0da20fa5c3121532bcd125f0eaa..bca41b5f71fe515cbcdd014cd0a26b4ea9f1425d 100644 (file)
--- a/test/confs/0187
+++ b/test/confs/0187
@@ -1,13 +1,7 @@
 # Exim test configuration 0187
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0188 b/test/confs/0188
index 2385462ef2d11cb2ab59730dce6ad6cd4cdde518..d94506ef5a454d3f5f1668765bcddf110f8f6e0e 100644 (file)
--- a/test/confs/0188
+++ b/test/confs/0188
@@ -1,13 +1,7 @@
 # Exim test configuration 0188
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0189 b/test/confs/0189
index 28831d622059334a6828c913b6fba0d4b6c147c4..5d12465b3d0a2771761c847a5e0d61f8af2590e5 100644 (file)
--- a/test/confs/0189
+++ b/test/confs/0189
@@ -1,14 +1,8 @@
 # Exim test configuration 0189
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0190 b/test/confs/0190
index fb4fdc90c0bcf0231e366f01faba6e67196a9149..03ded9ce22be8fefff17b555540432580b38d212 100644 (file)
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -1,13 +1,7 @@
 # Exim test configuration 0190
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0191 b/test/confs/0191
index 04597e5aec69e204aae55a4154aabb350106e14e..9dba8c35d02b7b4762245272b5a0789c5827fc37 100644 (file)
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -1,13 +1,7 @@
 # Exim test configuration 0191
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0192 b/test/confs/0192
index da0a6ffa71c3ecb2e812354847a96ed0aeed6e3a..d7bd3c1b167458f00f91cb429cf35e5311346bf4 100644 (file)
--- a/test/confs/0192
+++ b/test/confs/0192
@@ -1,14 +1,8 @@
 # Exim test configuration 0192
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0193 b/test/confs/0193
index dbc7ef62feb14c7c8d912e5f5c066c55c26f49af..4dbb06679ceaa29ed6893dff9cfa0512b6650aec 100644 (file)
--- a/test/confs/0193
+++ b/test/confs/0193
@@ -1,14 +1,8 @@
 # Exim test configuration 0193
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0194 b/test/confs/0194
index 548a9154532d7e39947bdc771521cd7cc5e5d1fc..d813d9290af8e75aa1407636bcc61d342b0f32f6 100644 (file)
--- a/test/confs/0194
+++ b/test/confs/0194
@@ -1,14 +1,8 @@
 # Exim test configuration 0194
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0195 b/test/confs/0195
index 4b479e6011106c9a08f10b9a77b3bd7f1fc04a94..2d51bebfa20b19c95b51c309cf96c7f7480de6d8 100644 (file)
--- a/test/confs/0195
+++ b/test/confs/0195
@@ -1,14 +1,8 @@
 # Exim test configuration 0195
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0196 b/test/confs/0196
index 73a71142f5bd1ad43207e62b2a0ef40e090de56a..38a83914418a7779f5fa525d2114d977baa60740 100644 (file)
--- a/test/confs/0196
+++ b/test/confs/0196
@@ -1,14 +1,8 @@
 # Exim test configuration 0196
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0197 b/test/confs/0197
index 0ed172695f0662669c273fbdb1c6444d6e8008cc..b3f25c4c063cde52aba1c623713372b594e9f2e0 100644 (file)
--- a/test/confs/0197
+++ b/test/confs/0197
@@ -3,14 +3,8 @@
 # Remove connection timeout when copying for real use,
 # and these settings.
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 queue_run_in_order
 trusted_users = CALLER

diff --git a/test/confs/0198 b/test/confs/0198
index 4cdb86a2e6c65fdb17b0dd9ddbc8e0d8fcab2717..f754a31878b1d7af08e157c9c422b79b1b0898f0 100644 (file)
--- a/test/confs/0198
+++ b/test/confs/0198
@@ -1,13 +1,7 @@
 # Exim test configuration 0198
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 queue_run_in_order
 trusted_users = CALLER
 

diff --git a/test/confs/0199 b/test/confs/0199
index 17437ef63b29467a5da5a456ee459c209d3bfe99..8b0e760f597ed855e3412a4840ec3df34a97d06b 100644 (file)
--- a/test/confs/0199
+++ b/test/confs/0199
@@ -1,14 +1,8 @@
 # Exim test configuration 0199
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0200 b/test/confs/0200
index 1c6e9f675d1c22339b5812e91e36336421306c2a..ab50f36dfbf1280fa1c35732cd7399669ee9bfb7 100644 (file)
--- a/test/confs/0200
+++ b/test/confs/0200
@@ -1,14 +1,8 @@
 # Exim test configuration 0200
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0201 b/test/confs/0201
index 1575bcd9c12de51a6a8eec0a02451f14e563de7b..5385baa9a0f206c4506ffb60cde9435434ab27b8 100644 (file)
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -1,14 +1,8 @@
 # Exim test configuration 0201
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0202 b/test/confs/0202
index f7a51edd43574d8ae07f7312f7bc7f1f5f1461bf..dc68127ae13a9a71a2543c9dbb76f8bdbebc43b5 100644 (file)
--- a/test/confs/0202
+++ b/test/confs/0202
@@ -1,13 +1,7 @@
 # Exim test configuration 0202
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0203 b/test/confs/0203
index 2dc3d279087efd586dc3cd02fbd4b46fc556307a..38e879010a0ca11bbea708b88a77313d8a23c187 100644 (file)
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -1,13 +1,7 @@
 # Exim test configuration 0203
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0204 b/test/confs/0204
index e5792de54bc985948e84ca302c6b71edec3c7759..138dbe0a12b1c57a08983ac53279d9ba0e66bf68 100644 (file)
--- a/test/confs/0204
+++ b/test/confs/0204
@@ -1,14 +1,8 @@
 # Exim test configuration 0204
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0205 b/test/confs/0205
index 60c943e2c6cea89e2e177e4b49c77cac71c1f6d9..069e8503347d22a92997cb41eee167ff3370bb1a 100644 (file)
--- a/test/confs/0205
+++ b/test/confs/0205
@@ -1,14 +1,8 @@
 # Exim test configuration 0205
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0206 b/test/confs/0206
index f6fc540e2b716c94ded8d941a95572879d351d2b..628d2ec4d57f0ac4e6d5182e634708c7ff7f4c3e 100644 (file)
--- a/test/confs/0206
+++ b/test/confs/0206
@@ -1,14 +1,8 @@
 # Exim test configuration 0206
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0207 b/test/confs/0207
index 9a7d5bfa944a289e8ddff305c965992c7a757229..eed3e25655ded16ab7cacf30ecdaaef20dd4bbb2 100644 (file)
--- a/test/confs/0207
+++ b/test/confs/0207
@@ -1,14 +1,8 @@
 # Exim test configuration 0207
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0208 b/test/confs/0208
index 8d74eabfc3d453b82fa2b0177e419aea50cec849..5a0b9f1532218064f76517183b6c3568a6c68c5f 100644 (file)
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -2,15 +2,9 @@
 
 MESSAGE_LOGS = true
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0209 b/test/confs/0209
index e24138956b682b892461a29af423779997a6b8f1..82046c7bc025e93c13bb53701d06c092b3559446 100644 (file)
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -1,13 +1,7 @@
 # Exim test configuration 0209
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0210 b/test/confs/0210
index 33306388f3331bef0236a3264a51a493835c9a5b..b1db52218267d9eca028803a25f6e705e37256ff 100644 (file)
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -1,13 +1,7 @@
 # Exim test configuration 0210
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0211 b/test/confs/0211
index 5a86785dda7170a56d3142b54b76ac131270d821..96f3beac19c333913dbb16b52e1b5ab8de19f977 100644 (file)
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -1,13 +1,7 @@
 # Exim test configuration 0211
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0212 b/test/confs/0212
index feea115339cd6291a246ab8a08b222b301727e3c..39db8c80096bcbab4450e5123a47d562e67d566a 100644 (file)
--- a/test/confs/0212
+++ b/test/confs/0212
@@ -1,13 +1,7 @@
 # Exim test configuration 0212
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0213 b/test/confs/0213
index 71c716faf0fa4758f253971756034f80f7f55420..ba0b9e403bc41724b437a0e0640a0c755dc3fe23 100644 (file)
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -1,13 +1,7 @@
 # Exim test configuration 0213
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0214 b/test/confs/0214
index 6ba026d02aea49f298e89d4525838ba41dff399f..0e97c0ba6ebc5710641880aa553179641208de91 100644 (file)
--- a/test/confs/0214
+++ b/test/confs/0214
@@ -1,14 +1,8 @@
 # Exim test configuration 0214
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0215 b/test/confs/0215
index 075b2b54c117498829db65a21e0cb160e854f344..ad40d6338f62898633e3ca652ed5854bfe7986cc 100644 (file)
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -4,15 +4,9 @@ IGNORE_QUOTA=false
 AUTHS=
 AUTHF=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0216 b/test/confs/0216
index 253e001e1cef32e244b82909faf58ad1a504fb81..01e1dd8019db9783f84a9a0599b6614e8ce849a5 100644 (file)
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0217 b/test/confs/0217
index 44dce1345ba54b41e1aad3e8a67c925e84bd6ebf..0b3abb71d976f6cfb9fec7a7aaf1dc195edc4201 100644 (file)
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -2,15 +2,9 @@
 
 HAP=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0218 b/test/confs/0218
index fae18f0e13b7f7e14efb9945ea0bc74e97e563db..b5cb57691f6f4fd867b126e4b48abcffde04a8ce 100644 (file)
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -1,14 +1,8 @@
 # Exim test configuration 0218
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0219 b/test/confs/0219
index 9a44a46b003a6f7a7ec7cd30367745142814e053..edf8f4abfb57cf231ad6a23aecd12c2d048e32c3 100644 (file)
--- a/test/confs/0219
+++ b/test/confs/0219
@@ -1,14 +1,8 @@
 # Exim test configuration 0219
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0220 b/test/confs/0220
index 0c21b5af61c2e6b12bf118cc1d33d052bc9eceaa..36cf87223f30b64cf965aca7c89a616047560663 100644 (file)
--- a/test/confs/0220
+++ b/test/confs/0220
@@ -1,14 +1,8 @@
 # Exim test configuration 0220
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0221 b/test/confs/0221
index f9584d18edec88f7d92697bfd4994c095e26b671..f7855a678cd1d132b3f598ee343b0e03baa0ab94 100644 (file)
--- a/test/confs/0221
+++ b/test/confs/0221
@@ -1,14 +1,8 @@
 # Exim test configuration 0221
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0222 b/test/confs/0222
index 00eddf642fff7b4a88e6fe10d4818070287e0dd1..e69bbb3d02367657b809aaeb13ee7c754590e88d 100644 (file)
--- a/test/confs/0222
+++ b/test/confs/0222
@@ -1,14 +1,8 @@
 # Exim test configuration 0222
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0223 b/test/confs/0223
index 7747a8716452a967df944a7f97a0aff672aac459..e42df517ec6b11cf57648974c5506dd302a2e860 100644 (file)
--- a/test/confs/0223
+++ b/test/confs/0223
@@ -1,13 +1,7 @@
 # Exim test configuration 0223
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0224 b/test/confs/0224
index 377bd5a2374d76851b3af9439531b50da66a5666..d1c425b4710842b1d22169df9d1fbcae6da54e28 100644 (file)
--- a/test/confs/0224
+++ b/test/confs/0224
@@ -1,13 +1,7 @@
 # Exim test configuration 0224
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0225 b/test/confs/0225
index 9d4e4abf2e5b732293bcfcc74c49045085df154b..3139eea5b446274b7a79e68dd3d2781bf5fb83b4 100644 (file)
--- a/test/confs/0225
+++ b/test/confs/0225
@@ -1,13 +1,7 @@
 # Exim test configuration 0225
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0226 b/test/confs/0226
index 5d56c6e9d0f62375308a3c14ed1689457f4ba196..0b6eeff74678a16a890956cb860f72f433e6ea66 100644 (file)
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -1,13 +1,7 @@
 # Exim test configuration 0226
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0227 b/test/confs/0227
index 7100f6a15f128db3772f2a0f0c018758b425f851..1ca729551da2362b6a8db1244cfe38c440e73825 100644 (file)
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -1,14 +1,8 @@
 # Exim test configuration 0227
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0228 b/test/confs/0228
index 3bbd157f26ba1c005cebee9a64ba7ba59f7342e1..19f6cb7cd6f37c74699f584310d7f604f06afd85 100644 (file)
--- a/test/confs/0228
+++ b/test/confs/0228
@@ -1,14 +1,8 @@
 # Exim test configuration 0228
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0229 b/test/confs/0229
index b6ddcc192ea85c9d95fdf6ce50e1638f430a432b..5389f97bce57d93e4e02275e5b873e53ae628613 100644 (file)
--- a/test/confs/0229
+++ b/test/confs/0229
@@ -1,14 +1,8 @@
 # Exim test configuration 0229
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0230 b/test/confs/0230
index 7e0480b2299caee5fbba66dfb8d8ccdc36400893..d9cecf3d4656025525720a7d605829624fca2de2 100644 (file)
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0231 b/test/confs/0231
index 7350256a92ea5a757ecf602dffbfd95ddf5c2f25..d0adf39077fb32ccd8573cba0ac4fa00dea95f10 100644 (file)
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -1,14 +1,8 @@
 # Exim test configuration 0231
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0232 b/test/confs/0232
index 03989bf02424fd108a97e8a5dab46eb5cd0319af..59e1ae918dc8fc2a7e22d3b6a1275adc0a7da127 100644 (file)
--- a/test/confs/0232
+++ b/test/confs/0232
@@ -1,14 +1,8 @@
 # Exim test configuration 0232
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0233 b/test/confs/0233
index 95d0ef1aa149c68e448530c2c52380835531b686..77dcca3b2982855122bd01b53173b210bcf8ec0e 100644 (file)
--- a/test/confs/0233
+++ b/test/confs/0233
@@ -1,14 +1,8 @@
 # Exim test configuration 0233
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0234 b/test/confs/0234
index b64904116f6d336faebcadc155e18a3683ca7271..5d34833aca33df2a120c6ea1e8980daa6871a3d0 100644 (file)
--- a/test/confs/0234
+++ b/test/confs/0234
@@ -1,14 +1,8 @@
 # Exim test configuration 0234
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0235 b/test/confs/0235
index 186b6f1b7955cc273c0f00953ad1ea3612c47af6..704767568fabe57230b35689fc8f7efa8d55f877 100644 (file)
--- a/test/confs/0235
+++ b/test/confs/0235
@@ -1,14 +1,8 @@
 # Exim test configuration 0235
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0236 b/test/confs/0236
index 55146a1341e8d23a0ce07dc8a51e14f1372dee23..e44fb46cdc9734332f9895da344e79cfa4aa5be2 100644 (file)
--- a/test/confs/0236
+++ b/test/confs/0236
@@ -1,14 +1,8 @@
 # Exim test configuration 0236
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0237 b/test/confs/0237
index 5258593acd9d7674c2e2a034cad5e1c95b3a30b8..be2f5abd238ebb1d90210c5ed240231fd4ff7cf0 100644 (file)
--- a/test/confs/0237
+++ b/test/confs/0237
@@ -1,13 +1,7 @@
 # Exim test configuration 0237
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0238 b/test/confs/0238
index cc874bb09d76cd7facd6f490db6f947ea7b391e7..15aa2205297e9209f41d90891198c6812925b42d 100644 (file)
--- a/test/confs/0238
+++ b/test/confs/0238
@@ -1,13 +1,7 @@
 # Exim test configuration 0238
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0239 b/test/confs/0239
index 4507b53a0387045aa908c474f9468328bab98d7f..f4b1a68baad883c2727b8ee5db2cc21dd7186d50 100644 (file)
--- a/test/confs/0239
+++ b/test/confs/0239
@@ -1,13 +1,7 @@
 # Exim test configuration 0239
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0240 b/test/confs/0240
index 27756fcedddcb82c40e01db9c3cb50114f012c57..bb4519ef80f541070cb5f095f53dc9f1f253cce8 100644 (file)
--- a/test/confs/0240
+++ b/test/confs/0240
@@ -1,13 +1,7 @@
 # Exim test configuration 0240
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0242 b/test/confs/0242
index 04acfd97517857ac0f13b649e68197edf6e7bc89..fc2dd70ba406afcfe153a654eb90b0af5a1039cc 100644 (file)
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -1,14 +1,8 @@
 # Exim test configuration 0242
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0243 b/test/confs/0243
index 5692765ed78563e42369853866de510f7d02c78e..7396045baf904049414527809aab51610b9576b0 100644 (file)
--- a/test/confs/0243
+++ b/test/confs/0243
@@ -1,14 +1,8 @@
 # Exim test configuration 0243
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0244 b/test/confs/0244
index d2a83365faf643bf20253b196bbd726d55678ee0..668627e7af287e553145356b33f5162acb329a9a 100644 (file)
--- a/test/confs/0244
+++ b/test/confs/0244
@@ -1,14 +1,8 @@
 # Exim test configuration 0244
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0245 b/test/confs/0245
index 1e8662ee6a0ef2572e9c21e631ab1efb1230bb55..13cb7038e5ea8a7ac5b3b20c563d193defe7c780 100644 (file)
--- a/test/confs/0245
+++ b/test/confs/0245
@@ -1,14 +1,8 @@
 # Exim test configuration 0245
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0246 b/test/confs/0246
index c73729cd0f133ed21ec0ea0876f02f5d29e25eed..fb959527dc6433c53706fe35463d004dfca5b9dc 100644 (file)
--- a/test/confs/0246
+++ b/test/confs/0246
@@ -1,14 +1,8 @@
 # Exim test configuration 0246
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0247 b/test/confs/0247
index df324b523b9ddddfe40318a8e19870895cb728d7..38e17101928fd23e898b698b5b7d83915571eb8e 100644 (file)
--- a/test/confs/0247
+++ b/test/confs/0247
@@ -1,14 +1,8 @@
 # Exim test configuration 0247
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0248 b/test/confs/0248
index c0f7b529fb666194149aff9224e5698256c5e5ed..517a2f6653895f44e31fa7ce35f44dec34ec0784 100644 (file)
--- a/test/confs/0248
+++ b/test/confs/0248
@@ -1,14 +1,8 @@
 # Exim test configuration 0248
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0249 b/test/confs/0249
index 151c69422f854244ccd0f7d9a1ae6154a6872134..1d7491be611d326c08adf47f5eb404f50893e3d1 100644 (file)
--- a/test/confs/0249
+++ b/test/confs/0249
@@ -1,14 +1,8 @@
 # Exim test configuration 0249
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0250 b/test/confs/0250
index b6d8d001dc2858a6016ea126fe158a25a765a518..80030ecd57e4ff1e4a992774121ee2a160d5d18c 100644 (file)
--- a/test/confs/0250
+++ b/test/confs/0250
@@ -1,14 +1,8 @@
 # Exim test configuration 0250
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0251 b/test/confs/0251
index aa9d4ec0daf45f6bf8f253b1a4ae93b5fe5a6770..180620f11663f6af640c74ef472c5d0e777ec7ef 100644 (file)
--- a/test/confs/0251
+++ b/test/confs/0251
@@ -2,15 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0252 b/test/confs/0252
index 78f894eead46277709d5947b6530fb2cae7ea505..28ce3419ff6d2aa717ac2765f94912014c875611 100644 (file)
--- a/test/confs/0252
+++ b/test/confs/0252
@@ -1,14 +1,8 @@
 # Exim test configuration 0252
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0253 b/test/confs/0253
index ae62fda812f1e487b76dbd9c2c5f8965bc3af3e9..cd2c777deea0c102a1550085d8703af74842b303 100644 (file)
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -1,14 +1,8 @@
 # Exim test configuration 0253
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0254 b/test/confs/0254
index 06c7b797dd20ff24899eca558d2c09810185ecea..45f5784bce0b592e99e9095e90cf005219a630aa 100644 (file)
--- a/test/confs/0254
+++ b/test/confs/0254
@@ -1,14 +1,8 @@
 # Exim test configuration 0254
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0255 b/test/confs/0255
index 0a6788b721cb74faac282394f766488b824c2367..e01c41baf46ee82c24eec3d3562590bbe8af7b55 100644 (file)
--- a/test/confs/0255
+++ b/test/confs/0255
@@ -2,15 +2,9 @@
 
 OPTION=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0256 b/test/confs/0256
index 40f69062c87ab984f8dd45ca901c4bdb4ede02d4..c5d5d4b4e2fbe506812375a77ee3e6eb902d6262 100644 (file)
--- a/test/confs/0256
+++ b/test/confs/0256
@@ -1,14 +1,8 @@
 # Exim test configuration 0256
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0257 b/test/confs/0257
index e15c34a13006101549cc817c8f53cbc222c5bb5d..f61689380304a966dea7c534459ef1f5c2fe78f2 100644 (file)
--- a/test/confs/0257
+++ b/test/confs/0257
@@ -1,14 +1,8 @@
 # Exim test configuration 0257
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0258 b/test/confs/0258
index a3f80baae5ed1746463e5ad36279ce7ff7327d29..720cc40735624ca006b000ff914733367aec7301 100644 (file)
--- a/test/confs/0258
+++ b/test/confs/0258
@@ -1,14 +1,8 @@
 # Exim test configuration 0258
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0259 b/test/confs/0259
index 7940945ab865e22913c01965e8da65b1ec05ce28..6b9bc29ab88f4b51b8d9b1ab090e6b2998aae339 100644 (file)
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -1,15 +1,9 @@
 # Exim test configuration 0259
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 5s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0260 b/test/confs/0260
index b0c549d46b0a9331452f900ba90576ff8034608a..6366cd0ad452c289e16f445551f920aaa9ac2433 100644 (file)
--- a/test/confs/0260
+++ b/test/confs/0260
@@ -1,14 +1,8 @@
 # Exim test configuration 0260
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0261 b/test/confs/0261
index b377ae779cb7a6a49e791fa065955d70d0bfabe2..30ec087fdd17a279fbe834809c1bcba17c67a113 100644 (file)
--- a/test/confs/0261
+++ b/test/confs/0261
@@ -1,14 +1,8 @@
 # Exim test configuration 0261
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0262 b/test/confs/0262
index 0f4b905bb84a57b3672da21d3e81fd6117dcd601..dc6a1d4af53f1a361300343d614535416536205f 100644 (file)
--- a/test/confs/0262
+++ b/test/confs/0262
@@ -1,14 +1,8 @@
 # Exim test configuration 0262
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0263 b/test/confs/0263
index 80ce677bb89ac43da85879551960a64e49db31fa..53b0064e7858603cb6250134322d0460dc37c4cd 100644 (file)
--- a/test/confs/0263
+++ b/test/confs/0263
@@ -1,14 +1,8 @@
 # Exim test configuration 0263
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0264 b/test/confs/0264
index aef8d87473e863534ede48449f0a054f11d703f0..792b304dd852c0e616b5c3a0571f3fb21f24d865 100644 (file)
--- a/test/confs/0264
+++ b/test/confs/0264
@@ -1,14 +1,8 @@
 # Exim test configuration 0264
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0265 b/test/confs/0265
index a94ab67eff1010c2c681bc1f882d9efef8a58826..b26583a41f618ed771b5db18368086832682bbe7 100644 (file)
--- a/test/confs/0265
+++ b/test/confs/0265
@@ -1,14 +1,8 @@
 # Exim test configuration 0265
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0266 b/test/confs/0266
index dd4b431e37dcfd346c91b1fd7e50f70510574bb8..d1e944dc2d29fb570802ab2fdcf8d01505627ab2 100644 (file)
--- a/test/confs/0266
+++ b/test/confs/0266
@@ -1,14 +1,8 @@
 # Exim test configuration 0266
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0267 b/test/confs/0267
index 114de9421e596fff08937d998cec1385b58ab91f..bb134441b3781e9e1b4c06778ec5632905a9c973 100644 (file)
--- a/test/confs/0267
+++ b/test/confs/0267
@@ -1,14 +1,8 @@
 # Exim test configuration 0267
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0268 b/test/confs/0268
index 4ea429f7f71574bd6f30327c758e1f72eadfa4a0..e1e0be848e4349e5d5e547f437eef829a29bac04 100644 (file)
--- a/test/confs/0268
+++ b/test/confs/0268
@@ -1,14 +1,8 @@
 # Exim test configuration 0268
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0269 b/test/confs/0269
index 57733812e2f97f4fc0b05cc17578f6d781349462..8aca95bd11a89fc84b744abd57108da097a8ba74 100644 (file)
--- a/test/confs/0269
+++ b/test/confs/0269
@@ -1,14 +1,8 @@
 # Exim test configuration 0269
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0270 b/test/confs/0270
index 772f456bee8a49244e1f7ed233a79ed5bec6abe5..86f81d837d8907a09ca1fa08c1df55d990e0b0e1 100644 (file)
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -1,14 +1,8 @@
 # Exim test configuration 0270
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0271 b/test/confs/0271
index f3df54738e544ca338751c2b7a18c4f9f5097d3c..93c27241d6179e63837d92531aea83411bdb7ec3 100644 (file)
--- a/test/confs/0271
+++ b/test/confs/0271
@@ -1,14 +1,8 @@
 # Exim test configuration 0271
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0272 b/test/confs/0272
index aaedd38d514b1dcbb9969b3b284952c5bc6715f7..f3788f15c9ba1cad1a68067ebcae05a1ef03f5bc 100644 (file)
--- a/test/confs/0272
+++ b/test/confs/0272
@@ -1,14 +1,8 @@
 # Exim test configuration 0272
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0273 b/test/confs/0273
index 557dd51b2711f95591dfe483defc6ca75d7ca877..0a12a6762af2ce35486698c7c8a706230740abad 100644 (file)
--- a/test/confs/0273
+++ b/test/confs/0273
@@ -1,14 +1,8 @@
 # Exim test configuration 0273
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0274 b/test/confs/0274
index ab98f68dd4c98fff159da1c72df86429b2307cd7..2eb7bb60b03003337fe82daff577bb05484d7097 100644 (file)
--- a/test/confs/0274
+++ b/test/confs/0274
@@ -1,14 +1,8 @@
 # Exim test configuration 0274
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0275 b/test/confs/0275
index af5da63f26370213bb2472a2a26becac6ec0c169..3734e03ea8e430526c9d706c43094c9661a7eb4c 100644 (file)
--- a/test/confs/0275
+++ b/test/confs/0275
@@ -1,14 +1,8 @@
 # Exim test configuration 0275
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0276 b/test/confs/0276
index 9aab39bdea65225cdb597ac76cecbdaea5ecae3e..257cf45933231f6fae7c0bb5eff35c2b72b7f0a8 100644 (file)
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -1,14 +1,8 @@
 # Exim test configuration 0276
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0277 b/test/confs/0277
index 74c93a085d84ed7e91df81f5f16ef4d1f6d43214..8e1bdc3759fbabb02e2f06a582e061c6e191d436 100644 (file)
--- a/test/confs/0277
+++ b/test/confs/0277
@@ -1,14 +1,8 @@
 # Exim test configuration 0277
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0278 b/test/confs/0278
index 0809141e20ce5748f0dae9817e8b38920706d2c5..a7adb29ec77ec265f1a481dbf75198d28460f1e9 100644 (file)
--- a/test/confs/0278
+++ b/test/confs/0278
@@ -1,14 +1,8 @@
 # Exim test configuration 0278
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0279 b/test/confs/0279
index f6d990d96d5d241119313056325a2f6527a57d18..f4334f4792f48a196ce1f624c53a75b910d55570 100644 (file)
--- a/test/confs/0279
+++ b/test/confs/0279
@@ -1,14 +1,8 @@
 # Exim test configuration 0279
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0280 b/test/confs/0280
index 004144a8fa43c60ed35165e270a6f2eedeb87e5a..40187df775705cb2b8fed8ad0192bc1308d96598 100644 (file)
--- a/test/confs/0280
+++ b/test/confs/0280
@@ -1,14 +1,8 @@
 # Exim test configuration 0280
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0281 b/test/confs/0281
index ad18629d35e0e91cb7cc51daadd1974b3221dd45..277328ed46aa4a1fa580450457e29f77ce5ad83e 100644 (file)
--- a/test/confs/0281
+++ b/test/confs/0281
@@ -1,14 +1,8 @@
 # Exim test configuration 0281
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0282 b/test/confs/0282
index 31c67345583220d6984e9a89b7075dfd3f6d10a3..2660c7f7d7bc3e01f3f2d612b8e3efd19ee28257 100644 (file)
--- a/test/confs/0282
+++ b/test/confs/0282
@@ -1,14 +1,8 @@
 # Exim test configuration 0282
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0283 b/test/confs/0283
index 6d91a6f9ce0d016dcbdff18fb9a925bf7e762abb..31d9339a2f1d3dc30c7cd619ab09ffec8954ae79 100644 (file)
--- a/test/confs/0283
+++ b/test/confs/0283
@@ -1,14 +1,8 @@
 # Exim test configuration 0283
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0284 b/test/confs/0284
index a3bac7b5bcdfd427f5cd377b1239c77a973b279a..d38f3839003840d93f248ddb7309edd2a21d83fd 100644 (file)
--- a/test/confs/0284
+++ b/test/confs/0284
@@ -1,14 +1,8 @@
 # Exim test configuration 0284
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0285 b/test/confs/0285
index dad843af197c989e39bb1bc21bd164020a5706cd..f0871a56508d58fdc7b92eb1e472f0e4b0955283 100644 (file)
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -1,14 +1,8 @@
 # Exim test configuration 0285
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0286 b/test/confs/0286
index b05cf02a5367437a903f470eab7df8561944ef37..8ec70bfbbf1e9bc0cb6b4acd73401c208e772baa 100644 (file)
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -1,14 +1,8 @@
 # Exim test configuration 0286
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0287 b/test/confs/0287
index fbb674a35fdc73925df41beb046bf5fd267d5cd3..d3f08a205746507eb4f1a7e9869347e8550b4320 100644 (file)
--- a/test/confs/0287
+++ b/test/confs/0287
@@ -1,14 +1,8 @@
 # Exim test configuration 0287
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0288 b/test/confs/0288
index 17d4ee58ffa75896b5ae4b4a651731935edb0ad0..12c308baf1fc7389ab5b094c2dc4cb05d03497a8 100644 (file)
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -1,15 +1,9 @@
 # Exim test configuration 0288
 # serialize_hosts option on smtp transport
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0289 b/test/confs/0289
index 0c4b1f28d7a47455ee5bc60cfe69de1a51321a45..8cd201862aaf84ba8dc20f30ab2c24f895da7dd7 100644 (file)
--- a/test/confs/0289
+++ b/test/confs/0289
@@ -1,15 +1,9 @@
 # Exim test configuration 0289
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0290 b/test/confs/0290
index 5c4a7aa188a474a21063fd6cf714510c362810a0..e7c501c911ec4dc058fe3bb79d90e6d3953f9e3b 100644 (file)
--- a/test/confs/0290
+++ b/test/confs/0290
@@ -10,16 +10,10 @@ C1=#
 C2=#
 C1C2 this should be a comment
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0291 b/test/confs/0291
index d9bc47e63348632afff3c954c2eff00d65c001dd..406c54faadf0381f3437864f6123c4fcf72ea2a9 100644 (file)
--- a/test/confs/0291
+++ b/test/confs/0291
@@ -1,15 +1,9 @@
 # Exim test configuration 0291
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0292 b/test/confs/0292
index 3fdbeb29982d2a2a5d80aab0d97d36482c750db1..6e70a792519a3bf64974698ccfebe69223ec487a 100644 (file)
--- a/test/confs/0292
+++ b/test/confs/0292
@@ -1,15 +1,9 @@
 # Exim test configuration 0292
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0293 b/test/confs/0293
index 4a57eb37f3af41000db8b416d7cd63eeb0fd887b..0512860f4b93569c75e24861778d055dfb689055 100644 (file)
--- a/test/confs/0293
+++ b/test/confs/0293
@@ -1,15 +1,9 @@
 # Exim test configuration 0293
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0294 b/test/confs/0294
index fffb9ed3f57d906a996170540785aac85481b964..6e17b832db637038e590990fc9c582947ed9f1d1 100644 (file)
--- a/test/confs/0294
+++ b/test/confs/0294
@@ -1,15 +1,9 @@
 # Exim test configuration 0294
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0295 b/test/confs/0295
index 04e5b36a80c3c778a86e51c793b77d26859a4960..997b83c6b773302fcc7a58be3e17de681ea91e5e 100644 (file)
--- a/test/confs/0295
+++ b/test/confs/0295
@@ -1,15 +1,9 @@
 # Exim test configuration 0295
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0296 b/test/confs/0296
index 9af8750157bfd253d6306c0a2edfa3b72c24982d..e62a3d1a102835fc8dc7bb84eb3c082bdc69de8f 100644 (file)
--- a/test/confs/0296
+++ b/test/confs/0296
@@ -1,14 +1,8 @@
 # Exim test configuration 0296
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0297 b/test/confs/0297
index fe5616a40deae0ee8e10ca7bb596a618e392e60e..b07fc54cbbaf3a258ab5e65e8c887de583962711 100644 (file)
--- a/test/confs/0297
+++ b/test/confs/0297
@@ -1,14 +1,8 @@
 # Exim test configuration 0297
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0298 b/test/confs/0298
index a6cc98495d1ab7bea7d0ba76a833498d120df6bb..3ca06f87fda1855cfe4ce9493a92ba80fe46626e 100644 (file)
--- a/test/confs/0298
+++ b/test/confs/0298
@@ -1,14 +1,8 @@
 # Exim test configuration 0298
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0299 b/test/confs/0299
index fa351a774ddc1e72c55f42a5d5af9a24a2322e81..5d648b85d34fdfc43778738846f346d291906f7a 100644 (file)
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -1,14 +1,8 @@
 # Exim test configuration 0299
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0300 b/test/confs/0300
index ce36a036681e03718bf961928919f9e656dbe386..814f8ee0fd4f717bd8cd65be344491c81152a585 100644 (file)
--- a/test/confs/0300
+++ b/test/confs/0300
@@ -3,15 +3,9 @@
 DELAY=0s
 PAH=127.0.0.1
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0301 b/test/confs/0301
index 4e1aab68e7806885c65bddfb529724e24a85cebd..2ce525c01f3440845b90892d4237d3f142b22c04 100644 (file)
--- a/test/confs/0301
+++ b/test/confs/0301
@@ -1,14 +1,8 @@
 # Exim test configuration 0301
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0302 b/test/confs/0302
index 275f6f00cfd5c7234f0c3ac753474a9b2478d90b..81aadbba16a16491badffed1224a7b64c74d1840 100644 (file)
--- a/test/confs/0302
+++ b/test/confs/0302
@@ -1,14 +1,8 @@
 # Exim test configuration 0302
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0303 b/test/confs/0303
index d2613324e49c542704807013ff094e7166a096c8..b96063e96d380c949db453f33b1bc025cc17a685 100644 (file)
--- a/test/confs/0303
+++ b/test/confs/0303
@@ -1,14 +1,8 @@
 # Exim test configuration 0303
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0304 b/test/confs/0304
index 5bbada409b9d8ba4f0220c0d1ca477d01febc6d8..6c899aaec9569fd7f95f2f8fdd32fc2138a5c82f 100644 (file)
--- a/test/confs/0304
+++ b/test/confs/0304
@@ -1,14 +1,8 @@
 # Exim test configuration 0304
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0305 b/test/confs/0305
index 14366f6b58a068d21aef950553389c6b60c83662..33e97ef6ac6f3c48fe3a6faaa5a1c95e003e1e1c 100644 (file)
--- a/test/confs/0305
+++ b/test/confs/0305
@@ -1,14 +1,8 @@
 # Exim test configuration 0305
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0306 b/test/confs/0306
index 6e14b31dd5ff10aaff1c90f4c23fbe353f12b314..6d6d9658a2e63db9a2bcf9e33fed053bae33ccc8 100644 (file)
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -1,14 +1,8 @@
 # Exim test configuration 0306
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0307 b/test/confs/0307
index db499851a8d07dda2673ecdca06bf2e22b0e3e52..3252b461525381bf79c126fd3c34da6cfa849b1c 100644 (file)
--- a/test/confs/0307
+++ b/test/confs/0307
@@ -1,14 +1,8 @@
 # Exim test configuration 0307
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0308 b/test/confs/0308
index 68a433e66a3d985fe6eaccda795def1f84b5cb8d..dd2f6dd50381ac35f0c23ef4c7eb99244728a80f 100644 (file)
--- a/test/confs/0308
+++ b/test/confs/0308
@@ -1,14 +1,8 @@
 # Exim test configuration 0308
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0309 b/test/confs/0309
index 05f6893ae1e86d84e19836d437d1045ce8c5423b..4d644900993e44fc111d61b2735662146dc23fff 100644 (file)
--- a/test/confs/0309
+++ b/test/confs/0309
@@ -1,14 +1,8 @@
 # Exim test configuration 0309
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0310 b/test/confs/0310
index 44953ba85da192b7e7013daf04bc7bde61bbf380..0f324da1d4c37e266deef221452bdd92519c63b0 100644 (file)
--- a/test/confs/0310
+++ b/test/confs/0310
@@ -1,14 +1,8 @@
 # Exim test configuration 0310
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0311 b/test/confs/0311
index f26236f5a6eb7ed06f92f38adc88f0788d2cf78d..99082cb7f75b079b79f9a68b4a9bde62bafb51e8 100644 (file)
--- a/test/confs/0311
+++ b/test/confs/0311
@@ -1,14 +1,8 @@
 # Exim test configuration 0311
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0312 b/test/confs/0312
index 590131b0057349dacefebe7fbd101669847be0c6..dad5d083c078e33f63b84e9992e28c57535ffd40 100644 (file)
--- a/test/confs/0312
+++ b/test/confs/0312
@@ -1,14 +1,8 @@
 # Exim test configuration 0312
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0313 b/test/confs/0313
index 5ff28b23015e0ef098e8329658c588acf84a57ce..7849526db41087ba6adf5d0c842c170f5a1c1a9a 100644 (file)
--- a/test/confs/0313
+++ b/test/confs/0313
@@ -1,13 +1,7 @@
 # Exim test configuration 0313
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0314 b/test/confs/0314
index f5269589274c9cc1e335abe86af6d6a3e66f1999..2ad32dba6d22ea85b2146b0fbffe6f6bdd0711b2 100644 (file)
--- a/test/confs/0314
+++ b/test/confs/0314
@@ -1,13 +1,7 @@
 # Exim test configuration 0314
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0315 b/test/confs/0315
index 7566ca2b6fa02ebe92ab2d613194956d9e1ea51b..fed3ceca19edabb5c9e9f0eb5ac344e209a00b52 100644 (file)
--- a/test/confs/0315
+++ b/test/confs/0315
@@ -1,13 +1,7 @@
 # Exim test configuration 0315
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0316 b/test/confs/0316
index b26273c595a6a2282cd6afbf99150ba190f953ba..22fea04ca78336ce2888e8627f0ad35d14ca8fc5 100644 (file)
--- a/test/confs/0316
+++ b/test/confs/0316
@@ -1,13 +1,7 @@
 # Exim test configuration 0316
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0317 b/test/confs/0317
index cafcfe9cf0cb645177e8415f2ab8ca08d38c323e..754231606c79ea3fde0f3a3b3d3023dd8e526e53 100644 (file)
--- a/test/confs/0317
+++ b/test/confs/0317
@@ -1,13 +1,7 @@
 # Exim test configuration 0317
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0318 b/test/confs/0318
index fcb3c454cf2b9813f3e945541604b9ec2af1a6e5..51633d997b70055d4854fae20e28df641b5ba2c1 100644 (file)
--- a/test/confs/0318
+++ b/test/confs/0318
@@ -1,13 +1,7 @@
 # Exim test configuration 0318
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0319 b/test/confs/0319
index 68cff3f890772599f99d83661b268bcac7ea4936..aaa21d7302a5e6e783e74a1c89eaa43b1d882b73 100644 (file)
--- a/test/confs/0319
+++ b/test/confs/0319
@@ -1,13 +1,7 @@
 # Exim test configuration 0319
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0320 b/test/confs/0320
index cdde86c8550aa7b34c704d05cb923aea1d00820e..6f287a89c96918cc474bbe0149bbed30482482d1 100644 (file)
--- a/test/confs/0320
+++ b/test/confs/0320
@@ -1,13 +1,7 @@
 # Exim test configuration 0320
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0321 b/test/confs/0321
index b32615a6b1730f48965781cbc358bf9689acb651..624202e6526aac2626c09c25302e9c794f5a4f19 100644 (file)
--- a/test/confs/0321
+++ b/test/confs/0321
@@ -1,13 +1,7 @@
 # Exim test configuration 0321
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0322 b/test/confs/0322
index 94864147aaadd1fbd79ce954c3146a6243387714..567dcf479c7c7b873d4b6592572d78d7f1a93522 100644 (file)
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -2,15 +2,9 @@
 
 LS=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0323 b/test/confs/0323
index 3eebcb2e3910638c68dfff63c22d139b6a1b1008..554ccbaf89c22347d05e0d2a77618822fbf8200e 100644 (file)
--- a/test/confs/0323
+++ b/test/confs/0323
@@ -1,14 +1,8 @@
 # Exim test configuration 0323
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0324 b/test/confs/0324
index 1c946102ae38627768c5f8c6de318042b8ceb579..129e5df4c1a6f76b46ef3ebcad58577287ed5bfb 100644 (file)
--- a/test/confs/0324
+++ b/test/confs/0324
@@ -1,14 +1,8 @@
 # Exim test configuration 0324
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0325 b/test/confs/0325
index 2a5bf63774e00a853843940e1c57286e087d22c6..e81e63b427295b5aeafb1c93659452db9a7f4406 100644 (file)
--- a/test/confs/0325
+++ b/test/confs/0325
@@ -1,14 +1,8 @@
 # Exim test configuration 0325
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0326 b/test/confs/0326
index fb9b5c945fa247bacf589ab01589647dfe9bce0e..8f44d3c3403793f6e8309cde878b9e620bccf312 100644 (file)
--- a/test/confs/0326
+++ b/test/confs/0326
@@ -1,14 +1,8 @@
 # Exim test configuration 0326
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0327 b/test/confs/0327
index f3216575c20ab3a8e1b3aa36cafc62664706c8dd..481aaa7ae7aa23d23cfc5efe3fc6f46ae448e0c6 100644 (file)
--- a/test/confs/0327
+++ b/test/confs/0327
@@ -1,14 +1,8 @@
 # Exim test configuration 0327
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0328 b/test/confs/0328
index f14d1c7b6a4490f29ece9aacdc7f0de532335e58..76f8985524c97a6e27c42c76fcabab38adff8ec8 100644 (file)
--- a/test/confs/0328
+++ b/test/confs/0328
@@ -1,14 +1,8 @@
 # Exim test configuration 0328
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0329 b/test/confs/0329
index 9529207b2414c68345104f40ee23d5c6c9ab76cc..f9d5bcbb5d7f8b1a26a68589a410f4bbec3284c8 100644 (file)
--- a/test/confs/0329
+++ b/test/confs/0329
@@ -1,14 +1,8 @@
 # Exim test configuration 0329
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0330 b/test/confs/0330
index b4a7a164a85c348b76036b745b4058d884bf9d9f..78701a9c5dd64bbefa80d0a9aea7472ac9ff9ca5 100644 (file)
--- a/test/confs/0330
+++ b/test/confs/0330
@@ -1,13 +1,7 @@
 # Exim test configuration 0330
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0331 b/test/confs/0331
index 8c62e22985865a692fb10a4225cabd6f498d978f..48ddf9037b1192abd11b3fc1dabeccdbfdb739c2 100644 (file)
--- a/test/confs/0331
+++ b/test/confs/0331
@@ -1,13 +1,7 @@
 # Exim test configuration 0331
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0332 b/test/confs/0332
index 5bf3a093b68bcb084ef1cc607c45a3c61722821a..4fe3b3fd4d307145d4553f5a33f01c200c539578 100644 (file)
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -1,14 +1,8 @@
 # Exim test configuration 0332
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0333 b/test/confs/0333
index ed9e665db98f45e97d2fe7709dc7de8665ea11be..4192292857e723203bad01691c536c507c764f57 100644 (file)
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -1,14 +1,8 @@
 # Exim test configuration 0333
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0334 b/test/confs/0334
index 48951f992be15053a3c279ef59f54cfe12130ee9..553763b0a77cfee7bcbbaaf7afdee96628514d91 100644 (file)
--- a/test/confs/0334
+++ b/test/confs/0334
@@ -1,14 +1,8 @@
 # Exim test configuration 0334
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0335 b/test/confs/0335
index 7f236cf36faed781dabd4739779daec8c14efd52..6529028d5089f4c80d6d09b0220b096b84dcba83 100644 (file)
--- a/test/confs/0335
+++ b/test/confs/0335
@@ -1,14 +1,8 @@
 # Exim test configuration 0335
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0336 b/test/confs/0336
index b526359593351de4fc512a2a8519c337d56c801b..8ec4475913548089bd2a5a1cff0c48a5616571c9 100644 (file)
--- a/test/confs/0336
+++ b/test/confs/0336
@@ -1,14 +1,8 @@
 # Exim test configuration 0336
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0337 b/test/confs/0337
index 3fe87dbda5a139f6eb7c9b83be739fe8d5e2a6a1..7dedf5fe15b548c6aab3e98f2347ceb57ef9f672 100644 (file)
--- a/test/confs/0337
+++ b/test/confs/0337
@@ -1,14 +1,8 @@
 # Exim test configuration 0337
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0338 b/test/confs/0338
index a721b55b90202446e080b30b4e8ad3675de90194..d373f477c2a21b18b502ebfc653fdfd98daeb9fb 100644 (file)
--- a/test/confs/0338
+++ b/test/confs/0338
@@ -1,14 +1,8 @@
 # Exim test configuration 0338
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0339 b/test/confs/0339
index 1f877ec49ec32698a1aff7a45783732bededcd56..843dd0222ab810038ba6d3f6b4f43d184aa08895 100644 (file)
--- a/test/confs/0339
+++ b/test/confs/0339
@@ -1,14 +1,8 @@
 # Exim test configuration 0339
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0340 b/test/confs/0340
index f9a083ff9f08dfe3cd6d626c0861ef5a6e6cdab2..a4b49d8ad8edd5bfff36e5c637a52aa0655800e4 100644 (file)
--- a/test/confs/0340
+++ b/test/confs/0340
@@ -1,14 +1,8 @@
 # Exim test configuration 0340
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0341 b/test/confs/0341
index b8c0fb9043e2c030323d349d56903f20b173c348..726793390a9386db182016863241cbd9422d98b6 100644 (file)
--- a/test/confs/0341
+++ b/test/confs/0341
@@ -2,15 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0342 b/test/confs/0342
index cf11417618a0605fea0893730cc032c3992b6642..dba9020f4814897d414285edbeb3be7bbbe7f24e 100644 (file)
--- a/test/confs/0342
+++ b/test/confs/0342
@@ -1,14 +1,8 @@
 # Exim test configuration 0342
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0343 b/test/confs/0343
index 52f90bc1284abe368cdc5cc40bf7bf5b3cf9e29e..c613da449829dd3b2d3b49edb451f1184a2eae35 100644 (file)
--- a/test/confs/0343
+++ b/test/confs/0343
@@ -1,14 +1,8 @@
 # Exim test configuration 0343
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0344 b/test/confs/0344
index 1f067ced2b8ddd793204c58c2f02fe1b4a805974..0b29b0629e036dd78b1b4f21452d91e6bb9ec285 100644 (file)
--- a/test/confs/0344
+++ b/test/confs/0344
@@ -1,14 +1,8 @@
 # Exim test configuration 0344
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0345 b/test/confs/0345
index d6456345ee1e23ad68e86aceea422e698d49a505..99bdce0b4587fa493bceff3da41ef9cd24d3e492 100644 (file)
--- a/test/confs/0345
+++ b/test/confs/0345
@@ -1,13 +1,7 @@
 # Exim test configuration 0345
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0346 b/test/confs/0346
index de9e4d076f77b3e4823df4392721abd526236755..1c4b51c508ee31f229aa764e2a59f21736bdcbd7 100644 (file)
--- a/test/confs/0346
+++ b/test/confs/0346
@@ -1,13 +1,7 @@
 # Exim test configuration 0346
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0347 b/test/confs/0347
index af2fef817a51880b274873a32eaf2129a7ca1110..993b3fd1f11ab1fb5e10a6338dd5287da9368a70 100644 (file)
--- a/test/confs/0347
+++ b/test/confs/0347
@@ -1,13 +1,7 @@
 # Exim test configuration 0347
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0348 b/test/confs/0348
index 0adeb040aaec3f8e927e4947cb965b98c54efa81..60f8d208bd2a8e5e40b71d0e36ae6f9ad32df681 100644 (file)
--- a/test/confs/0348
+++ b/test/confs/0348
@@ -2,14 +2,8 @@
 
 RETRY=G,1,20m,1.5
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0349 b/test/confs/0349
index 411dcdcd983ee3175e164f086286688bfd2cbd1f..f11957d2e16596a807657cbd45bc671d4801c4f5 100644 (file)
--- a/test/confs/0349
+++ b/test/confs/0349
@@ -1,13 +1,7 @@
 # Exim test configuration 0349
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0350 b/test/confs/0350
index cbdf68ecc347bea9c728f1d2cc541f69a327df5c..09bd635dbd5c3fd9edacaf557b48a2f15e5bdcc0 100644 (file)
--- a/test/confs/0350
+++ b/test/confs/0350
@@ -1,14 +1,8 @@
 # Exim test configuration 0350
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0351 b/test/confs/0351
index 7cfe1a2f5b0f397663070458a8de49b9b52d91ed..b00ee7497ca71189210c16e7dce46872c44ec423 100644 (file)
--- a/test/confs/0351
+++ b/test/confs/0351
@@ -1,13 +1,7 @@
 # Exim test configuration 0351
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0352 b/test/confs/0352
index 8bf302e7e13b460b99fe27f177f98db5239cc1f6..aaa9809410b1eee27b681625309b890735210a2e 100644 (file)
--- a/test/confs/0352
+++ b/test/confs/0352
@@ -1,13 +1,7 @@
 # Exim test configuration 0352
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0353 b/test/confs/0353
index d3504c69d24a78ccd07d51621da4c16aae006a4a..fb53d6d69f5639862ebacecdbe7b41a56c237f82 100644 (file)
--- a/test/confs/0353
+++ b/test/confs/0353
@@ -1,13 +1,7 @@
 # Exim test configuration 0353
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0354 b/test/confs/0354
index 5446ae876fbcadb6a0c3247b84fe57ec94319406..03ea43f83dd387132838208960391c548a86d92f 100644 (file)
--- a/test/confs/0354
+++ b/test/confs/0354
@@ -1,13 +1,7 @@
 # Exim test configuration 0354
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0355 b/test/confs/0355
index 73dc6b1312040177db2afc5f8606b867e5071792..78b1484c76917a4b9c496f3108fc4ad153176f9f 100644 (file)
--- a/test/confs/0355
+++ b/test/confs/0355
@@ -1,13 +1,7 @@
 # Exim test configuration 0355
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0356 b/test/confs/0356
index e96eef8d1d17188d10c709efdf0c6b515864d97e..c6e9e94a105fb5dac64ceaa1774052a7a77d450d 100644 (file)
--- a/test/confs/0356
+++ b/test/confs/0356
@@ -2,14 +2,8 @@
 
 MESSAGE_LOGS =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0357 b/test/confs/0357
index 6fd1bc65f1798a2e02b759c4d7c34e33922f17d5..07f3fc857af32cf1574ce20a32aee7115ee3b827 100644 (file)
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -1,13 +1,7 @@
 # Exim test configuration 0357
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0358 b/test/confs/0358
index 8dd6a80b36a14274ae5b52f884d483fa668423ef..24611d0fb58e206ab8a643bbb4bb046d3b4492c8 100644 (file)
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -1,13 +1,7 @@
 # Exim test configuration 0358
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0359 b/test/confs/0359
index 57fc1c2276895edf5d0792bc46cdc3522d3d64d2..6b6b8c093ab6aa945833233696a72c4c829a0e53 100644 (file)
--- a/test/confs/0359
+++ b/test/confs/0359
@@ -1,13 +1,7 @@
 # Exim test configuration 0359
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0360 b/test/confs/0360
index d5ecc90092f977e977711dba2f21b7d30228a9ae..d226449a8c76e800338751db712308222014f93b 100644 (file)
--- a/test/confs/0360
+++ b/test/confs/0360
@@ -1,13 +1,7 @@
 # Exim test configuration 0360
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0361 b/test/confs/0361
index dfc29deb899e3e82636771319778f99a19931053..f9007ec0cc5cbf23bb1689c39a5382374aecdf50 100644 (file)
--- a/test/confs/0361
+++ b/test/confs/0361
@@ -1,13 +1,7 @@
 # Exim test configuration 0361
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0362 b/test/confs/0362
index 17a252c59565d1e4e4deed4e5cb234ef4c3373ce..6588f609ffcd9b49fa041d8c095e49f45f97f898 100644 (file)
--- a/test/confs/0362
+++ b/test/confs/0362
@@ -1,13 +1,7 @@
 # Exim test configuration 0362
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0363 b/test/confs/0363
index e5bf738ca80d2ae7d849365d32240303e8a0afec..c4304087662a27c4042f250b062bc526f2fb2464 100644 (file)
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -1,13 +1,7 @@
 # Exim test configuration 0363
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0364 b/test/confs/0364
index 4192bad16dfa8f39f64b1610f41c152321d7e0d8..e15bc91274d90ac05b5519532dcd7e60d03172bc 100644 (file)
--- a/test/confs/0364
+++ b/test/confs/0364
@@ -1,13 +1,7 @@
 # Exim test configuration 0364
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0365 b/test/confs/0365
index 4cbc22d33e3cf5675e64701a8e314415e8a2ea7c..0bd6cc161796df59dac7c5dfb11b97142de87560 100644 (file)
--- a/test/confs/0365
+++ b/test/confs/0365
@@ -3,14 +3,8 @@
 DETAILS=false
 SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0366 b/test/confs/0366
index f681f75c9949148927eda94acecce7434f44ec80..de5d9cfc88cdb327367929254cc26bf59d544d61 100644 (file)
--- a/test/confs/0366
+++ b/test/confs/0366
@@ -2,14 +2,8 @@
 
 HOSTS_MAX_TRY=5
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0367 b/test/confs/0367
index 10174692a4595b68ffbcc39133c2a6c1bd811f40..2d69a07abb7beb921a47957df8d65250d101ca92 100644 (file)
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -1,13 +1,7 @@
 # Exim test configuration 0367
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0368 b/test/confs/0368
index 466257414a448b6694900d7e2c7fd008b71d9d24..fee202781788543a056d13e78b548e74ab4617cc 100644 (file)
--- a/test/confs/0368
+++ b/test/confs/0368
@@ -1,14 +1,8 @@
 # Exim test configuration 0368
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0369 b/test/confs/0369
index d062137dbc78eb909cf34d42532fec8c713281cb..511c541f690ed3d3badd149d3a28c27972386a15 100644 (file)
--- a/test/confs/0369
+++ b/test/confs/0369
@@ -1,14 +1,8 @@
 # Exim test configuration 0369
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0370 b/test/confs/0370
index 00f3f458b3adbca7837e8e3aad522ba418b7d144..315a568723df3def668a3392efce912bef7aa192 100644 (file)
--- a/test/confs/0370
+++ b/test/confs/0370
@@ -1,14 +1,8 @@
 # Exim test configuration 0370
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0371 b/test/confs/0371
index b2cf41dc61550502e7e20429ff9aca87f13e4b9a..eb4d07fb8ece0a1bc33ce7355eb39d358836b8ce 100644 (file)
--- a/test/confs/0371
+++ b/test/confs/0371
@@ -1,13 +1,7 @@
 # Exim test configuration 0371
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0372 b/test/confs/0372
index b08ac66c4126e2c5449cfed581f3c6673ab9665a..983d596a13dbd260e23d2ea3df17e1277a903fb4 100644 (file)
--- a/test/confs/0372
+++ b/test/confs/0372
@@ -2,15 +2,9 @@
 
 STRICT=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0373 b/test/confs/0373
index 16f0d637e51bc8bb1e9bf8ab5b764ee9bd7468f0..10d64b782511fb491cbe7ce4b91e05992b40cf81 100644 (file)
--- a/test/confs/0373
+++ b/test/confs/0373
@@ -1,14 +1,8 @@
 # Exim test configuration 0373
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0374 b/test/confs/0374
index 4361bcc526e9493e4c80f74072406ab6a1546c58..652a5062b40e99434dfb81fa5152d40053b4ced0 100644 (file)
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -1,14 +1,8 @@
 # Exim test configuration 0374
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0375 b/test/confs/0375
index 3b622ae9ff72a26a95a3c5736be24e98605b40a3..06b16f3836fcb86d177832e1ffb985cee03c2757 100644 (file)
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -1,14 +1,8 @@
 # Exim test configuration 0375
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0376 b/test/confs/0376
index 04731c975f41bf6f41e069c75d9ff167e5680737..6162c2c9d8a31eb7c8a024752c9ec947eeac6590 100644 (file)
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -2,15 +2,9 @@
 
 PEX=10s
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0377 b/test/confs/0377
index 3d77e208d08e036e0641d150f242535f3b433db8..bd3391b3a5daa29e89657c65c7d15a753ad0fe51 100644 (file)
--- a/test/confs/0377
+++ b/test/confs/0377
@@ -1,14 +1,8 @@
 # Exim test configuration 0377
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0378 b/test/confs/0378
index 5604eb32544b916df2e28fffa956edfa2c1d2fe2..3e4d85a8158e8cc8bcac6fb9648af8adcf2756f8 100644 (file)
--- a/test/confs/0378
+++ b/test/confs/0378
@@ -1,14 +1,8 @@
 # Exim test configuration 0378
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0379 b/test/confs/0379
index 6342780fcb6217cbd36d0c86cd27861fa660adc6..2f1216b1f498347661f1ddf7f13a6b1e1be9ca91 100644 (file)
--- a/test/confs/0379
+++ b/test/confs/0379
@@ -1,14 +1,8 @@
 # Exim test configuration 0379
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0380 b/test/confs/0380
index 5264a7d83906dde4446fae7666c8c06681c9a08d..90d1f933b14de64e4db30ad4a25ad538bfdfc60b 100644 (file)
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -1,14 +1,8 @@
 # Exim test configuration 0380
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0381 b/test/confs/0381
index 8eaa38fb0010d4cf77931631488d6bed88e07f03..0a9d8dc20c842567d5a4bf23f1c744315a28e0a1 100644 (file)
--- a/test/confs/0381
+++ b/test/confs/0381
@@ -1,14 +1,8 @@
 # Exim test configuration 0381
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0382 b/test/confs/0382
index f9d36eebfec33eed2bdebe5adfbef7c800ebae4c..d27b8e3f78029aacf807f9cd4cb02a3b180b6a90 100644 (file)
--- a/test/confs/0382
+++ b/test/confs/0382
@@ -1,14 +1,8 @@
 # Exim test configuration 0382
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0383 b/test/confs/0383
index 034ccaea972776bb525b01be3b700a84dda2d415..ea2f1dc28df77c5b54981788c1e00e784b7d0543 100644 (file)
--- a/test/confs/0383
+++ b/test/confs/0383
@@ -1,14 +1,8 @@
 # Exim test configuration 0383
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0384 b/test/confs/0384
index 5ce6fec0509146461354c58aab8e188341c5e905..80450a7e809149585b5b950766b074b9ee63490e 100644 (file)
--- a/test/confs/0384
+++ b/test/confs/0384
@@ -1,14 +1,8 @@
 # Exim test configuration 0384
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0385 b/test/confs/0385
index baa5af0408eaeb148384216b4703b96e46623b12..f66e6b818209d2bcdbd233dce3fbf313e291f730 100644 (file)
--- a/test/confs/0385
+++ b/test/confs/0385
@@ -1,14 +1,8 @@
 # Exim test configuration 0385
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0386 b/test/confs/0386
index 7e8c487ae336704053fb331a561175951f98df3b..5eecfcc98212b0a19a0714e0c601494424496069 100644 (file)
--- a/test/confs/0386
+++ b/test/confs/0386
@@ -1,14 +1,8 @@
 # Exim test configuration 0386
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0387 b/test/confs/0387
index 0833efd483029e1b22153c4c7e9f6f995b51da12..b8ed35ccc0ed35014c2c689d20215e91387d6c16 100644 (file)
--- a/test/confs/0387
+++ b/test/confs/0387
@@ -1,14 +1,8 @@
 # Exim test configuration 0387
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0388 b/test/confs/0388
index 54651ad296287b122dc7370a7a41a35eea0f0f26..9a7be305d62883809ed0041dd519f3852144c774 100644 (file)
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -1,14 +1,8 @@
 # Exim test configuration 0388
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0389 b/test/confs/0389
index f06cf19dd356fe5a21358bbfb1d71da3ef85c8d0..f2439bf585e69c5b794809d2ae314c52411d3c0d 100644 (file)
--- a/test/confs/0389
+++ b/test/confs/0389
@@ -1,14 +1,8 @@
 # Exim test configuration 0389
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0390 b/test/confs/0390
index 5fb58925515cef83438a6641241dda5c9c5ec604..972e925d95f48f603361da661828460e134e8a1c 100644 (file)
--- a/test/confs/0390
+++ b/test/confs/0390
@@ -1,14 +1,8 @@
 # Exim test configuration 0390
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0391 b/test/confs/0391
index 4a2f41474e354045aa2a4e5b2595b743574e0009..4ab5cfddd65aaf07caad2fa5e00d357ac6d1afc3 100644 (file)
--- a/test/confs/0391
+++ b/test/confs/0391
@@ -1,14 +1,8 @@
 # Exim test configuration 0391
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0392 b/test/confs/0392
index 9b062526baa2d2c4ae84ff003557cda586898aa0..e76c867727ad55f1a7dc56cb423492f8fb079789 100644 (file)
--- a/test/confs/0392
+++ b/test/confs/0392
@@ -1,14 +1,8 @@
 # Exim test configuration 0392
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0393 b/test/confs/0393
index e75af039902b7441594a8d067835120a1fc0ce59..c029d0d71b7f08b215e326e95da1bf9a11428ab3 100644 (file)
--- a/test/confs/0393
+++ b/test/confs/0393
@@ -2,14 +2,8 @@
 
 FILTER=/bin/cat
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0394 b/test/confs/0394
index 9a71beef9dbf5ee57928af4f5b916c902bb385fd..c1a556357c65334ff56f744ecf164fa564a20ead 100644 (file)
--- a/test/confs/0394
+++ b/test/confs/0394
@@ -2,14 +2,8 @@
 
 OPT=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0395 b/test/confs/0395
index 5962ad34a518af9c04ebe69e52143541cbe1c7ee..b7fc3fd587fa7454a89750ac823eabc03583a578 100644 (file)
--- a/test/confs/0395
+++ b/test/confs/0395
@@ -2,14 +2,8 @@
 
 TRUSTED=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0396 b/test/confs/0396
index 3d06554d3aa38c302f97ba0d94d756fc231f3a1d..ef2ad8a552966ea395d4cdb34c2a5e3f05d0f70a 100644 (file)
--- a/test/confs/0396
+++ b/test/confs/0396
@@ -1,13 +1,7 @@
 # Exim test configuration 0396
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0398 b/test/confs/0398
index 3e3f5a589f087dcc5349bfb85650015ab3fc87c3..9fbe1b8da36dcc527941c155792dcfd17796835e 100644 (file)
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -1,13 +1,7 @@
 # Exim test configuration 0398
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0399 b/test/confs/0399
index ee9b4f6c79fdb01f9f3a22d5da0ae4b5f1e5e81c..5584e509cd0e620fe59df2367592f0282fe4fc78 100644 (file)
--- a/test/confs/0399
+++ b/test/confs/0399
@@ -1,13 +1,7 @@
 # Exim test configuration 0399
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0400 b/test/confs/0400
index 05ffaeb454de89a81b10687036f58519f3cc4f23..1a8a8e43b711c082da9436b82c2107978ef761fc 100644 (file)
--- a/test/confs/0400
+++ b/test/confs/0400
@@ -2,14 +2,8 @@
 
 DATA=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0401 b/test/confs/0401
index dbc77005fea2902b3db55ccf6626046aaa7c2ce2..b8c1059831c2ec4eaf67360e49fd168ef081934a 100644 (file)
--- a/test/confs/0401
+++ b/test/confs/0401
@@ -1,13 +1,7 @@
 # Exim test configuration 0401
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0402 b/test/confs/0402
index f83c45337f320e2ba1a9892a8388c792f87d08b1..57e027c032b0d5644a8ffe2c406bba6a1d3b0921 100644 (file)
--- a/test/confs/0402
+++ b/test/confs/0402
@@ -1,13 +1,7 @@
 # Exim test configuration 0402
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0403 b/test/confs/0403
index a4e5f76eb29b9d23d82226f027211e1a2b34901a..26d1cd6fe99601711bc0202e913379889a93f3a4 100644 (file)
--- a/test/confs/0403
+++ b/test/confs/0403
@@ -1,13 +1,7 @@
 # Exim test configuration 0403
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0404 b/test/confs/0404
index 76a1f74f3f8c6d88102dc0305140962a2f51a463..9d0dc5c905eccc9164a432591644c6cb18f5a2a0 100644 (file)
--- a/test/confs/0404
+++ b/test/confs/0404
@@ -1,13 +1,7 @@
 # Exim test configuration 0404
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0405 b/test/confs/0405
index 3db8b2493a941c3f69fa43fc97bb3db01355f069..edf720c4842501fb89612fbabdd406ebf39fe305 100644 (file)
--- a/test/confs/0405
+++ b/test/confs/0405
@@ -2,14 +2,8 @@
 
 UTF8=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0406 b/test/confs/0406
index f517624ff146ed7a17fb8c443997f9ef7ce6a5c9..1c1ec205f0f4b1709be9f09d9f04ccbc42707f7a 100644 (file)
--- a/test/confs/0406
+++ b/test/confs/0406
@@ -1,13 +1,7 @@
 # Exim test configuration 0406
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0407 b/test/confs/0407
index 9dba8d7e0c9dd87aa9f3a2e1a963a9c25195c965..616b80a130b393021ca4ab86beeb1e37fdf5a8eb 100644 (file)
--- a/test/confs/0407
+++ b/test/confs/0407
@@ -3,14 +3,8 @@
 HEADER_MAXSIZE=
 HEADER_LINE_MAXSIZE=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0408 b/test/confs/0408
index 413a50758e1a816ba96e0bcfb5ab4ecd17872a28..903b4ca7c83db6054ad2e065e0cb468fe9d0344a 100644 (file)
--- a/test/confs/0408
+++ b/test/confs/0408
@@ -1,13 +1,7 @@
 # Exim test configuration 0408
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0409 b/test/confs/0409
index 8f6564588823f2e1d260ecdfeb761163af69b077..3cc072b2009bb4894f128647bbd1992bd0e21aef 100644 (file)
--- a/test/confs/0409
+++ b/test/confs/0409
@@ -2,14 +2,8 @@
 
 BANNER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0410 b/test/confs/0410
index dcc0f64199c766e4b5a691f8be4d85325234ad67..904073d3ba82dfc58fc90f0b374ba7d70fec3afd 100644 (file)
--- a/test/confs/0410
+++ b/test/confs/0410
@@ -1,13 +1,7 @@
 # Exim test configuration 0410
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0411 b/test/confs/0411
index aea60f89745be5380b9f2605014f33810198d073..fa24e9fd025667d49ef3f7f34d7178fcfbab2d4f 100644 (file)
--- a/test/confs/0411
+++ b/test/confs/0411
@@ -1,13 +1,7 @@
 # Exim test configuration 0411
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0412 b/test/confs/0412
index fca635748ed376cced4085c7b4f9a6f63a705aa3..f8b9c69ff8f95f88df23624a38976fcd8ee203d3 100644 (file)
--- a/test/confs/0412
+++ b/test/confs/0412
@@ -1,13 +1,7 @@
 # Exim test configuration 0412
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0413 b/test/confs/0413
index 77133f8914160759e177fdc30f599964e0714c32..118dbcfe977938649310ca057e1195aee715db06 100644 (file)
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -1,13 +1,7 @@
 # Exim test configuration 0413
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0414 b/test/confs/0414
index 8dc486e1717973f40300fa74dd88c52859d029be..c0fbeffdb4fbda4ee0b58fd9c35537dfe78a067a 100644 (file)
--- a/test/confs/0414
+++ b/test/confs/0414
@@ -1,13 +1,7 @@
 # Exim test configuration 0414
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0415 b/test/confs/0415
index 1bec61aac46f718a525417397792741ddac6e944..06459597f2b8997b4ad2cefe5a2311dd00ddbae8 100644 (file)
--- a/test/confs/0415
+++ b/test/confs/0415
@@ -4,14 +4,8 @@ ARG1=40M
 ARG2=1.0
 VALUE=0
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0416 b/test/confs/0416
index 58b7505ecc7ca2bc99a9a7f627cfd41f99dec629..752ba0495476aa3403cee8aa7ef7cdd8e7bbdc8f 100644 (file)
--- a/test/confs/0416
+++ b/test/confs/0416
@@ -1,13 +1,7 @@
 # Exim test configuration 0416
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0417 b/test/confs/0417
index e107c5a6eb8ed55b5c75f2a696ecfc024ed8f344..41c5ed975c88386e896368b4ccbe9b76503248bd 100644 (file)
--- a/test/confs/0417
+++ b/test/confs/0417
@@ -2,14 +2,8 @@
 
 RETURN_ERROR_DETAILS = false
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0418 b/test/confs/0418
index f6d7bae8d41cb9699346d6bdf88dd4f74bd12638..3ab5740c07c62a590554fc3d21ab4d331d5986b5 100644 (file)
--- a/test/confs/0418
+++ b/test/confs/0418
@@ -1,13 +1,7 @@
 # Exim test configuration 0418
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0419 b/test/confs/0419
index a8c7d7d6d0c4ff933c8fb7744cf1a6dd1f343a43..39f634c632d8d358c1ef181ddd9ba47512aa6879 100644 (file)
--- a/test/confs/0419
+++ b/test/confs/0419
@@ -1,13 +1,7 @@
 # Exim test configuration 0419
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0420 b/test/confs/0420
index 204e86e3c3d398b3f487624a2af6a8a7eee332b1..a115c7249883f19ce1aa11157b80e1d3277cb4f1 100644 (file)
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -1,13 +1,7 @@
 # Exim test configuration 0420
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0421 b/test/confs/0421
index 6b1143394e356913b4d1c8a56c3e30f78b61f411..6d12ce20bce143e8adb0d0750be681bca8a3adeb 100644 (file)
--- a/test/confs/0421
+++ b/test/confs/0421
@@ -1,13 +1,7 @@
 # Exim test configuration 0421
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0422 b/test/confs/0422
index 567bb7853cec6c7ff2fef6d1fa9864f6fadd90ba..14255d621293b84b0f80cda01e39d141e31e6fd7 100644 (file)
--- a/test/confs/0422
+++ b/test/confs/0422
@@ -1,13 +1,7 @@
 # Exim test configuration 0422
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0423 b/test/confs/0423
index c6228f7e121b840a092196a2e51d1f855ade4b4c..3effe6cc45b77a93f6e31e5630cd58ea665de45e 100644 (file)
--- a/test/confs/0423
+++ b/test/confs/0423
@@ -1,13 +1,7 @@
 # Exim test configuration 0423
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0424 b/test/confs/0424
index 0efbd639312215f86b89fab24eb6aaba59280b8b..2ce709db06dbf6ff9d77d62aa85b8f1261905776 100644 (file)
--- a/test/confs/0424
+++ b/test/confs/0424
@@ -1,13 +1,7 @@
 # Exim test configuration 0424
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0425 b/test/confs/0425
index 688cecf2205cf9438acc6c5e6069246773c55188..6c9383a41db9631e6614919385bc80fd7032b198 100644 (file)
--- a/test/confs/0425
+++ b/test/confs/0425
@@ -1,13 +1,7 @@
 # Exim test configuration 0425
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0426 b/test/confs/0426
index 70e9a1a4358b5d221a160c1d28e109e231d2a7fa..fbac9ecfd203ab9ab9bf71f31b6d7ab814fa90ed 100644 (file)
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -1,13 +1,7 @@
 # Exim test configuration 0426
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0427 b/test/confs/0427
index 68f5512aa522faf5fb5e04ef9eca719202b8383a..cdbc8ae3ef86b86406d3d102eb4c57361d1b4767 100644 (file)
--- a/test/confs/0427
+++ b/test/confs/0427
@@ -1,13 +1,7 @@
 # Exim test configuration 0427
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0428 b/test/confs/0428
index 2c14aad61a0c008daa71425d0de0d9b56303f7cd..38601f30bf488888031afddda75b30e57ccf692d 100644 (file)
--- a/test/confs/0428
+++ b/test/confs/0428
@@ -1,13 +1,7 @@
 # Exim test configuration 0428
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0429 b/test/confs/0429
index b543b05ca88e0f60b62a0f933e074ebe74c8d7a3..49df930014020595b5a2c45385ce5a89c66f5be3 100644 (file)
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -1,14 +1,8 @@
 # Exim test configuration 0429
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0430 b/test/confs/0430
index dd3a96ab061c078acabd69dbf30f8bcbed154556..552b0d010320b1e6e6f90064361b1ed9525b66fe 100644 (file)
--- a/test/confs/0430
+++ b/test/confs/0430
@@ -3,15 +3,9 @@
 LIST=
 SELF=freeze
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0431 b/test/confs/0431
index 497481ef317a3769de0d8f30f50a42d7ca50fc06..7590fa9d47c8a2019776174ffd7813347d5bd661 100644 (file)
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -2,15 +2,9 @@
 
 AFFIX=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0432 b/test/confs/0432
index bc1dc93deea54220e88eaed5636f1b45f8dcae80..e8e6e3552cee2b0d5f40fd9ac0a0e991e9fc59d6 100644 (file)
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -1,14 +1,8 @@
 # Exim test configuration 0432
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0433 b/test/confs/0433
index 81860a5edc35552d48c6b4aef1d382f7426f26a4..55fb85e96b17b9b378f830453132e20d81034991 100644 (file)
--- a/test/confs/0433
+++ b/test/confs/0433
@@ -4,15 +4,9 @@ PORT=
 IFACE=
 
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0434 b/test/confs/0434
index aeff22f83adeb81296caadb8f161447332b109ea..0d77fa095651a98f9bf42ae63fb754abde111b22 100644 (file)
--- a/test/confs/0434
+++ b/test/confs/0434
@@ -2,15 +2,9 @@
 
 ELI=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0435 b/test/confs/0435
index 92dc1abb808e6bc8815168b66b6568805bc1dbea..21148174ffad1231a48eb1d0387428e9ff0d13ff 100644 (file)
--- a/test/confs/0435
+++ b/test/confs/0435
@@ -1,14 +1,8 @@
 # Exim test configuration 0435
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0436 b/test/confs/0436
index c9ac15027d051f7c03a6681f36758eb5986f1cab..2fcaef96143f8f57b4e6d3e07333b23aa3ab992b 100644 (file)
--- a/test/confs/0436
+++ b/test/confs/0436
@@ -1,14 +1,8 @@
 # Exim test configuration 0436
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0438 b/test/confs/0438
index 0a966451c367efe2bc55ad57a3979ee722ad3c6c..bf1b55061d5540ace9de6062a7987f6c614cf06f 100644 (file)
--- a/test/confs/0438
+++ b/test/confs/0438
@@ -1,14 +1,8 @@
 # Exim test configuration 0438
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0439 b/test/confs/0439
index 25199dff8a54d47b8ad3f55adeb397e6641ea728..feb42f5960d16860251dda1b0fb94ee03d398266 100644 (file)
--- a/test/confs/0439
+++ b/test/confs/0439
@@ -1,14 +1,8 @@
 # Exim test configuration 0439
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0440 b/test/confs/0440
index 7f264c84d1ba7f8f2b4e7ebd2ff0b39d92d0bac5..2bef8c96158eb1dd6c336160299c4e8a1af53e5f 100644 (file)
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -1,14 +1,8 @@
 # Exim test configuration 0440
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0441 b/test/confs/0441
index 89adf7f97e47bb161271fafc563910f14d22cc6a..71153a7fed616c73aa19906d4d6c04bd5fa4764b 100644 (file)
--- a/test/confs/0441
+++ b/test/confs/0441
@@ -1,14 +1,8 @@
 # Exim test configuration 0441
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0442 b/test/confs/0442
index 0deb598c991fc055a301c8e87e107ddc20d8d8b0..2e1b17dee625fe6b06a7fea937d3e90b9760a509 100644 (file)
--- a/test/confs/0442
+++ b/test/confs/0442
@@ -2,15 +2,9 @@
 
 BAD=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0443 b/test/confs/0443
index df03b5dfb76748bb46c8871e650346aaa2b6e596..154c8edba0cb8347d82d444c6639021c78d22366 100644 (file)
--- a/test/confs/0443
+++ b/test/confs/0443
@@ -1,14 +1,8 @@
 # Exim test configuration 0443
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0444 b/test/confs/0444
index 182d1021accc7be56b2d197ac51431dd6f9a9a5d..2c103ff69a5ccad61af6ae7b57e99b9f173e715e 100644 (file)
--- a/test/confs/0444
+++ b/test/confs/0444
@@ -1,14 +1,8 @@
 # Exim test configuration 0444
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0445 b/test/confs/0445
index 5d1a3e92d29b76eed35fe8effd128cc6261f4bef..f42606b1207552773ff97029437c33cc7536dc08 100644 (file)
--- a/test/confs/0445
+++ b/test/confs/0445
@@ -1,14 +1,8 @@
 # Exim test configuration 0445
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0446 b/test/confs/0446
index 290ea60beba4407e52dbd5a4810398d9d029e9b4..90e8a0245a8ffc2ceffb997f514ebe9beea0b00a 100644 (file)
--- a/test/confs/0446
+++ b/test/confs/0446
@@ -1,14 +1,8 @@
 # Exim test configuration 0446
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0447 b/test/confs/0447
index 2b4e5935f37d76900b179cab1c257835bf74588c..57b992d1b6174b2c5babd84089012198b7b2cd9d 100644 (file)
--- a/test/confs/0447
+++ b/test/confs/0447
@@ -2,15 +2,9 @@
 
 INSERT=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0448 b/test/confs/0448
index cadec6310f44130777e671ea94666ed96a9cb01a..f18f8f5395a99ccdf6c2036a4f81529178504941 100644 (file)
--- a/test/confs/0448
+++ b/test/confs/0448
@@ -1,14 +1,8 @@
 # Exim test configuration 0448
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0449 b/test/confs/0449
index 6345b5897683d5bd6e60af233e59004e75e6d8df..d08da83417756008154c2a3080caab271f608b03 100644 (file)
--- a/test/confs/0449
+++ b/test/confs/0449
@@ -1,14 +1,8 @@
 # Exim test configuration 0449
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0450 b/test/confs/0450
index 511362db52785f9b0f7b841f975d75c13b456283..2dff861a11545d696f4c55c48a7b54bee5d1301f 100644 (file)
--- a/test/confs/0450
+++ b/test/confs/0450
@@ -2,15 +2,9 @@
 
 EXTRA=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0451 b/test/confs/0451
index 0e7e0b14e8edcc390c7ae853f1b6562c1d5373a1..7d25049d4b2cbf8b61ed625a4828017458de5786 100644 (file)
--- a/test/confs/0451
+++ b/test/confs/0451
@@ -1,14 +1,8 @@
 # Exim test configuration 0451
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0452 b/test/confs/0452
index f7b7aa40aa02c6c09f465b4d210cfb9185df8b1a..a94295a986f1f7ae19a025c197a6d03e338ab31b 100644 (file)
--- a/test/confs/0452
+++ b/test/confs/0452
@@ -1,14 +1,8 @@
 # Exim test configuration 0452
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0453 b/test/confs/0453
index 755a9c00028cb77781c324d5474bbe8135d15ba2..3ecc86591fb36c03373e362c9e7b5348007af542 100644 (file)
--- a/test/confs/0453
+++ b/test/confs/0453
@@ -2,15 +2,9 @@
 
 LIMIT=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0454 b/test/confs/0454
index 2afdf517bda479b16e0a5a5e204d586e9417081a..359d0d91735087e9dfd8c0754605284ad728627f 100644 (file)
--- a/test/confs/0454
+++ b/test/confs/0454
@@ -1,14 +1,8 @@
 # Exim test configuration 0454
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0455 b/test/confs/0455
index 5937b4f04a8d4cc2f04d420a8f1fb483acd76268..390c28a9592c9a718be76e88035917d7e5d7619c 100644 (file)
--- a/test/confs/0455
+++ b/test/confs/0455
@@ -2,14 +2,8 @@
 
 HOSTS_MAX_TRY=4
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0456 b/test/confs/0456
index b62274ce944defbd9d0116bbcc4eb6224ea6e366..362d6b5490a3c225d22b4d55db48279ac59e19c7 100644 (file)
--- a/test/confs/0456
+++ b/test/confs/0456
@@ -2,14 +2,8 @@
 
 HOSTS_MAX_TRY=4
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0457 b/test/confs/0457
index b8f3d6d144944c1e497b62cb4e6d829a805eef6f..866950e9a067e44f873c15f5e91b8fb85f7a8484 100644 (file)
--- a/test/confs/0457
+++ b/test/confs/0457
@@ -1,13 +1,7 @@
 # Exim test configuration 0457
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0458 b/test/confs/0458
index 4ddcba5f7f86e3c08fd90840cc68ac43996da780..e964cb0c7a18fe435e2d2ddae84049d53463f885 100644 (file)
--- a/test/confs/0458
+++ b/test/confs/0458
@@ -1,14 +1,8 @@
 # Exim test configuration 0458
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0459 b/test/confs/0459
index b07df6634297b2fc1d55cb0d44c65be695b50f99..46d0375573ea1011123fd08894532e2e3593e34b 100644 (file)
--- a/test/confs/0459
+++ b/test/confs/0459
@@ -1,14 +1,8 @@
 # Exim test configuration 0459
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0460 b/test/confs/0460
index b40bd0ce6d2efdfcefbd207f7949476d866687f3..52628ab25aa7f36af93e1e13e68c19ec7eaff9ac 100644 (file)
--- a/test/confs/0460
+++ b/test/confs/0460
@@ -1,14 +1,8 @@
 # Exim test configuration 0460
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0461 b/test/confs/0461
index ac0206b1e72303d86c2890e9e386fdc95aa9ae40..30abd50a9d3a5cd8dc4528c11fb33a47f2a6d33e 100644 (file)
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -5,15 +5,9 @@ ROUTE_DATA=V4NET.0.0.1
 RETRY1=1s
 RETRY2=2s
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0462 b/test/confs/0462
index 84b63e1e4ad7a28a2e6af9f38424b621f553cb7f..36d18412d0fa357c0d8893756ce301ac830f91c9 100644 (file)
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -2,15 +2,9 @@
 
 SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0463 b/test/confs/0463
index 1dcb8bd18f8596a24ae3d42ddc67b259031f0e21..8be1d95c14756f4b862b8bd256f629848948d09b 100644 (file)
--- a/test/confs/0463
+++ b/test/confs/0463
@@ -1,14 +1,8 @@
 # Exim test configuration 0463
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0464 b/test/confs/0464
index ddf1afc797d15b8547e26670b404a7dea3a08ce4..21e41cb08f93c6dd0e43857b0cc1bd2528cfa2a1 100644 (file)
--- a/test/confs/0464
+++ b/test/confs/0464
@@ -1,14 +1,8 @@
 # Exim test configuration 0464
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0465 b/test/confs/0465
index 35efd39a17b810856ca8e294337cf6f656862746..45ec3314e4aa38b7bc911605596f696d759d2518 100644 (file)
--- a/test/confs/0465
+++ b/test/confs/0465
@@ -2,15 +2,9 @@
 
 STD=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0466 b/test/confs/0466
index 3544af28988deec47cf53b7cd7cded7f45e8c009..880a41e33bb4b97f2a879bf7807ec37eb2ed531c 100644 (file)
--- a/test/confs/0466
+++ b/test/confs/0466
@@ -1,14 +1,8 @@
 # Exim test configuration 0466
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0467 b/test/confs/0467
index 9479b2b0b175fd1ee922fd7a26c8b3293cae36a0..147aca64e009485060e5167e1bbab4ef06635744 100644 (file)
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -2,15 +2,9 @@
 
 SRV=smtp
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0468 b/test/confs/0468
index 9eb84e1a62b776c508108d515c3642fca2cc1102..c04a04e617ee232ca9b40d2b41d429a7f156c04e 100644 (file)
--- a/test/confs/0468
+++ b/test/confs/0468
@@ -2,15 +2,9 @@
 
 SRV=smtp
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0469 b/test/confs/0469
index 8bf9e3408877c1734b801f17bf41d9099c707b36..a008dde0002916bbc2fa00af5212857c22dc6091 100644 (file)
--- a/test/confs/0469
+++ b/test/confs/0469
@@ -2,15 +2,9 @@
 
 SRV=smtp
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0470 b/test/confs/0470
index e02aa4ccd96aa6099663aee60bbc78729753ada9..a0f0b502763437eb1a0b76fc4178e247f25845be 100644 (file)
--- a/test/confs/0470
+++ b/test/confs/0470
@@ -2,15 +2,9 @@
 
 SRV=smtp
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0471 b/test/confs/0471
index d6e918816aacb6daed291c201fe3faceba46070a..f7e0a9f0bec58cb3cc0556ae50753f3ff11de121 100644 (file)
--- a/test/confs/0471
+++ b/test/confs/0471
@@ -1,14 +1,8 @@
 # Exim test configuration 0471
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0472 b/test/confs/0472
index 6bbd93fac68a5dd1170e61199f683564d772245d..09d563329648f0c14c2ab50b0ed9ec2acffbac19 100644 (file)
--- a/test/confs/0472
+++ b/test/confs/0472
@@ -2,15 +2,9 @@
 
 FUSER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0473 b/test/confs/0473
index d733ff9eab06f6de4e56da87e1d18d3f51059c06..6dd6b8898148a1f274d0e246ddabd0bc40b0d08e 100644 (file)
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -3,14 +3,8 @@
 USE_SENDER = ,use_sender
 ACL_RCPT = acl_rcpt
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0474 b/test/confs/0474
index bb6cfaf1c1e02076e82803460cbb65a74cdfd1a6..35b4805e553a4c56b0e5161f55bd2e96320c3181 100644 (file)
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -1,13 +1,7 @@
 # Exim test configuration 0474
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0475 b/test/confs/0475
index 4a38bec162504311f86e51be42508a1c51bf9f94..dfca55c7857054186570e4939dbf5e1b0b3ce711 100644 (file)
--- a/test/confs/0475
+++ b/test/confs/0475
@@ -1,13 +1,7 @@
 # Exim test configuration 0475
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0476 b/test/confs/0476
index c6710989502459ef4adef4640956e8767815e0a6..fd6106b162390b4181be5decad6a431f7eedb980 100644 (file)
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -1,13 +1,7 @@
 # Exim test configuration 0476
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0477 b/test/confs/0477
index edca4b2123b47e38cca8bc409c3c0a980cc7ce64..04d8365916c8019598c5de9c009b28591fc7d808 100644 (file)
--- a/test/confs/0477
+++ b/test/confs/0477
@@ -1,13 +1,7 @@
 # Exim test configuration 0477
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0478 b/test/confs/0478
index 243e47b2aa22c77a8f2b68618dc0d22b0d940b75..d9fd0a5ce162173357eedae8e832a6ee7b938f08 100644 (file)
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -2,14 +2,8 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0479 b/test/confs/0479
index 67462c3d2b553b09d59343c7ab232bf2ad8d72f6..bfb9b86134ad1e2772151b7b60529777b73434e0 100644 (file)
--- a/test/confs/0479
+++ b/test/confs/0479
@@ -1,13 +1,7 @@
 # Exim test configuration 0479
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0480 b/test/confs/0480
index 2b399144aa7f88e6d23059bb40183f0c8f2e31c3..6c2b688ecac33cbb84b3e4246af9d2bd6fe95c34 100644 (file)
--- a/test/confs/0480
+++ b/test/confs/0480
@@ -6,14 +6,8 @@ IP3=V4NET.0.0.3
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0481 b/test/confs/0481
index c4f512fee63739c24a19f884573052808375d2f3..ae1b788194c417263c456c0b15746b41bed5ef0a 100644 (file)
--- a/test/confs/0481
+++ b/test/confs/0481
@@ -1,14 +1,8 @@
 # Exim test configuration 0481
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0482 b/test/confs/0482
index 7f590909e02c769633f21b4d6614d11e9e8e3c07..ba29b81db4768e3ca27e8754cfa98a066986af52 100644 (file)
--- a/test/confs/0482
+++ b/test/confs/0482
@@ -1,14 +1,8 @@
 # Exim test configuration 0482
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0483 b/test/confs/0483
index 4475165fe93af3b88db5ba9964144fd1dfc57b1b..e9c1f09e5ba6096b93f433780f14b98357b3b67d 100644 (file)
--- a/test/confs/0483
+++ b/test/confs/0483
@@ -1,14 +1,8 @@
 # Exim test configuration 0483
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0484 b/test/confs/0484
index 7c44a284542cd3a748762b0269a3b8f0b9af6aee..65ca274f2e5284a8a04f41a2734d3ef8db8a1007 100644 (file)
--- a/test/confs/0484
+++ b/test/confs/0484
@@ -1,14 +1,8 @@
 # Exim test configuration 0484
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0485 b/test/confs/0485
index b1864e9bd7efd51730745172da30359851052615..ad31830e0a3e02e47b184d282b35673746c4e84c 100644 (file)
--- a/test/confs/0485
+++ b/test/confs/0485
@@ -1,14 +1,8 @@
 # Exim test configuration 0485
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0486 b/test/confs/0486
index 6b0a2a21c32e92fd82bcdb80f1c01ecb8b14b395..40c99511260cad051e415daf238f43525e6bc595 100644 (file)
--- a/test/confs/0486
+++ b/test/confs/0486
@@ -1,14 +1,8 @@
 # Exim test configuration 0486
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0487 b/test/confs/0487
index 8511955bab18fd0908ab79bddab6215d32d588fa..a9c1babc02e98e25f6636d0b5ff3ffa19c4efe68 100644 (file)
--- a/test/confs/0487
+++ b/test/confs/0487
@@ -1,14 +1,8 @@
 # Exim test configuration 0487
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0488 b/test/confs/0488
index ad1748eb1e748cf0944039207b2ed03f14e0f5a8..de7a7af2945114209b6df340fa8d0452ccc23af6 100644 (file)
--- a/test/confs/0488
+++ b/test/confs/0488
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0489 b/test/confs/0489
index fcf666062595fcc38715943ee8a81a0ea04e1196..878565d213f56a87f7ff4141df1d57eb5ab47cea 100644 (file)
--- a/test/confs/0489
+++ b/test/confs/0489
@@ -1,14 +1,8 @@
 # Exim test configuration 0489
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0490 b/test/confs/0490
index e4acefb1d007c8c532f72f70975d03fa10f1aada..ca3c1c2fed4b245d34a2296e9d81fcd9543e28dd 100644 (file)
--- a/test/confs/0490
+++ b/test/confs/0490
@@ -1,14 +1,8 @@
 # Exim test configuration 0490
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0491 b/test/confs/0491
index a25b6ad7cc1b4f55abe77779ad06adaff4bb9074..c7d3eaec0307dddfb912631e16c74d8657ce6359 100644 (file)
--- a/test/confs/0491
+++ b/test/confs/0491
@@ -3,15 +3,9 @@
 UL=abc@xyz
 REWRITE=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0492 b/test/confs/0492
index 8e76eb74355f06f3289e29f23a71711d0ee0c751..a939fe12572d1d21251800b8dae3f61a29edbae1 100644 (file)
--- a/test/confs/0492
+++ b/test/confs/0492
@@ -1,14 +1,8 @@
 # Exim test configuration 0492
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0493 b/test/confs/0493
index 675490770c3f77dd2b4b286280ee0d4afb48fc30..dd38fbc49b2153a5ee81eb23a519ec6d7eb97935 100644 (file)
--- a/test/confs/0493
+++ b/test/confs/0493
@@ -1,14 +1,8 @@
 # Exim test configuration 0493
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0494 b/test/confs/0494
index d12d4c07b865b824f88060cd406de34a9157c063..8027cf4823781dedd3e8dc3813762a4a7cc017bb 100644 (file)
--- a/test/confs/0494
+++ b/test/confs/0494
@@ -1,14 +1,8 @@
 # Exim test configuration 0494
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0495 b/test/confs/0495
index a9585e006fa9aa586ccd03b0046dd55c57a287c4..5bfec709fce870b38175255250d505967d2ac69c 100644 (file)
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -1,14 +1,8 @@
 # Exim test configuration 0495
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0496 b/test/confs/0496
index 6f8add61de5072633f832bfdbef7344b596a3dc3..351cd802a06892bb955672771c4f3a4fa0cca875 100644 (file)
--- a/test/confs/0496
+++ b/test/confs/0496
@@ -1,14 +1,8 @@
 # Exim test configuration 0496
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0497 b/test/confs/0497
index 08fc066318fc82a56139f18f14d370b1daa4af91..2154c3c2cb2f49f34b07f4de93cb44e123fab1d5 100644 (file)
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -1,14 +1,8 @@
 # Exim test configuration 0497
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0498 b/test/confs/0498
index 899b14a3d60469d6a2dfac665c543f457e16bc5b..c26f43a8a0fdeedd25dff5456f6fe2ce183d5841 100644 (file)
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -1,14 +1,8 @@
 # Exim test configuration 0498
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0499 b/test/confs/0499
index 0261f1ee3acc925d59457f30e667e742170b6637..b7a0b7980ed8e303bfacb91f998afb8667b1b564 100644 (file)
--- a/test/confs/0499
+++ b/test/confs/0499
@@ -1,14 +1,8 @@
 # Exim test configuration 0499
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0500 b/test/confs/0500
index ac9c6eec6965f49efeb5cd00b4694034fbb524c1..f3b225c66f83ffac6a825c4156919da09603982b 100644 (file)
--- a/test/confs/0500
+++ b/test/confs/0500
@@ -1,14 +1,8 @@
 # Exim test configuration 0500
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0501 b/test/confs/0501
index 6acd356e2e03348a9bef841a087d6f7a4ff4a187..f3085e83996f5d42c60122329fcc794ba5c0806c 100644 (file)
--- a/test/confs/0501
+++ b/test/confs/0501
@@ -1,14 +1,8 @@
 # Exim test configuration 0501
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0502 b/test/confs/0502
index a9df68e180247e4002217dc4c66dcd40e035e719..d1314891defacc7bdba8a032e35be73178729312 100644 (file)
--- a/test/confs/0502
+++ b/test/confs/0502
@@ -2,15 +2,9 @@
 
 LAST=accept message = Your message here
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0503 b/test/confs/0503
index 50e3300936c36d7a2723ad279f0ef1e3260d9006..aab6cdb5404e91abdc2ec6cccc2d631117a322a0 100644 (file)
--- a/test/confs/0503
+++ b/test/confs/0503
@@ -2,15 +2,9 @@
 
 MSIZE=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0504 b/test/confs/0504
index 687173b4a7983ec8cf8e449c11026687edacea13..b2dadfcb3c1d9f23597cdb9f0a32623ff6e1ee6c 100644 (file)
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -1,14 +1,8 @@
 # Exim test configuration 0504
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0505 b/test/confs/0505
index c931db4d3490f95b47c95668107bdd6223e8c8c1..99b64bfa3a80ad91f1e0e31b7383e2b9e649bee7 100644 (file)
--- a/test/confs/0505
+++ b/test/confs/0505
@@ -4,15 +4,9 @@ ACL=
 CONTROL=
 RECIPIENT=acl_smtp_rcpt=accept
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0506 b/test/confs/0506
index 971de86e28b4fdfa179976dd67c2e88dc721e96c..d20db5f2f4bc3addb843f5688a2bbcff75c485d7 100644 (file)
--- a/test/confs/0506
+++ b/test/confs/0506
@@ -3,15 +3,9 @@
 ALLOW=allow_filter
 FORBID=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0507 b/test/confs/0507
index a204f64fd7f0e85d6143c01a3d43104790dbdc6c..6449e056ad2bbb7c1ec41b04bcde28629cd1e119 100644 (file)
--- a/test/confs/0507
+++ b/test/confs/0507
@@ -2,15 +2,9 @@
 
 ERROR_DETAILS=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0508 b/test/confs/0508
index 9dadd713933067f8a21cf885ac55030f8403d8ca..17a1dec10427d935a377bf1bd6bccf4da8b27151 100644 (file)
--- a/test/confs/0508
+++ b/test/confs/0508
@@ -1,14 +1,8 @@
 # Exim test configuration 0508
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0509 b/test/confs/0509
index 9ca2a3759a809375e51c40f51b5d6ab4286826c4..bc3dc50a8a18b557c97ee2f1fe5c97b7cd528740 100644 (file)
--- a/test/confs/0509
+++ b/test/confs/0509
@@ -1,14 +1,8 @@
 # Exim test configuration 0509
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0510 b/test/confs/0510
index b8545dc5367070f7443eebc73b382a94a24eee8d..c73a1b402b8ba78b1180ca797238529b12f17dc5 100644 (file)
--- a/test/confs/0510
+++ b/test/confs/0510
@@ -1,14 +1,8 @@
 # Exim test configuration 0510
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0511 b/test/confs/0511
index af87c3011c4e56cb9b8cb85e9b7c32251c96d13a..1ecc19998e35c70aac4c890d0a7b9cf14926ca3b 100644 (file)
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -1,14 +1,8 @@
 # Exim test configuration 0511
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0512 b/test/confs/0512
index f2da0f30459dabe71cd8acfe617349676715bc71..15e424a5139ede6cc8fc44d4fa0b6203b8072ee2 100644 (file)
--- a/test/confs/0512
+++ b/test/confs/0512
@@ -2,15 +2,9 @@
 
 HARDLIMIT=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0513 b/test/confs/0513
index b023de35de19814d66b1619b37c910324056de29..d449a81ea92a6c8004819e2397cfef9d7ef8b4c4 100644 (file)
--- a/test/confs/0513
+++ b/test/confs/0513
@@ -2,15 +2,9 @@
 
 HARDLIMIT=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0514 b/test/confs/0514
index 7c0cb1b7edcf15714cd7bb56cb4048e2a2f844a0..36a2ac3d206e0e53080c1526a8e01e8912912f74 100644 (file)
--- a/test/confs/0514
+++ b/test/confs/0514
@@ -1,14 +1,8 @@
 # Exim test configuration 0514
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0515 b/test/confs/0515
index af38a156882299a9138e01716dbc5605160c1e99..c3f57ba2c1785f7c987eddd75176c74d25a7304c 100644 (file)
--- a/test/confs/0515
+++ b/test/confs/0515
@@ -1,14 +1,8 @@
 # Exim test configuration 0515
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0516 b/test/confs/0516
index 086b880ec6833c98f222424552a1797d8531ebd3..78ebfd121bef3750dc32a6dce8ea289b5db97418 100644 (file)
--- a/test/confs/0516
+++ b/test/confs/0516
@@ -1,14 +1,8 @@
 # Exim test configuration 0516
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0517 b/test/confs/0517
index 6094e6be24b7baf9d052b3465447ad7abb35b3bb..cbb2d4dbbf48fffe98363e3d769982a15ae79db5 100644 (file)
--- a/test/confs/0517
+++ b/test/confs/0517
@@ -2,15 +2,9 @@
 
 ERROR_DETAILS=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0518 b/test/confs/0518
index b30acf42eeec31e4a34a66085dcf9253d41665b6..c413faa953c948926f6e3ab4e598ff07527a00dd 100644 (file)
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -1,14 +1,8 @@
 # Exim test configuration 0518
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0519 b/test/confs/0519
index 8a94855493306d812686c1a91a6a0b842cd05874..e6dbb009039f7783dbb61c5accf181701092530c 100644 (file)
--- a/test/confs/0519
+++ b/test/confs/0519
@@ -1,14 +1,8 @@
 # Exim test configuration 0519
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0520 b/test/confs/0520
index 083d49b7b9d9da68571ae07830e6e9e53cc9b83b..1106fd896e42d2fda7bd4fff18d84a433608bd14 100644 (file)
--- a/test/confs/0520
+++ b/test/confs/0520
@@ -1,14 +1,8 @@
 # Exim test configuration 0520
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0521 b/test/confs/0521
index b47129f146856377d83e965846553a1ef439f39a..8c9c7004280f9ff04aab127281d91cf335bc59d8 100644 (file)
--- a/test/confs/0521
+++ b/test/confs/0521
@@ -1,14 +1,8 @@
 # Exim test configuration 0521
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0522 b/test/confs/0522
index fb282b6e708f9a8eb17dcaac614ed06920c30663..4909db849d90d7c69c933b6d0c1fa61304cd1b8c 100644 (file)
--- a/test/confs/0522
+++ b/test/confs/0522
@@ -2,15 +2,9 @@
 
 TIMEOUTDEFER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0523 b/test/confs/0523
index 15374f8e27f10634922bbe7cb2685aea819c90fc..9415855d7008230b90b1f04bd385eebb658a1a79 100644 (file)
--- a/test/confs/0523
+++ b/test/confs/0523
@@ -1,14 +1,8 @@
 # Exim test configuration 0523
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0524 b/test/confs/0524
index a535db7058fcdaaf4cf1e7279baeb0f721225b23..a94122c388026c1c6453492ff3da1fba1263ba97 100644 (file)
--- a/test/confs/0524
+++ b/test/confs/0524
@@ -1,14 +1,8 @@
 # Exim test configuration 0524
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0525 b/test/confs/0525
index e1e736d4d9d6b836cb335a2b95f3d8f1ada1ec30..a6e429172bc08c5bd6e70de21e6650a5c49f24c9 100644 (file)
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -1,14 +1,8 @@
 # Exim test configuration 0525
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0526 b/test/confs/0526
index 8d0df009ef2ee35f12208913b6cdf6f499ce2744..e2e9276676dfdbc2abb7f730a4d7dc751dc5915a 100644 (file)
--- a/test/confs/0526
+++ b/test/confs/0526
@@ -1,14 +1,8 @@
 # Exim test configuration 0526
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0527 b/test/confs/0527
index 1b312078f39d2e521f46a41581e939b65c40c6bc..2932f6907a0750245bcfeefed24719b56823a678 100644 (file)
--- a/test/confs/0527
+++ b/test/confs/0527
@@ -1,14 +1,8 @@
 # Exim test configuration 0527
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0528 b/test/confs/0528
index 6b08d9cf08ff487c8ba35e167fbb2f732a08b6d1..e7313a5cace030cec684cc8cf5a3049b2d85c0af 100644 (file)
--- a/test/confs/0528
+++ b/test/confs/0528
@@ -1,14 +1,8 @@
 # Exim test configuration 0528
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0529 b/test/confs/0529
index 52c31a55e69ae5a34485104f2761e2b690ce2536..09e81d06e0368c0325202a9dbd5b45450960b859 100644 (file)
--- a/test/confs/0529
+++ b/test/confs/0529
@@ -1,14 +1,8 @@
 # Exim test configuration 0529
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0530 b/test/confs/0530
index f1f9b0dc5bd820b3cfad73907616c5461436d672..9eeb4cc9fa970d25a6e1943428f6f40f83688064 100644 (file)
--- a/test/confs/0530
+++ b/test/confs/0530
@@ -1,14 +1,8 @@
 # Exim test configuration 0530
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0531 b/test/confs/0531
index c7dc39e7ae72bd0de803e20d44bf55a7237f5603..2f72810cf2f0411ca9c5a91df23280a674b73593 100644 (file)
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -1,14 +1,8 @@
 # Exim test configuration 0531
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0532 b/test/confs/0532
index 1ba2162c41dc2b9ad12bd812835f05609aeed55d..e50c5de0e0b86d225e3760705c407c2898b18d95 100644 (file)
--- a/test/confs/0532
+++ b/test/confs/0532
@@ -2,15 +2,9 @@
 
 CONNECTCOND=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0533 b/test/confs/0533
index 1d48005e318fbc423ba4654dd8e0845b9a12b83e..1dbc83b61979181f7500d6b7fff17d0d75059360 100644 (file)
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -1,14 +1,8 @@
 # Exim test configuration 0533
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0534 b/test/confs/0534
index 4cb89c98fb08dda9fe88e64f8a1c4bba5473a481..db19f253ac20509bc3de6a21f572ec358119246d 100644 (file)
--- a/test/confs/0534
+++ b/test/confs/0534
@@ -1,14 +1,8 @@
 # Exim test configuration 0534
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0535 b/test/confs/0535
index 67b4bbab6c7db9ebdbc2a46318b7e2c762d65778..004f795f51ab6ebb4ad81258bb5f5034cf295f37 100644 (file)
--- a/test/confs/0535
+++ b/test/confs/0535
@@ -1,14 +1,8 @@
 # Exim test configuration 0535
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0536 b/test/confs/0536
index ba5baf10dc9777eeb0f656f53d85ee73643ae9bd..e451f81fe1bf9a542d1940e4a7e19487e2b14657 100644 (file)
--- a/test/confs/0536
+++ b/test/confs/0536
@@ -2,15 +2,9 @@
 
 FORBID_SMTP_CODE = false
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0537 b/test/confs/0537
index 90c901be4fc94326dedcb0eb1f97fe961452970b..2498dc3ce4528b690dfcd66640bd2051797d7339 100644 (file)
--- a/test/confs/0537
+++ b/test/confs/0537
@@ -2,16 +2,10 @@
 
 TRUSTED=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +smtp_mailauth
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0538 b/test/confs/0538
index 1c4cf990ed52050c847f57ad72e3bcc9089d6a5f..9081aa572950fd9a3ab79e32aff77144484b6bdb 100644 (file)
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -1,14 +1,8 @@
 # Exim test configuration 0538
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0539 b/test/confs/0539
index de89c3f6ce36a0efca3fcd31aebfa9b5f1a8b9c3..2ca8e253aa2a6a22eed6f6d2f9b7c674f4121083 100644 (file)
--- a/test/confs/0539
+++ b/test/confs/0539
@@ -1,14 +1,8 @@
 # Exim test configuration 0539
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0540 b/test/confs/0540
index b05108cf5fd78534e6ccf98a9474979921c64fdf..7ebbdd2b4340437f4c246c09ba5951764883f3be 100644 (file)
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -1,14 +1,8 @@
 # Exim test configuration 0540
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0541 b/test/confs/0541
index ffc20d0af1e9f4b77d7340673a8a0fb1369515ca..73e8284d9a00d2d3f52940da6a6a5d1a387c53d4 100644 (file)
--- a/test/confs/0541
+++ b/test/confs/0541
@@ -1,14 +1,8 @@
 # Exim test configuration 0541
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0542 b/test/confs/0542
index 36348e4f8f065d302425ae1cdc02db9818cb850a..ca824d5c172901a1514c539edd275db32a4e0237 100644 (file)
--- a/test/confs/0542
+++ b/test/confs/0542
@@ -1,14 +1,8 @@
 # Exim test configuration 0542
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0543 b/test/confs/0543
index 316e5abe4255bc4a20d877f304ad90a2c2fc3a96..88e74e58fed80391ece4ae9d0c54d6ff8d0ac053 100644 (file)
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -1,13 +1,7 @@
 # Exim test configuration 0543
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0544 b/test/confs/0544
index 8d656ed8822ba579cee3e702cb8f05aaf5f488a7..09949a3fafe8b96070732601856b2cfbb245e323 100644 (file)
--- a/test/confs/0544
+++ b/test/confs/0544
@@ -1,13 +1,7 @@
 # Exim test configuration 0544
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0545 b/test/confs/0545
index 890afb7b1c35787d946b9e0aaeb9df1788d79568..a78236a4a5b6bcdd2eaa08e33f7c9d8c5cf8dc92 100644 (file)
--- a/test/confs/0545
+++ b/test/confs/0545
@@ -1,13 +1,7 @@
 # Exim test configuration 0545
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0546 b/test/confs/0546
index 788ce905add966916aec8842f36e3e247662d06f..2d5cae7b30eeb6082983db9d6d8f8d625c513223 100644 (file)
--- a/test/confs/0546
+++ b/test/confs/0546
@@ -3,14 +3,8 @@
 HELO_MSG=One line
 RCPT_MSG=RCPT is OK
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0547 b/test/confs/0547
index 0e04da3f863c59195a69c20f789fed50d302a0be..5d172447eec07416253d7ce0ef32824e324fe9ee 100644 (file)
--- a/test/confs/0547
+++ b/test/confs/0547
@@ -2,15 +2,9 @@
 
 MAXNM = 100
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0548 b/test/confs/0548
index f0f418958cbd5478016655825960e8347cffaf43..3e1f0ebfc5e8335e9941085d6309894da75296da 100644 (file)
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -2,14 +2,8 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0549 b/test/confs/0549
index 4578f0c45c3c5b82c9d9450c81b937a72762abe3..f3da5f486b83836cfa014b30a191560162ed204b 100644 (file)
--- a/test/confs/0549
+++ b/test/confs/0549
@@ -1,14 +1,8 @@
 # Exim test configuration 0549
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0550 b/test/confs/0550
index 621c3a1f425201e62e4b2bb41a7e951c6a6857a0..caf3ceda7cab34c00a5c0cb70214f20de0494453 100644 (file)
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -1,14 +1,8 @@
 # Exim test configuration 0550
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0551 b/test/confs/0551
index a29f750516f2af5bad31af5e3bea00205c85d4ad..b37b74cf7b7495bcfd5af1e193e5b953354a1118 100644 (file)
--- a/test/confs/0551
+++ b/test/confs/0551
@@ -2,15 +2,9 @@
 
 LS=+pid
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0552 b/test/confs/0552
index f676cd4a22fd2b4be01552cdc5cc009f2266af6b..c4c2f5e98ed156fb133fc63baf2f46e2b509cbce 100644 (file)
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -3,15 +3,9 @@
 DDF=
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0553 b/test/confs/0553
index 523be00eb5d100c68bf2363f09d614667be230c8..c9ceaa59e5ac3f06902e2a0ba2fcedefbd244ef9 100644 (file)
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -3,15 +3,9 @@
 DCF =
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0554 b/test/confs/0554
index b76286b132a45b7dc4fda7cea70f7bf78322032f..cbcd357a9c7fbb085627b14e11ac90e51cde26fd 100644 (file)
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -1,14 +1,8 @@
 # Exim test configuration 0554
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0555 b/test/confs/0555
index eceba18b6e5a8ada6724339994a5af476fd91fcf..c86050fa6d69937fc02ca158591be1d4c4c72226 100644 (file)
--- a/test/confs/0555
+++ b/test/confs/0555
@@ -2,15 +2,9 @@
 
 FAKE=fakereject
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0556 b/test/confs/0556
index 16d8f9957bc16a92c77c8fe6e5fddf2fd66ad1cd..965d68120ab8826d1984cb0c88711a2cef087138 100644 (file)
--- a/test/confs/0556
+++ b/test/confs/0556
@@ -5,15 +5,9 @@ ACL_RCPT=accept
 ACL_PREDATA=accept
 PAH=127.0.0.1
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0557 b/test/confs/0557
index 0452e851de40e19c6c50edbf4a4ccb7c6c07642b..5c944e9cd052a4780d1a0d3f9ecbb002423f7381 100644 (file)
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -5,15 +5,9 @@ Y=
 HOSTS=
 HAI=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0558 b/test/confs/0558
index 55b149cf655d5e94b8b3a3bc41b1bf1003d5e119..c163cf37c9f2f9911b67e72570aaaf56aeb4ae92 100644 (file)
--- a/test/confs/0558
+++ b/test/confs/0558
@@ -1,14 +1,8 @@
 # Exim test configuration 0558
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0559 b/test/confs/0559
index dbcdc7b61f5d570387f397fd1d8930b2396bbd56..7f0107b157761f67575010a302c6379ac177d476 100644 (file)
--- a/test/confs/0559
+++ b/test/confs/0559
@@ -1,14 +1,8 @@
 # Exim test configuration 0559
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0560 b/test/confs/0560
index f7f85fc464718f229861ffb7c400a4eecbc9d3db..da6e7decdddfd68d6e06e657980fedf3ac6e93e1 100644 (file)
--- a/test/confs/0560
+++ b/test/confs/0560
@@ -1,14 +1,8 @@
 # Exim test configuration 0560
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0561 b/test/confs/0561
index f895e6c583d448ed2a718c5119e485b62912d59c..5ccf4dcc32e22f823a61c2e36d9fc16cf0c33e96 100644 (file)
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -2,15 +2,9 @@
 
 QOLL=true
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0562 b/test/confs/0562
index 31e631c9957fe067c670ad6898d7592f66beab6f..d79c8bb072825668ec47d162864423f1f768517c 100644 (file)
--- a/test/confs/0562
+++ b/test/confs/0562
@@ -1,14 +1,8 @@
 # Exim test configuration 0562
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0565 b/test/confs/0565
index 8233e1a79f2adc9cd72329ed3aec174556202452..0d053a08049099f6ec7aaf0d88d8bbb5e88d968b 100644 (file)
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -1,14 +1,8 @@
 # Exim test configuration 0565
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0566 b/test/confs/0566
index 34b36f53d436c3db60aa218846650dd640a1e7dc..cc661f78b4786612183483200b87ca7cde0ee406 100644 (file)
--- a/test/confs/0566
+++ b/test/confs/0566
@@ -1,15 +1,9 @@
 # Exim test configuration 0566
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +8bitmime
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0567 b/test/confs/0567
index c23d7da8a01bb7cc3935fad9d491c409ae5b5f45..2675665617ad89efea0581e7d812ab992b48a9d1 100644 (file)
--- a/test/confs/0567
+++ b/test/confs/0567
@@ -2,15 +2,9 @@
 
 CONNECTCOND=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0569 b/test/confs/0569
index b9bf32d73e63ff8e3c1cfdd4fc85b87c5466fe72..3d562b6e730fdb606386af9d94b36d71a2bbfb1a 100644 (file)
--- a/test/confs/0569
+++ b/test/confs/0569
@@ -1,14 +1,8 @@
 # Exim test configuration 0569
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0570 b/test/confs/0570
index 0ed683927c7bc844651e56f4fa02188271aa6167..1c2ca0a25a2642fe906b2298c25be5767b1dedf5 100644 (file)
--- a/test/confs/0570
+++ b/test/confs/0570
@@ -3,14 +3,8 @@
 
 OPTION =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0571 b/test/confs/0571
index 79b816ac7d69f3c65a578b52e6201ddb22f44bed..cf4881a0aa5f8a28c01c0afd465f4f56d0d7d934 100644 (file)
--- a/test/confs/0571
+++ b/test/confs/0571
@@ -2,15 +2,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0572 b/test/confs/0572
index 9ceeffc8ef64f3ba52a608133da83a03cccb280f..23da35a096f5391cf0fd6bd30005b145f7fde603 100644 (file)
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -2,15 +2,9 @@
 
 OPT =
 
-exim_path = EXIM_PATH
-keep_environment =
-hide host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0573 b/test/confs/0573
index 49169756f2c2f43badcdc526bacf9ceff6773f87..3c2b1aae14794d03df769a7c3722c0cddccb19ce 100644 (file)
--- a/test/confs/0573
+++ b/test/confs/0573
@@ -1,14 +1,8 @@
 # Exim test configuration 0573
 
-exim_path = EXIM_PATH
-keep_environment =
-hide host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0574 b/test/confs/0574
index 6b869514ae6f7cad524f83b4f9696971a928b3f2..9afc55247a072e7171bd994da5be874cc710ee12 100644 (file)
--- a/test/confs/0574
+++ b/test/confs/0574
@@ -1,14 +1,8 @@
 # Exim test configuration 0574
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0575 b/test/confs/0575
index d629e818d487af177d0e5af2d1d985000991c641..e99bba9176439d8ecb33ae3b89e1c9046d36d364 100644 (file)
--- a/test/confs/0575
+++ b/test/confs/0575
@@ -1,13 +1,7 @@
 # Exim test configuration 0575
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0576 b/test/confs/0576
index e75f94476127cc857153a23fe9e551ec6e9c7c4b..b75b6780484e0eade9323fdaf437c656db622bd3 100644 (file)
--- a/test/confs/0576
+++ b/test/confs/0576
@@ -2,14 +2,7 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 log_selector = +received_recipients +sender_on_delivery
 

diff --git a/test/confs/0600 b/test/confs/0600
index 103ecfbaab2d567a253795a870027363fa02e44a..29bc5bf1a7818f623f70d9f30f39bc55bcef0630 100644 (file)
--- a/test/confs/0600
+++ b/test/confs/0600
@@ -1,14 +1,8 @@
 # Exim test configuration 0600
 # utf8clean:string
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0602 b/test/confs/0602
index 9048b092c85244f7906c56c4b862eb305ed06837..12a789d122edfad9ee0c93d9b08787184df9d953 100644 (file)
--- a/test/confs/0602
+++ b/test/confs/0602
@@ -1,12 +1,6 @@
 # Exim test configuration 0602
 
-exim_path = EXIM_PATH
-keep_environment =
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 # ----- Main settings -----
 

diff --git a/test/confs/0603 b/test/confs/0603
index 44dc866064fcdfe3fccf5f606035b7041cb911e0..baa3ea08c665d2c7ff4f22479950769c26472646 100644 (file)
--- a/test/confs/0603
+++ b/test/confs/0603
@@ -7,17 +7,10 @@ untrusted_set_sender = *
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
 log_selector = +sender_on_delivery
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0604 b/test/confs/0604
index 80c130cbe08b2f7a330cd3e95b525f3fbfc261a1..ec5195511ee34c56ae0bd2290070da7a4e5e6ab2 100644 (file)
--- a/test/confs/0604
+++ b/test/confs/0604
@@ -6,17 +6,10 @@ untrusted_set_sender = *
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
 log_selector = +sender_on_delivery
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0605 b/test/confs/0605
index 0c81dea7b327aed5b27bc21f6ee55d9c287908cc..2b5185c576579eaef2208c99da439477256e9375 100644 (file)
--- a/test/confs/0605
+++ b/test/confs/0605
@@ -1,13 +1,6 @@
 # Exim test configuration 0605
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 # ----- Main settings -----
 

diff --git a/test/confs/0606 b/test/confs/0606
index b29bf45d3e27fbb1a2c805e3c523ce1f0e47ef74..25706976aae3f0e99faaea002036cfa57a92c88e 100644 (file)
--- a/test/confs/0606
+++ b/test/confs/0606
@@ -1,13 +1,6 @@
 # Exim test configuration 0606
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 slow_lookup_log = 1000
 

diff --git a/test/confs/0607 b/test/confs/0607
index a8ea019431fd763b9e7c580b7a4bd2f2c998023f..03c05231699621cf675149d8b0a2f539fce74cca 100644 (file)
--- a/test/confs/0607
+++ b/test/confs/0607
@@ -2,14 +2,7 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 log_selector = +received_recipients +sender_on_delivery
 

diff --git a/test/confs/0608 b/test/confs/0608
index 17ddc1b14d79d282cc5b3c05b9cddece65a18e1b..0ca40c770fff52f819d8a375d006a444d1952912 100644 (file)
--- a/test/confs/0608
+++ b/test/confs/0608
@@ -1,14 +1,8 @@
 # Exim test configuration 0608
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0609 b/test/confs/0609
index 45eb099d7f2665507b3c53cef20b63bebf647c26..e1ec0853efbfae59478f0b80623bd404a55f6de2 100644 (file)
--- a/test/confs/0609
+++ b/test/confs/0609
@@ -3,15 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0610 b/test/confs/0610
index 9f1e25307f99ec44b6a34954e6085f13434a19e6..0567d8aaf6d5fc5f2062df1148f82ee7f558e9ea 100644 (file)
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -2,17 +2,10 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
 log_selector = +sender_on_delivery
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0612 b/test/confs/0612
index cac65b1842ea5d487c2890751c6c7d99b23aa895..44f2e74d6bc58cbf924d283183fc7994bc10a845 100644 (file)
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -1,15 +1,9 @@
 # Exim test configuration 0612
 # log_defer_output on pipe transport
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0613 b/test/confs/0613
index a2243930a8f6ccf69256c12973c86579c720ba5b..5094759ebf23e07f994ad3bf672a8f033ff08bd3 100644 (file)
--- a/test/confs/0613
+++ b/test/confs/0613
@@ -1,15 +1,9 @@
 # Exim test configuration 0613
 # manualroute, hosts_randomize and multiple recipients
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0614 b/test/confs/0614
index 4d90095a781b92bece7e8487d16c6f909ffe7851..d19be4e7452de7cf492177fab9139c7783e46e62 100644 (file)
--- a/test/confs/0614
+++ b/test/confs/0614
@@ -1,15 +1,9 @@
 # Exim test configuration 0614
 # hosts_connection_nolog versus sender_host lists caching
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/1000 b/test/confs/1000
index 59c113d22411b42afca6f25b70669e550fb9a0c9..f27d4ff6f14d82196adbd02c273bedf4cd348534 100644 (file)
--- a/test/confs/1000
+++ b/test/confs/1000
@@ -2,15 +2,9 @@
 
 HL=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/1001 b/test/confs/1001
index 1fc4aaa1189ec496a5269acb398665072fe77b79..e4ed6779b3f1c8d03083215cbb8fca50972c3ef3 100644 (file)
--- a/test/confs/1001
+++ b/test/confs/1001
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/1002 b/test/confs/1002
index f39ea1e9ba7f1c014c34ee80e7dcbe675aee2583..f0a4518f3c3968dc87b7a0e70947fadebfafefcf 100644 (file)
--- a/test/confs/1002
+++ b/test/confs/1002
@@ -1,14 +1,8 @@
 # Exim test configuration 1002
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/1003 b/test/confs/1003
index b000339d8ad5fa0fd4c0d4a0c091d2f2743d2136..bdbd2e6c3f85ece3bb1b3e5a07a8c0bad542955e 100644 (file)
--- a/test/confs/1003
+++ b/test/confs/1003
@@ -2,15 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/1005 b/test/confs/1005
index f3a2b62a26b9bf0dd98da99dfa55c69a539dcc7f..35767932d67c59f169dd7cd5424c55cf7098c35b 100644 (file)
--- a/test/confs/1005
+++ b/test/confs/1005
@@ -1,13 +1,7 @@
 # Exim test configuration 1005
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/1006 b/test/confs/1006
index 56610fdff96bddadab5efde7802100a581a8412a..f46fba9323d2e1a260af8d5e93a0efdb6b52e35a 100644 (file)
--- a/test/confs/1006
+++ b/test/confs/1006
@@ -3,15 +3,9 @@
 SERVER=
 D6=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/1007 b/test/confs/1007
index 7ab9688cc1582a0fc3034bb4ae4511ae03a726f7..3f354f9c9b9f2f3a00fff2b5b831501117749fc3 100644 (file)
--- a/test/confs/1007
+++ b/test/confs/1007
@@ -4,15 +4,9 @@ PORT=
 IFACE=
 
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/1008 b/test/confs/1008
index 087ae5aeabbfa659c914b89ec933fb5a4ca6d15f..e3307044fc022b83591066c145f7ca15de397a46 100644 (file)
--- a/test/confs/1008
+++ b/test/confs/1008
@@ -1,13 +1,7 @@
 # Exim test configuration 1008
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/1009 b/test/confs/1009
index a9aa730f4e3fb47013a36927923cf5f8b9fd2633..af6e27642a1d49b1037722443ea44b0143867221 100644 (file)
--- a/test/confs/1009
+++ b/test/confs/1009
@@ -1,13 +1,7 @@
 # Exim test configuration 1009
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/1010 b/test/confs/1010
index ac4407168c0fe588d6c2c4eaa49fc6cb4d81535e..2f2456bc270e4cd70933b5311b88014f91521149 100644 (file)
--- a/test/confs/1010
+++ b/test/confs/1010
@@ -1,14 +1,8 @@
 # Exim test configuration 1010
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2000 b/test/confs/2000
index c34c4f31309e4b298306108b11bd6ef9234c059c..9ca325f2a27e49cc5093245e09cfff8883109a4c 100644 (file)
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2001 b/test/confs/2001
index f1dc480789604dca704bbe06b506ed2012c2c3a0..9ab4cc3844c244dfbea8eea03963d04db5150b62 100644 (file)
--- a/test/confs/2001
+++ b/test/confs/2001
@@ -3,14 +3,9 @@
 OPTION=
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2002 b/test/confs/2002
index 679dccf96c24bf22ab1ea4796f993ccf3a1018b0..535be91ebb52a5d39fd1f5a20fade4959626e686 100644 (file)
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -1,14 +1,9 @@
 # Exim test configuration 2002
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+
 timezone = UTC
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/2003 b/test/confs/2003
index 17a781911f52459d8fb2a3301fe65e14147ba3cd..c3eece620b501afb320798bde6ad0b0467cbd0cf 100644 (file)
--- a/test/confs/2003
+++ b/test/confs/2003
@@ -1,13 +1,8 @@
 # Exim test configuration 2003
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2004 b/test/confs/2004
index 7fc1ab2615c4ce4149deacc36bf3cae70f493316..4cd622cef85ef9a10c9cf2c443a009abc2f76c29 100644 (file)
--- a/test/confs/2004
+++ b/test/confs/2004
@@ -1,13 +1,8 @@
 # Exim test configuration 2004
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2005 b/test/confs/2005
index 519eb06ab8ebfc5fd8d92285f2d811cf3abb1abb..110bbef22402507600120172c35a31ba8790e2b8 100644 (file)
--- a/test/confs/2005
+++ b/test/confs/2005
@@ -1,13 +1,8 @@
 # Exim test configuration 2005
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2006 b/test/confs/2006
index 3808ceeb94db52053ca731ca95f7c16b0507b272..63ed36a4e7c16f0863519966f4cdc677dca43b75 100644 (file)
--- a/test/confs/2006
+++ b/test/confs/2006
@@ -1,13 +1,8 @@
 # Exim test configuration 2006
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2007 b/test/confs/2007
index 934387512f612754f98005e6a7c60076e6b2bdc1..7b58b73ee5e7285541b04d52a3b3d6d9afb09c35 100644 (file)
--- a/test/confs/2007
+++ b/test/confs/2007
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2008 b/test/confs/2008
index a84ced8a29eade733dfdf81b4683ce048c216c65..83b30502af8611e3f776ba90f012b8eec87c7a68 100644 (file)
--- a/test/confs/2008
+++ b/test/confs/2008
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 
 # ----- Main settings -----

diff --git a/test/confs/2009 b/test/confs/2009
index dbc8b871ef93939515cf57a778a29117c9ebea85..59139f27e05dbdd4dd8cd8beacb8ac7a7fddd23d 100644 (file)
--- a/test/confs/2009
+++ b/test/confs/2009
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2010 b/test/confs/2010
index bc1225fd35d5e5ff76997c696f5f0bf414e397cd..2cedb89cf9779df9558645dbd0e04a99f8501d32 100644 (file)
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -4,14 +4,9 @@ SERVER =
 TIMES =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2012 b/test/confs/2012
index 5148a90eac22bccaf52133a8651edd9cdbbab15e..8fbc555957e8b1af02566e54aec764d03975ec89 100644 (file)
--- a/test/confs/2012
+++ b/test/confs/2012
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com

diff --git a/test/confs/2013 b/test/confs/2013
index bddd8ac4a05b4c0d5dee0ec39a5ca89ef0ed6a74..ebd2536915c5eb5a0e5ef9a1382ccc0220b0ad36 100644 (file)
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2014 b/test/confs/2014
index f5fc2bb2d6216bfaebbdc05064fb77c7c8094227..f9e2e6a221d3918a0edcba01d05997ff809eaec8 100644 (file)
--- a/test/confs/2014
+++ b/test/confs/2014
@@ -2,14 +2,9 @@
 
 CRL=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2015 b/test/confs/2015
index cdf3e592b93775afb8759191ec1545f1e4f316b1..e17fc29e94b10258756492c25f5f3fd80dfe82a3 100644 (file)
--- a/test/confs/2015
+++ b/test/confs/2015
@@ -1,13 +1,8 @@
 # Exim test configuration 2015
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2016 b/test/confs/2016
index c706e2d119ae944cdb3bf806ab70c58793df4665..b14e1f30087da8d532d02fc5536bb933adbcfa11 100644 (file)
--- a/test/confs/2016
+++ b/test/confs/2016
@@ -1,13 +1,7 @@
 # Exim test configuration 2016
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/2017 b/test/confs/2017
index b61fba5873aabc24a109860614683765c8a77c06..a699f2d7855ae8fef764f16c7c2178ae4774e5ac 100644 (file)
--- a/test/confs/2017
+++ b/test/confs/2017
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2018 b/test/confs/2018
index 6f61f98321a6546b92ccf9f94d34a26a5514999d..58c1219e5af117ac337ccc94f9dedf9339e33e11 100644 (file)
--- a/test/confs/2018
+++ b/test/confs/2018
@@ -1,13 +1,8 @@
 # Exim test configuration 2018
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2019 b/test/confs/2019
index 57c527d30503915e059299e917565e0e7aace85e..fdc030c23b6930f5de4dffe7a9c3939105a285af 100644 (file)
--- a/test/confs/2019
+++ b/test/confs/2019
@@ -1,13 +1,8 @@
 # Exim test configuration 2019
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2021 b/test/confs/2021
index bb80cdd939199e877c434997b3debda3a40f37fd..ccd201719c64c2a4b5285606ed4e6f29e1ae874f 100644 (file)
--- a/test/confs/2021
+++ b/test/confs/2021
@@ -3,15 +3,9 @@
 REQUIRE=#
 TRYCLEAR=#
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2022 b/test/confs/2022
index b4d098c9473152e5951e43bbc2677a81b609048d..47892ceb57c548bd77101e2a1a1068ab00cfa826 100644 (file)
--- a/test/confs/2022
+++ b/test/confs/2022
@@ -1,13 +1,8 @@
 # Exim test configuration 2022
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2023 b/test/confs/2023
index e735334d6687f1f2d2b7f482cbccf84501f04abd..9f163092984a0281e3a9ccc93bb7b57438084e07 100644 (file)
--- a/test/confs/2023
+++ b/test/confs/2023
@@ -1,13 +1,8 @@
 # Exim test configuration 2023
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2024 b/test/confs/2024
index 9d10d006da83b2847ee52e349468b1bf5d44179f..64502d56b75006eb838ea554e1edcea2c44707cf 100644 (file)
--- a/test/confs/2024
+++ b/test/confs/2024
@@ -3,14 +3,9 @@
 CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2025 b/test/confs/2025
index ac1476b10945ee6641d6e0e05b7bd5316ec12b83..feaa815a1d3213628618df8c78e25623a1878850 100644 (file)
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2027 b/test/confs/2027
index 6429fec7dbde75fab77aa94bdbd9a6a243c37503..cc47218fb9ad98d89bd0377b361790bb49d8279d 100644 (file)
--- a/test/confs/2027
+++ b/test/confs/2027
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2028 b/test/confs/2028
index 71d708d57e92dcb276a8f882fe2026586a4cac86..68ca077be98bd47c744215052e9a95e57afa622f 100644 (file)
--- a/test/confs/2028
+++ b/test/confs/2028
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2029 b/test/confs/2029
index 0fdd8e617110c033922d0946731e350450ce48c4..40c56f0c2cd0cf37b10edb6ee7d3adef44b749be 100644 (file)
--- a/test/confs/2029
+++ b/test/confs/2029
@@ -1,13 +1,8 @@
 # Exim test configuration 2029
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2030 b/test/confs/2030
index 80bf30b3e0fcf0e3e73bbe9e49a59ad005d3465b..e2ee0e223023f8f7ad047d3746b883f3b7318c8a 100644 (file)
--- a/test/confs/2030
+++ b/test/confs/2030
@@ -3,15 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/2031 b/test/confs/2031
index d7e140844982ccadb84e02654bbaf575b94efd58..38713735b06200bd92902a835ab8b1128268e440 100644 (file)
--- a/test/confs/2031
+++ b/test/confs/2031
@@ -3,15 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/2032 b/test/confs/2032
index 0ecd87b44e380ccae2045e7e2d6f51a1c4d180fc..9f69adca272b61c5f55aa77b11c2e0b9ba6246ef 100644 (file)
--- a/test/confs/2032
+++ b/test/confs/2032
@@ -1,13 +1,8 @@
 # Exim test configuration 2032 (close copy of 2002)
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2033 b/test/confs/2033
index 944c5e7ca0f13f8bd2134f9b52fa8070db867253..73dcde61e16f3ec67724a0d578474ac37ec032e9 100644 (file)
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com

diff --git a/test/confs/2100 b/test/confs/2100
index df56723d3fb256af09775899fb5c5b5948dc7fc1..f61091683460ac58bab21e8f7603b1e3bb29ab59 100644 (file)
--- a/test/confs/2100
+++ b/test/confs/2100
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2101 b/test/confs/2101
index c404caaddcedae850bc86a014f12cc01463154f3..a0e1fe46f82cb4086d505b899f67f7d7b6875682 100644 (file)
--- a/test/confs/2101
+++ b/test/confs/2101
@@ -3,14 +3,9 @@
 OPTION=
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2102 b/test/confs/2102
index b7893de758e89cfc4d05e5a1b3bd0e0040975c6b..4223430a36f6ec1ece73da13964eab8162fd0bec 100644 (file)
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,14 +1,9 @@
 # Exim test configuration 2102
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+
 timezone = UTC
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/2103 b/test/confs/2103
index fc56df40d9c493fcfe9c0ff68af3a1c0e9a28c0c..a9daf05b743b0ab7f091c05aa294251eed98fd91 100644 (file)
--- a/test/confs/2103
+++ b/test/confs/2103
@@ -1,13 +1,8 @@
 # Exim test configuration 2103
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2104 b/test/confs/2104
index 8118ef889a0835dce1a81ed942c2858f2f26df54..7cd35f0e27b74a9324d0da4c8fb1c2d05a3cf9bb 100644 (file)
--- a/test/confs/2104
+++ b/test/confs/2104
@@ -1,13 +1,8 @@
 # Exim test configuration 2104
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2105 b/test/confs/2105
index 1b9444aa57492c14fb7bb80bae3df953a73319d7..c77c1547f3631142b429eeb5d56a3d76d2e1591c 100644 (file)
--- a/test/confs/2105
+++ b/test/confs/2105
@@ -1,13 +1,8 @@
 # Exim test configuration 2105
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2106 b/test/confs/2106
index 1857f6c94bf35b6aa57facad16b0df39d7505ad9..56d8d6a3d878a73e4ff737498c50af3ea34c76af 100644 (file)
--- a/test/confs/2106
+++ b/test/confs/2106
@@ -1,13 +1,8 @@
 # Exim test configuration 2106
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2107 b/test/confs/2107
index 34fb338bc515bb8b5a8e7faaf1bf051f8af8f6bd..9487445ccae2652e6d2487f9bf60513f00262d3e 100644 (file)
--- a/test/confs/2107
+++ b/test/confs/2107
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2108 b/test/confs/2108
index a32e7e46ad5b5673f0b856261a8b8b03beb0c39a..f09213be9b20ed56bfd4f07b9009f4037cc80a26 100644 (file)
--- a/test/confs/2108
+++ b/test/confs/2108
@@ -2,15 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/2109 b/test/confs/2109
index 4987211e12f3334ce4a64c81a0f49c37b7e264f8..8703d1967bfb0727af9963c09d0eec96d9736f8e 100644 (file)
--- a/test/confs/2109
+++ b/test/confs/2109
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2110 b/test/confs/2110
index 045f21d9a43f9eed2ee703065ed0f61ffce6d4f7..72754a6d9fccc62ea2fe3b80675a68c83ad3e38b 100644 (file)
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -3,14 +3,9 @@
 SERVER =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2111 b/test/confs/2111
index d69f2a612558848bf1a2119fe62dba09ce4f2b11..7f872fa06c859015f02516a42e720681455b3cfb 100644 (file)
--- a/test/confs/2111
+++ b/test/confs/2111
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2112 b/test/confs/2112
index 38283826d04b514510221ef27ae749f837a359ac..aab264820c3416753dcd9abf99b366e7c1d72889 100644 (file)
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com

diff --git a/test/confs/2113 b/test/confs/2113
index 3ba6bc6203828dd33bef58c9a13ea8e69dca13b5..f2c49c9b8941625533a37fefdb08f4c7ba53e492 100644 (file)
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2114 b/test/confs/2114
index d856e98bc904df76acb1ce9b2e93bf5a83af70d0..398e2135d988b49f7b14e24cb78eefcbd41ef981 100644 (file)
--- a/test/confs/2114
+++ b/test/confs/2114
@@ -2,14 +2,9 @@
 
 CRL=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2115 b/test/confs/2115
index f28f022603a8e045cb56fb0b428a5a63e8996d2f..ab1f6dcdd40098d365532513c74274d0e57e3fa9 100644 (file)
--- a/test/confs/2115
+++ b/test/confs/2115
@@ -1,13 +1,8 @@
 # Exim test configuration 2115
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2116 b/test/confs/2116
index b9f3cd8e1cb8eede75e9b669516c3aa0200a4b29..d57d3a112d102c0059bf6afbbd6aad43e81899ba 100644 (file)
--- a/test/confs/2116
+++ b/test/confs/2116
@@ -1,13 +1,7 @@
 # Exim test configuration 2116
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/2117 b/test/confs/2117
index 8a56c713d139a9429f108da1c25848663eb96295..b6a5576675de2bd3663480b429e9aa2da2c98f69 100644 (file)
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2118 b/test/confs/2118
index 5d2d193f8929414f52d563d63690c51f84522c2c..d3e77201d1ac48a577adcb43df53d64f66466ca2 100644 (file)
--- a/test/confs/2118
+++ b/test/confs/2118
@@ -1,13 +1,8 @@
 # Exim test configuration 2118
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2119 b/test/confs/2119
index f4c2286503a9f300cd687434fe0823d0fa5399c7..26ae4c1bcf7eff21262ccd6e6b131931427e6b20 100644 (file)
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -1,13 +1,8 @@
 # Exim test configuration 2119
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2120 b/test/confs/2120
index 75b8dfa7fd6adef6a24c88cd770e8883e6544410..1288d7f128ece2246814dcfed568b2cc82324c8a 100644 (file)
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = thishost.test.ex
-spool_directory = DIR/spool
 
 # ----- Main settings -----
 

diff --git a/test/confs/2121 b/test/confs/2121
index 166278f7eafe8d57d0c1a39db046c4068443aab9..573ea379a5d27b2abe283f79cd41a311ead78e66 100644 (file)
--- a/test/confs/2121
+++ b/test/confs/2121
@@ -3,15 +3,9 @@
 REQUIRE=#
 TRYCLEAR=#
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2122 b/test/confs/2122
index 477812e3c1a73c64549ae394350b267fcadacde1..154603d5dca957f6650fc676e6b0203cd737ca23 100644 (file)
--- a/test/confs/2122
+++ b/test/confs/2122
@@ -1,13 +1,8 @@
 # Exim test configuration 2122
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2123 b/test/confs/2123
index d5da83ef5abeb84fa48a76e489e270565739fa24..8c89e9aae0e59727ff3cd1e51a4f20ace15ca200 100644 (file)
--- a/test/confs/2123
+++ b/test/confs/2123
@@ -1,13 +1,8 @@
 # Exim test configuration 2123
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2124 b/test/confs/2124
index 2809f6ce9b12171a25b8acb965b53d6d6666c645..70d7435a5c57cc2eba078d076f30f490e745cddd 100644 (file)
--- a/test/confs/2124
+++ b/test/confs/2124
@@ -3,14 +3,9 @@
 CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2125 b/test/confs/2125
index 95b3f0d2da1c7600e0dd401688643edde8688f68..e179f96852039abb28b265c14a0ce3fa77c66aef 100644 (file)
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2126 b/test/confs/2126
index 182895a19883ef0d29ceea16942797523b102f6e..9f0af7cf6e1d702f5ca7e9f0d351d2b8888c4550 100644 (file)
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2127 b/test/confs/2127
index da7d2867f6ba9731e038c2c3cd3ce2a5da1aa33d..b177444e92f43cdd1a32248db52c145dbb4ae6b3 100644 (file)
--- a/test/confs/2127
+++ b/test/confs/2127
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2128 b/test/confs/2128
index 6b43541d5380ce56ee7322c9182609b17d8923a7..ecdb68be0953739e957dea97d78da98d1dfb4368 100644 (file)
--- a/test/confs/2128
+++ b/test/confs/2128
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2130 b/test/confs/2130
index 6040c1fa64e4afba89f484b3f04ab58fc5811a15..379d2c98a724d2801a8d6068b08ba48d7406a538 100644 (file)
--- a/test/confs/2130
+++ b/test/confs/2130
@@ -3,15 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/2131 b/test/confs/2131
index cb5c4a7145fc7e2f6cacb8924f1a2801aa6db42b..43db2ac1c228dc8456061e54a9f8b3ee854f9842 100644 (file)
--- a/test/confs/2131
+++ b/test/confs/2131
@@ -3,15 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/2132 b/test/confs/2132
index 804cd749d682e3d25f6a4eeca237297724135290..7fb561bdc68e7dbcab021470817fd3e5bb8b3c1c 100644 (file)
--- a/test/confs/2132
+++ b/test/confs/2132
@@ -1,13 +1,8 @@
 # Exim test configuration 2132 (close copy of 2102)
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2133 b/test/confs/2133
index 93ad43f0443284b18e848ac5314cb8cf8ce826e3..ff4350809118dce3eee4da811d069cc1d8c8c268 100644 (file)
--- a/test/confs/2133
+++ b/test/confs/2133
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com

diff --git a/test/confs/2149 b/test/confs/2149
index 810ab712a3e802a0f5eea1e41d8eb638cbe2d7ca..072e8e438c5716f57c7cff67c64123078f1b981b 100644 (file)
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2150 b/test/confs/2150
index 50df137fb71c9026b1d46a490c651be4b86c1f6e..f6b5263fa1a06a2a71143c751425cd176069bea7 100644 (file)
--- a/test/confs/2150
+++ b/test/confs/2150
@@ -1,13 +1,8 @@
 # Exim test configuration 2150
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/2200 b/test/confs/2200
index 65919ba8ea945febfd7272ef83e6dfad95bac8a1..904ccfb18e5db2884212fff80c5c3f5f9d74a3fd 100644 (file)
--- a/test/confs/2200
+++ b/test/confs/2200
@@ -1,15 +1,9 @@
 # Exim test configuration 2200
 # Check for dnsdb cache TTL handling
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2201 b/test/confs/2201
index c463033fc686a1eefd64f41b707052f8d1c34255..dce78ed7a435c711cc6a946a9198f15a16bcd1ed 100644 (file)
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -1,14 +1,8 @@
 # Exim test configuration 2201
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2202 b/test/confs/2202
index 62272a0ab85c896ca806e028ccac6dfbe62d59e5..825be913e7069f5f3989010058ba50ba464ad465 100644 (file)
--- a/test/confs/2202
+++ b/test/confs/2202
@@ -2,15 +2,9 @@
 
 CONNECTCOND=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2250 b/test/confs/2250
index dd097fad8be360bf607ef94cba0967f3608ab8f4..a355bfcdf087051b24171f01a6ade9d04bb081a6 100644 (file)
--- a/test/confs/2250
+++ b/test/confs/2250
@@ -1,13 +1,7 @@
 # Exim test configuration 2250
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # End

diff --git a/test/confs/2300 b/test/confs/2300
index 018457c7bd2e8433a02bd3ad2c6798b539fe73e8..bc4f4fbc67090ce85b015e49107fad0244b77dec 100644 (file)
--- a/test/confs/2300
+++ b/test/confs/2300
@@ -1,14 +1,8 @@
 # Exim test configuration 2300
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2400 b/test/confs/2400
index 91915ae1ddaffb33ad709536fe178bbb2dcb8170..b7ad9a800f1ee9b918a334a6864c38d4332f52fa 100644 (file)
--- a/test/confs/2400
+++ b/test/confs/2400
@@ -1,14 +1,8 @@
 # Exim test configuration 2400
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2500 b/test/confs/2500
index a4c12adf070a4da300d6e13a5d137be077631c93..72bb374ec41cb126a0a301d63cd1ab4a12d6ba91 100644 (file)
--- a/test/confs/2500
+++ b/test/confs/2500
@@ -1,14 +1,8 @@
 # Exim test configuration 2500
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2501 b/test/confs/2501
index 2fd56f1304043cf61f821ab359e051eaf4c782de..b485b010290af56675785a7314006725d5bcfd0a 100644 (file)
--- a/test/confs/2501
+++ b/test/confs/2501
@@ -1,14 +1,8 @@
 # Exim test configuration 2501
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2600 b/test/confs/2600
index ea855471ea341259fab87a0018719e6c670b5d21..566e260f2d21e64e05493aeb5bc746e984b2344b 100644 (file)
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -1,14 +1,8 @@
 # Exim test configuration 2600
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/2700 b/test/confs/2700
index d6daf0eb2ad39c2145cc95500d69db7df5c6e011..34e3b11ea19eb88e28b7c331966637aed41b3f96 100644 (file)
--- a/test/confs/2700
+++ b/test/confs/2700
@@ -1,14 +1,8 @@
 # Exim test configuration 2700
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3000 b/test/confs/3000
index 4b41aab70e7a40730179cd9008c8817f3a700317..9789808fbe7dd1e205d56228e787afdcfde3fb4d 100644 (file)
--- a/test/confs/3000
+++ b/test/confs/3000
@@ -1,15 +1,9 @@
 # Exim test configuration 3000
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3100 b/test/confs/3100
index 58ecc663f4746551033d3ad70426281acb42e205..9f39fcf533d6849fd9440304870fd25c700fa4c3 100644 (file)
--- a/test/confs/3100
+++ b/test/confs/3100
@@ -1,15 +1,9 @@
 # Exim test configuration 3100
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3200 b/test/confs/3200
index c82c704a31baefe9946bb6951577499fae08f931..c3cd41aac8c360eff445cd20ee6b61797bdd96a2 100644 (file)
--- a/test/confs/3200
+++ b/test/confs/3200
@@ -1,14 +1,8 @@
 # Exim test configuration 3200
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3201 b/test/confs/3201
index 337f90a0cc63ac5cb812273acfefd22754941677..0593fac66c2455390a516547b48723b40e9f8e44 100644 (file)
--- a/test/confs/3201
+++ b/test/confs/3201
@@ -1,14 +1,8 @@
 # Exim test configuration 3201
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/3202 b/test/confs/3202
index 3c75e2138abbae56c72041ba3c4b324a5562005b..442f8e85e5ef753f77ab0917fc1c099d89149666 100644 (file)
--- a/test/confs/3202
+++ b/test/confs/3202
@@ -1,14 +1,8 @@
 # Exim test configuration 3202
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3203 b/test/confs/3203
index 22f0813a84c1b9f9e9140bf799f24959467171e4..2c9d28bf98cf6d24f21cad34ea0c702a36ec2a4d 100644 (file)
--- a/test/confs/3203
+++ b/test/confs/3203
@@ -1,14 +1,8 @@
 # Exim test configuration 3203
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3204 b/test/confs/3204
index a7326acdab57a03254f61a2b43f826da961e9c04..b3b77be384c2c8560a53142576a2903c3e6b950c 100644 (file)
--- a/test/confs/3204
+++ b/test/confs/3204
@@ -1,14 +1,8 @@
 # Exim test configuration 3204
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3205 b/test/confs/3205
index a2e5b4e87bf5123036b97e84eeed1ef36a7b4043..b5ac52727943c69f68876331ed2b74b9725ea8ce 100644 (file)
--- a/test/confs/3205
+++ b/test/confs/3205
@@ -1,14 +1,8 @@
 # Exim test configuration 3205
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3206 b/test/confs/3206
index f4a64bd5e07ea6b2d314ede68b318d85eda19884..e4085ad6c318746afb55322a8fc84a4976307b0d 100644 (file)
--- a/test/confs/3206
+++ b/test/confs/3206
@@ -1,15 +1,9 @@
 # Exim test configuration 3206
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3207 b/test/confs/3207
index 955444086a86c8817a2d1554777e2d6d403b3dcb..6880dcf90c14e8a72b61c89750c4be291eb60d5a 100644 (file)
--- a/test/confs/3207
+++ b/test/confs/3207
@@ -1,15 +1,9 @@
 # Exim test configuration 3207
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3208 b/test/confs/3208
index 1fa360d43ddd3ca38330a925a3ca252271bf1067..46266e4c88eff4123a1b133ba72f4732be7395ab 100644 (file)
--- a/test/confs/3208
+++ b/test/confs/3208
@@ -1,15 +1,9 @@
 # Exim test configuration 3208
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3209 b/test/confs/3209
index ebaa4ebddb776a2ae4174addbfa905fda7e41de0..d5a442ddb8c09e1f23bbb40b9edef42425621785 100644 (file)
--- a/test/confs/3209
+++ b/test/confs/3209
@@ -1,15 +1,9 @@
 # Exim test configuration 3209
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3210 b/test/confs/3210
index 3478c8aedca0ea786933d06b4e14c276f4b961cb..61e9f2b36abc12383b726737ef66c2f952c590b7 100644 (file)
--- a/test/confs/3210
+++ b/test/confs/3210
@@ -1,14 +1,8 @@
 # Exim test configuration 3210
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3211 b/test/confs/3211
index c179b0a3371f3a57690848d099146ed286f62382..96035debd7112c0041fd4b31b412207e98fcc594 100644 (file)
--- a/test/confs/3211
+++ b/test/confs/3211
@@ -1,14 +1,8 @@
 # Exim test configuration 3211
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3212 b/test/confs/3212
index 1627194b37119bc506e3785a99744fe020921c24..f52bae994f7901913810d436c6ee2e2f1dc313f2 100644 (file)
--- a/test/confs/3212
+++ b/test/confs/3212
@@ -1,14 +1,8 @@
 # Exim test configuration 3212
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3213 b/test/confs/3213
index f80f55d2fc0ca53bb4dbbb57db0481a127100bd4..5752f91edd7084a0c14330db77318b8bb339e916 100644 (file)
--- a/test/confs/3213
+++ b/test/confs/3213
@@ -1,14 +1,8 @@
 # Exim test configuration 3213
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3300 b/test/confs/3300
index 85e5d75dd410f40c5d22a706d31b61e64aa2ee38..792ccc5749a0fc9cae5a965b639f883a9f870b19 100644 (file)
--- a/test/confs/3300
+++ b/test/confs/3300
@@ -1,14 +1,8 @@
 # Exim test configuration 3300
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3400 b/test/confs/3400
index 8496e435b9c6e687dbefc6bd07fc61c9b1a285e8..6b817c2f44e097409769dcafc76a35c2297d6230 100644 (file)
--- a/test/confs/3400
+++ b/test/confs/3400
@@ -1,14 +1,8 @@
 # Exim test configuration 3400
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3401 b/test/confs/3401
index bfb9b37951981a3e277c6174c4f85dfb060029bd..afcd48251c42b01ba289c27db18399fdffd086fb 100644 (file)
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -1,15 +1,9 @@
 # Exim test configuration 3401
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +smtp_mailauth
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/3402 b/test/confs/3402
index 35b45f1a47eabb3f3123686dc6464bca52017308..d22aa99a743a16d4a1aab71ccc350f17c6a7ae66 100644 (file)
--- a/test/confs/3402
+++ b/test/confs/3402
@@ -1,14 +1,8 @@
 # Exim test configuration 3402
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3403 b/test/confs/3403
index 9f62506da58e7e8def39fd320cd3a2327e67ff5e..813b3b941c7aa7f5dbb592e118db2f74dea85fb1 100644 (file)
--- a/test/confs/3403
+++ b/test/confs/3403
@@ -1,14 +1,8 @@
 # Exim test configuration 3403
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3404 b/test/confs/3404
index b9d07b1cce43b7fe508060f5c696aa8774e6b9e3..a76581de23b2c528c50b536fdd658e280ff77043 100644 (file)
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -1,14 +1,8 @@
 # Exim test configuration 3404
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3405 b/test/confs/3405
index f1079ac9342327200fa840359d55e92212a78247..e9c7b7ea335d8f6e71500575fe749c2abce4a511 100644 (file)
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -1,14 +1,8 @@
 # Exim test configuration 3405
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3406 b/test/confs/3406
index fa567ba49facb1b09e54bf41c5135dc2f0705ef4..17debde220cf9e9ace311b0021069d0562ecc922 100644 (file)
--- a/test/confs/3406
+++ b/test/confs/3406
@@ -1,14 +1,8 @@
 # Exim test configuration 3406
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3407 b/test/confs/3407
index ac73900218a17182c3864461c197013fff0a53f5..11f7659e66d10708977883746bda0d4e0734a046 100644 (file)
--- a/test/confs/3407
+++ b/test/confs/3407
@@ -2,14 +2,8 @@
 
 OPTION=server_condition = xxx
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/3408 b/test/confs/3408
index e3e9a4b04fcd2a053c52cae25e0df73131c87d02..14f5c6249816c44895e03d7e94d8e35b92c04b15 100644 (file)
--- a/test/confs/3408
+++ b/test/confs/3408
@@ -1,13 +1,7 @@
 # Exim test configuration 3408
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/3409 b/test/confs/3409
index de59574844a58e6b5fb46ea024692d77bb81a55b..bfa01a576d801e703e6bdcf4cfb0319ad8b3b9f3 100644 (file)
--- a/test/confs/3409
+++ b/test/confs/3409
@@ -1,13 +1,7 @@
 # Exim test configuration 3409
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/3410 b/test/confs/3410
index dc05734b0e3e880617b33ca629759b445c1988f2..39435d18c02197e4118455fbae2c7153136b4b4d 100644 (file)
--- a/test/confs/3410
+++ b/test/confs/3410
@@ -1,14 +1,8 @@
 # Exim test configuration 3410
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3411 b/test/confs/3411
index 2e521db9256da7da36dcd5a07269a62d74cf207d..44feae7bd70f635a27953c206a3b024fcd5e84c2 100644 (file)
--- a/test/confs/3411
+++ b/test/confs/3411
@@ -1,14 +1,8 @@
 # Exim test configuration 3411
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3412 b/test/confs/3412
index ea9ad6689a589a4d500804d00fc562de37c1f6bb..c0a1c5509913ca080aa381e57b1bc8bb7f0b46e0 100644 (file)
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -1,14 +1,8 @@
 # Exim test configuration 3412
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3413 b/test/confs/3413
index bce9cb0fa4bf69a0090bad72994bd21e24a4d4b8..7329ddcccc44e374279cf7d7b1e048ce7d7eec3b 100644 (file)
--- a/test/confs/3413
+++ b/test/confs/3413
@@ -1,14 +1,8 @@
 # Exim test configuration 3413
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3415 b/test/confs/3415
index c468d64237d6bdc971cf68ee6cda10b5bc143829..37c7629f526e01bdd23105cec66fd2605fd2245d 100644 (file)
--- a/test/confs/3415
+++ b/test/confs/3415
@@ -4,15 +4,9 @@ SERVER=
 SUBMISSION_OPTIONS=
 AUTH_ID_DOMAIN=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3416 b/test/confs/3416
index f76652f95aaae167046a64d304357e5d9357385e..930a2240f9e113e540d4fd0f149adf04c7e0679b 100644 (file)
--- a/test/confs/3416
+++ b/test/confs/3416
@@ -1,15 +1,9 @@
 # Exim test configuration 3416
 # Recipient callout with AUTH
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3450 b/test/confs/3450
index 19e3a6b27a13f2d4d535f3ae9fff2dca2760a270..facc8b8eeacb1a65bf2df5ab04a6acc721917620 100644 (file)
--- a/test/confs/3450
+++ b/test/confs/3450
@@ -1,13 +1,8 @@
 # Exim test configuration 3450
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3451 b/test/confs/3451
index 1c0a478cd3ecc85d11fb16eec4bc568e23c1f9c0..d66253992ea6345cda87234da770080fd2557749 100644 (file)
--- a/test/confs/3451
+++ b/test/confs/3451
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3452 b/test/confs/3452
index b36e1fa04a12f67c71008d4c75a7a536a03e600d..5971c08044157542ab741b33ffff9a54c216ea2b 100644 (file)
--- a/test/confs/3452
+++ b/test/confs/3452
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3453 b/test/confs/3453
index 199db15907fc5cceb78bb44eeaa2df85eac68c39..8d8a008eb1c8d1de64dadea61e70e10d92c6458d 100644 (file)
--- a/test/confs/3453
+++ b/test/confs/3453
@@ -2,14 +2,9 @@
 
 REMEMBER=false
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3454 b/test/confs/3454
index b45b9183c6da7c93db2be7c1bee6ffed5bcddf74..4561c58f7d4512778c5351cd8669bb9030c1fab5 100644 (file)
--- a/test/confs/3454
+++ b/test/confs/3454
@@ -1,13 +1,8 @@
 # Exim test configuration 3454
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3455 b/test/confs/3455
index 3d33fb650962be314d0e227699d983f1538223b1..bfa30b445f7aff8e140c9e3885273df0362b1e12 100644 (file)
--- a/test/confs/3455
+++ b/test/confs/3455
@@ -2,14 +2,9 @@
 
 HOSTS_AVOID_TLS=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3460 b/test/confs/3460
index 84e585a5c2e179afbffba2f113f267d117fb37ba..7e104c7c98f725a1502730de7f3328a6f9af96fb 100644 (file)
--- a/test/confs/3460
+++ b/test/confs/3460
@@ -1,13 +1,8 @@
 # Exim test configuration 3460
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3461 b/test/confs/3461
index 45a28fd62816cb78acc01afabe77c826ad79dedd..b4843b488fa0d17e598831deafa274d9a52c8a6e 100644 (file)
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3462 b/test/confs/3462
index 10b6cb952c84654c9cd34742121aa0f3c672713d..33fabbc04ec2f6a95adc44012b99fa08e45467d3 100644 (file)
--- a/test/confs/3462
+++ b/test/confs/3462
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3463 b/test/confs/3463
index f6228f9792f087ff02f1a89c53f918dee3920d52..ab15af2257a3d51da920c22844e536ab9e571ae3 100644 (file)
--- a/test/confs/3463
+++ b/test/confs/3463
@@ -2,14 +2,9 @@
 
 REMEMBER=false
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3464 b/test/confs/3464
index 7f2d2777dfc98e58ff487a61b6a4753a17e89a85..eba6aa6ebfd881d534fe569ed23e6acfe446c472 100644 (file)
--- a/test/confs/3464
+++ b/test/confs/3464
@@ -1,13 +1,8 @@
 # Exim test configuration 3464
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3465 b/test/confs/3465
index 1b73148cc98b46ed31dd294c99241187886e1879..dfe6b9921360700977e6ffa2c7b6acb0e0eae8b0 100644 (file)
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -2,14 +2,9 @@
 
 HOSTS_AVOID_TLS=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/3500 b/test/confs/3500
index fbcd12c9d2d5e8bca7d069b777306ec8fd47f550..68cf703be0da12e324e9495604df256427ad6649 100644 (file)
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -1,14 +1,8 @@
 # Exim test configuration 3500
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3501 b/test/confs/3501
index 690979a2d4d0b080b6cb19c04de856976c6b338f..c63e767392bd036ef5301697708a5a3dfd19ce25 100644 (file)
--- a/test/confs/3501
+++ b/test/confs/3501
@@ -1,14 +1,8 @@
 # Exim test configuration 3501
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3600 b/test/confs/3600
index 7c6549f46c164c76fa692d19096aa6e584cf0a98..f6d4f8605807d547693e8b27673cd89f27a5bc4e 100644 (file)
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/3700 b/test/confs/3700
index 667131e3f385dd85816836aac4a02cf9af3bcc10..94bd26ebdf3c0ab7107effbcfcaf3317e5fc7243 100644 (file)
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 log_selector = +received_recipients +outgoing_port
 
 # ----- Main settings -----

diff --git a/test/confs/4000 b/test/confs/4000
index bc4ccd8fd0dd9c4834aa870ddf6229edb0b5cb55..c8ad7f8aa310f832debcb9d2ea8566f2f41e3d4e 100644 (file)
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,15 +1,9 @@
 # Exim test configuration 4000
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 
 # ----- Main settings -----

diff --git a/test/confs/4001 b/test/confs/4001
index 0ab60d1a40d83ddd2e11e3d5f30a93561b0bfc3c..85e68a587f52e97a9e63e4b5fb6a05d4afb79104 100644 (file)
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -1,15 +1,9 @@
 # Exim test configuration 4001
 # Content-scan: f-protd interface
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 av_scanner = f-protd : localhost4 PORT_S
 

diff --git a/test/confs/4002 b/test/confs/4002
index a4e7cad7cdd3ede5240920cc6b075dcadea3feb3..dde49c3b2fff876e5602e48120a85e26502afbfd 100644 (file)
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -1,16 +1,10 @@
 # Exim test configuration 4002
 # Content-scan: aveserver interface
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = aveserver : DIR/eximdir/aveserver_sock
 

diff --git a/test/confs/4003 b/test/confs/4003
index abfb4aef525eccefe9a89c299ba4e05d25d2d746..fbcf3021cb7c911cfc2ad4b27158d421e559412e 100644 (file)
--- a/test/confs/4003
+++ b/test/confs/4003
@@ -1,16 +1,10 @@
 # Exim test configuration 4002
 # Content-scan: fsecure interface
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = fsecure : DIR/eximdir/fsec_sock
 

diff --git a/test/confs/4004 b/test/confs/4004
index e489ee93fab122adb0fb1b9c78d1afbfd44fa6f4..9bc22ce2e39d43a580e3b8a246509a57d8fda522 100644 (file)
--- a/test/confs/4004
+++ b/test/confs/4004
@@ -1,16 +1,10 @@
 # Exim test configuration 4002
 # Content-scan: sophie interface
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = sophie : DIR/eximdir/sophie_sock
 

diff --git a/test/confs/4005 b/test/confs/4005
index e7da5a56db6be83f8d1ca453a4c44239ae7750f2..0ebb2be7b63cddfffebbcd7d5b751d43917a87c0 100644 (file)
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -4,16 +4,10 @@
 OPT=
 CONTROL=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
+primary_hostname = myhost.test.ex
 
 #XXX we need an additional test for tcp-connected clamd
 av_scanner = clamd : DIR/eximdir/clam_sock CONTROL

diff --git a/test/confs/4006 b/test/confs/4006
index a0b74f1c19a176daf7bb9b25a2260f095217a3ab..3efca602c681f7e89662ae2efed74b8bb863727c 100644 (file)
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -1,16 +1,10 @@
 # Exim test configuration 4006
 # Content-scan: avast interface
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = avast : DIR/eximdir/avast_sock : OPTION
 

diff --git a/test/confs/4007 b/test/confs/4007
index df41eebf714e38e1dc619adbd3f40ecd2c3d9576..55bfcfafb8249a2afcbfc6814573b9e8e28ac33b 100644 (file)
--- a/test/confs/4007
+++ b/test/confs/4007
@@ -1,16 +1,10 @@
 # Exim test configuration 4007
 # Content-scan: cmsline interface
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)
 

diff --git a/test/confs/4008 b/test/confs/4008
index 7cba2689f2fbc2e72c05477dcc0564b2f039dde3..a3bb87f73172a5eeeb8194cadb7d874878253f71 100644 (file)
--- a/test/confs/4008
+++ b/test/confs/4008
@@ -1,16 +1,10 @@
 # Exim test configuration 4008
 # Content-scan: rspamd interface
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
+primary_hostname = myhost.test.ex
 
 spamd_address = 127.0.0.1 11333 variant=rspamd
 

diff --git a/test/confs/4009 b/test/confs/4009
index 45f95edc228870bec8df1ccba0dbb473c677de51..98f696f44d6605f2f119aed091f9fa598ad6c62d 100644 (file)
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -3,16 +3,10 @@
 
 OPT= 127.0.0.1 7833
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
+primary_hostname = myhost.test.ex
 
 spamd_address = OPT
 

diff --git a/test/confs/4010 b/test/confs/4010
index 62ef3e6ac40cb003d1c7f9d1253cbc946b0afb55..f01baf3cf2c322d4f2c39dc0f2b047f4ac2cdf62 100644 (file)
--- a/test/confs/4010
+++ b/test/confs/4010
@@ -1,15 +1,9 @@
 # Exim test configuration 0568:  ACL regex=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/4020 b/test/confs/4020
index d37b0d8fcc75092a3226761d8fccde5f84bfe4a8..8dfd46888404a2e407864677632b351901d85874 100644 (file)
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -2,15 +2,9 @@
 
 OPT =
 
-exim_path = EXIM_PATH
-keep_environment =
-hide host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/4028 b/test/confs/4028
index de11185bb135c622a078daecd4a50efafae3708f..4a1f682a902fbc0f2f80abbd3267a675bd6f2cc4 100644 (file)
--- a/test/confs/4028
+++ b/test/confs/4028
@@ -4,14 +4,9 @@
 OPT =
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/4029 b/test/confs/4029
index b8f7ec45af55863f72ba6b2f41a150661969f984..467d74d8dd80b2d84b83daf0fa85e02c3450d930 100644 (file)
--- a/test/confs/4029
+++ b/test/confs/4029
@@ -4,14 +4,9 @@
 OPT =
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/4100 b/test/confs/4100
index 8c101e818475a1163486da1982ec6b7e7c49eb0a..2a45bf9080d45819a2e03346ac42dae2d494c4d3 100644 (file)
--- a/test/confs/4100
+++ b/test/confs/4100
@@ -1,13 +1,7 @@
 # Exim test configuration 4100
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/4200 b/test/confs/4200
index f7df70b9723a4a3cb44e06990453931758f57f07..681319353216420d409d7583d0945f680a00326f 100644 (file)
--- a/test/confs/4200
+++ b/test/confs/4200
@@ -1,11 +1,6 @@
 # Exim test configuration 4200
 
-exim_path = EXIM_PATH
-keep_environment =
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 # ----- Main settings -----
 

diff --git a/test/confs/4201 b/test/confs/4201
index 298eb847d80bb81c10d9df470216f6f11a2299ee..e12e13828b5daa93b373a549db6f646e86299db5 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -6,14 +6,8 @@ CONTROL =
 INSERT =
 SUB =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/4211 b/test/confs/4211
index a5cc47ad1e868db608a215a5b4187794f825e7f1..bcd5a4fd1250c437da07227006db7d6152bed98f 100644 (file)
--- a/test/confs/4211
+++ b/test/confs/4211
@@ -4,13 +4,7 @@
 OPTION = *
 CONTROL =
 
-exim_path = EXIM_PATH
-keep_environment =
-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/tls_conf_prefix
 
 # ----- Main settings -----
 

diff --git a/test/confs/4221 b/test/confs/4221
index a5cc47ad1e868db608a215a5b4187794f825e7f1..bcd5a4fd1250c437da07227006db7d6152bed98f 100644 (file)
--- a/test/confs/4221
+++ b/test/confs/4221
@@ -4,13 +4,7 @@
 OPTION = *
 CONTROL =
 
-exim_path = EXIM_PATH
-keep_environment =
-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/tls_conf_prefix
 
 # ----- Main settings -----
 

diff --git a/test/confs/4500 b/test/confs/4500
index 61a04f6b0de000c7408898f562a96005fc6e727f..bf4f1f6ad5d5e46912e953fd0ce158065901349f 100644 (file)
--- a/test/confs/4500
+++ b/test/confs/4500
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/4503 b/test/confs/4503
index 45e6d146379a900440e91ffa1c5fe19d29fb33df..47f4b74c90499b1d21e6a5382a8f0272ba97e629 100644 (file)
--- a/test/confs/4503
+++ b/test/confs/4503
@@ -3,15 +3,9 @@
 SERVER=
 OPT=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/4700 b/test/confs/4700
index 5a86785dda7170a56d3142b54b76ac131270d821..96f3beac19c333913dbb16b52e1b5ab8de19f977 100644 (file)
--- a/test/confs/4700
+++ b/test/confs/4700
@@ -1,13 +1,7 @@
 # Exim test configuration 0211
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/4804 b/test/confs/4804
index a1ba90dd148ad3e45598b958692cea4bf19a47ed..a891d14dc41da465c865f94a290627c34385d53e 100644 (file)
--- a/test/confs/4804
+++ b/test/confs/4804
@@ -3,22 +3,16 @@
 SERVER=
 OPT=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 timezone = UTC
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 log_selector = OPT
-tls_advertise_hosts = :
 
 # ------ ACL ------
 

diff --git a/test/confs/4950 b/test/confs/4950
index 3a1868470a81eb358f73c727f1761956c71579d5..6ddee035e1efb48d8c38cde6b1ad668f159f3270 100644 (file)
--- a/test/confs/4950
+++ b/test/confs/4950
@@ -1,13 +1,7 @@
 # Exim test configuration 4950
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5000 b/test/confs/5000
index 7925a61f158ca08ea2e5a0f6d90fac7cbafb19a4..e3328c6a166c1268d26d8c214a8ab1e104d8f75c 100644 (file)
--- a/test/confs/5000
+++ b/test/confs/5000
@@ -1,14 +1,8 @@
 # Exim test configuration 5000
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5001 b/test/confs/5001
index fbc9f6dc7f8273d55a2255ec2f15caeb8304145d..db8c7dc1f92be4cb664371d5006b0746b9ee6500 100644 (file)
--- a/test/confs/5001
+++ b/test/confs/5001
@@ -1,13 +1,7 @@
 # Exim test configuration 5001
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5002 b/test/confs/5002
index 924e5adf1fd44974bcada219f42981a9f47137cf..81edaab2af38ae98e169ec56165ccdacbcff0139 100644 (file)
--- a/test/confs/5002
+++ b/test/confs/5002
@@ -1,14 +1,8 @@
 # Exim test configuration 5002
 
-exim_path = EXIM_PATH
-keep_environment =
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5003 b/test/confs/5003
index 8c2b6f551d86740476da1b41965fe6378c604346..763567326264589c79337e46115b0ac71f730b64 100644 (file)
--- a/test/confs/5003
+++ b/test/confs/5003
@@ -1,13 +1,7 @@
 # Exim test configuration 5003
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5004 b/test/confs/5004
index 7d4739f10b1dc4831e5dfc612113798d2a51ba29..75c4eaef97a2fc3e4de4b02353dec4e7e6c9f3a0 100644 (file)
--- a/test/confs/5004
+++ b/test/confs/5004
@@ -1,13 +1,7 @@
 # Exim test configuration 5004
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5005 b/test/confs/5005
index 52216ce6936ab4111352ee1a63b306c9c1e0ec2c..d5d497a06f7a44d38f2a34657af2458667e45243 100644 (file)
--- a/test/confs/5005
+++ b/test/confs/5005
@@ -2,15 +2,9 @@
 
 QUOTA=500
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/5006 b/test/confs/5006
index ca45d9b38e93757a43196bdb3b0cb100250371e9..385d4fe084a7b0d860549492f24422924ab5c671 100644 (file)
--- a/test/confs/5006
+++ b/test/confs/5006
@@ -1,14 +1,8 @@
 # Exim test configuration 5006
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/5007 b/test/confs/5007
index 435aea650df9e7d87ceed66967927b20d25e3756..98f70ee6d2422bc036955d5bda14516439a40599 100644 (file)
--- a/test/confs/5007
+++ b/test/confs/5007
@@ -2,15 +2,9 @@
 
 QUOTA=500
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/5008 b/test/confs/5008
index 3e8e5553026342ff1f6127175e2ccdf62caecd0f..027ba7a54f45ca493b3c584f3594053146652723 100644 (file)
--- a/test/confs/5008
+++ b/test/confs/5008
@@ -2,15 +2,9 @@
 
 QUOTA_FILECOUNT=0
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/5009 b/test/confs/5009
index bc945aa9f74037d5c27d6e2fbfd909740e929ca6..a632dd223ace2974af54ddf4868c0ad347ad5c6a 100644 (file)
--- a/test/confs/5009
+++ b/test/confs/5009
@@ -2,15 +2,9 @@
 
 SUB=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/5050 b/test/confs/5050
index a7d392ecd0761fb6e8a33954b7b370ba623b4c59..462d7dcf23a8680b36e531fe22649d76f2275e94 100644 (file)
--- a/test/confs/5050
+++ b/test/confs/5050
@@ -1,13 +1,7 @@
 # Exim test configuration 5050
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5100 b/test/confs/5100
index c3ebee17086981ed8baf3e60b1a9a89959c93915..61a3711764e58b25223052a6793d74529530ff87 100644 (file)
--- a/test/confs/5100
+++ b/test/confs/5100
@@ -2,15 +2,9 @@
 
 IGNORE_QUOTA=FALSE
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5101 b/test/confs/5101
index bb33142ea16c17d5397bce384edbbe03d55840cd..1dbe3e4663bb3a5882a5bb24b3a837e30ce37ab1 100644 (file)
--- a/test/confs/5101
+++ b/test/confs/5101
@@ -1,14 +1,8 @@
 # Exim test configuration 5101
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5102 b/test/confs/5102
index b1341fd32cf77c9b63967f634526a4bf78559871..eaa742b83f44b1b80978a58dc154b8bd956ad4de 100644 (file)
--- a/test/confs/5102
+++ b/test/confs/5102
@@ -1,14 +1,8 @@
 # Exim test configuration 5102
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5103 b/test/confs/5103
index dfd897d55fe8d604f5837978bf93015b945e3a56..7212fb30e50cad6e02aee0dd58c39d036e8dc642 100644 (file)
--- a/test/confs/5103
+++ b/test/confs/5103
@@ -1,14 +1,8 @@
 # Exim test configuration 5103
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5200 b/test/confs/5200
index 323b473e883c49eda69a4ce7b5ea7102bb7942bc..cafd2fb5e71e0476ab06a17159027ec12009d957 100644 (file)
--- a/test/confs/5200
+++ b/test/confs/5200
@@ -1,13 +1,7 @@
 # Exim test configuration 5200
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5201 b/test/confs/5201
index e84e2a3b711c11b9fb1a18bdf9bbbad6e3f3461e..f273d92fad252218067cd7d8b5ccefe6a271a8a1 100644 (file)
--- a/test/confs/5201
+++ b/test/confs/5201
@@ -1,13 +1,7 @@
 # Exim test configuration 5201
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5202 b/test/confs/5202
index 5fa1a7702694d357453d21271b730b5023ddab53..19855fff39f4ee67af76c91ae607d7bb7aece93a 100644 (file)
--- a/test/confs/5202
+++ b/test/confs/5202
@@ -1,13 +1,7 @@
 # Exim test configuration 5202
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5203 b/test/confs/5203
index 9d348fa7b6642964c4740f1c0f3c478d10924aec..40f4c8370ef5c64decb80bea36b3c58ba2d83577 100644 (file)
--- a/test/confs/5203
+++ b/test/confs/5203
@@ -1,13 +1,7 @@
 # Exim test configuration 5203
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5204 b/test/confs/5204
index e44645991f490976bcf9e894ecb835a82ad0becf..5f379b8f115f20c51c5a74d9570653d8e5f3450b 100644 (file)
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -2,15 +2,9 @@
 
 COMMAND_USER=EXIMUSER
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5205 b/test/confs/5205
index 74bab74e770649fde981291eaf44d96e2f552f7c..efa2de1215f83eff4b9c17fc77eae68150055cc0 100644 (file)
--- a/test/confs/5205
+++ b/test/confs/5205
@@ -1,13 +1,7 @@
 # Exim test configuration 5205
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5206 b/test/confs/5206
index 3ef70a42cef2d14eddd68dae0ea65b07db3af1c6..37e89e65f2e1d036283a3ff8a542406db68b77ff 100644 (file)
--- a/test/confs/5206
+++ b/test/confs/5206
@@ -1,13 +1,7 @@
 # Exim test configuration 5206
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5207 b/test/confs/5207
index 8b45d32f52e781a83a009dbb40a3f19dc5b86898..bfd32bb3bc0954bda45ee9525a7d9dd0adbba121 100644 (file)
--- a/test/confs/5207
+++ b/test/confs/5207
@@ -1,14 +1,8 @@
 # Exim test configuration 5207
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5208 b/test/confs/5208
index 5574fed8e955f5fc6c47a04ce3768a5f1877cb83..e32dcfc947bbae29de287c4bb4781ac3caa1d027 100644 (file)
--- a/test/confs/5208
+++ b/test/confs/5208
@@ -3,15 +3,9 @@
 LIST=
 SELF=freeze
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5209 b/test/confs/5209
index c27e110ba744cf7a211b72974ac8f3fc7d6edd70..b3df430858ee8fb0a316bd96bad56e2e73ff68c2 100644 (file)
--- a/test/confs/5209
+++ b/test/confs/5209
@@ -1,14 +1,8 @@
 # Exim test configuration 5209
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5300 b/test/confs/5300
index cda78f89ed9705852f8f2ab399e29a83d1473019..1ba89388ba9eacec6f85bd3a1ae8ac7c06ead60a 100644 (file)
--- a/test/confs/5300
+++ b/test/confs/5300
@@ -2,15 +2,9 @@
 
 ALLOW=true
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5301 b/test/confs/5301
index 5ce5eeedbcd0f98385d3d913033a102193db2fce..f727ebca0e2ca6eaac912fd8d82436fdc9aa4fb4 100644 (file)
--- a/test/confs/5301
+++ b/test/confs/5301
@@ -2,15 +2,9 @@
 
 D6=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5400 b/test/confs/5400
index 8cf757768a74b44cb0f9032efe410e93113f3230..f87f985fd299ce4aa994ada7e093cbfe149e16e9 100644 (file)
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -1,14 +1,8 @@
 # Exim test configuration 5400
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 log_selector = +received_recipients
 

diff --git a/test/confs/5401 b/test/confs/5401
index 636a3b6142d961cbcca4b5ecdc639f2eb5960d02..0d93fe5bc991167b5a590920cf21ae0bab5dc700 100644 (file)
--- a/test/confs/5401
+++ b/test/confs/5401
@@ -1,14 +1,8 @@
 # Exim test configuration 5401
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5402 b/test/confs/5402
index 2c10380155a338ad9bd8d1a779f2b354bdcfa62b..0984e0cc94a95a9f0bca969f3c2206e189df62c6 100644 (file)
--- a/test/confs/5402
+++ b/test/confs/5402
@@ -1,14 +1,8 @@
 # Exim test configuration 5402
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5403 b/test/confs/5403
index 70ec647d009219414c8193b65d14a6b4d3904b42..a4576a5aa1537f08513b9ce0ef0d89bf62d487f7 100644 (file)
--- a/test/confs/5403
+++ b/test/confs/5403
@@ -1,14 +1,8 @@
 # Exim test configuration 5403
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 log_selector = +received_recipients
 

diff --git a/test/confs/5410 b/test/confs/5410
index 4c59adb95b39f689ebd4673d6d4ae2aac1f0ddf5..96ec87496d6351f42aae94be11ec669fb3bb4629 100644 (file)
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -1,13 +1,8 @@
 # Exim test configuration 5410
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/5420 b/test/confs/5420
index bb559116ece945080fa1c061056e829dda408809..44a1fdee4ea3a93d09894d2baad701400af9324c 100644 (file)
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -1,13 +1,8 @@
 # Exim test configuration 5420
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/5500 b/test/confs/5500
index df818af1f4ebf67677cfc6625ae35785fed70cb3..1b25be1f8471ac0e52a235e41a1e0e98b4f74172 100644 (file)
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -3,15 +3,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5510 b/test/confs/5510
index 41b424798dcb8514f02570053f211bf83c16327a..ab42b242e432a9edf96030693aab28e25efed9b3 100644 (file)
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -3,15 +3,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5600 b/test/confs/5600
index c05bcfcf92e9271b7a5a256955a5d7ffc19fd9fd..a15936d837ef4099aff584a4880bd70ff0f71a05 100644 (file)
--- a/test/confs/5600
+++ b/test/confs/5600
@@ -3,14 +3,9 @@
 
 CRL=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = server1.example.com
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/5601 b/test/confs/5601
index 267f4e07135dc8c2982305c66a5d5352cbbca44c..185b06745316b4a07f5cd3db5cd1dc52966b78c9 100644 (file)
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -6,11 +6,11 @@ SERVER =
 exim_path = EXIM_PATH
 keep_environment  = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
-primary_hostname = server1.example.com
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+primary_hostname = server1.example.com
 
 
 # ----- Main settings -----

diff --git a/test/confs/5650 b/test/confs/5650
index 8d07b7a9c94f6f939b6741bd847526a27f080470..ee1ae3c50c6e32e63ba9f4f2ade97e584d6b96e7 100644 (file)
--- a/test/confs/5650
+++ b/test/confs/5650
@@ -3,14 +3,9 @@
 
 CRL=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = server1.example.com
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/5651 b/test/confs/5651
index fe9d3bcebf24194a70c5977b15597bae134c0f00..32f8ab67b7df55e0cb1901d8fef89841dece261e 100644 (file)
--- a/test/confs/5651
+++ b/test/confs/5651
@@ -3,15 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = server1.example.com
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
 
+primary_hostname = server1.example.com
 
 # ----- Main settings -----
 

diff --git a/test/confs/5700 b/test/confs/5700
index 613ebef4464a534c91ef123d688c0574b154c1ff..031e690b32183da78d3b19c26d5652dc12320e3b 100644 (file)
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -1,13 +1,7 @@
 # Exim test configuration 5700
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/5710 b/test/confs/5710
index 47c8e7c50a11e1b331c5844528df8976a9e1e973..e61fadc5e84fc0829e118ba39cb488d4b3a865ab 100644 (file)
--- a/test/confs/5710
+++ b/test/confs/5710
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 timezone = UTC
 
 # ----- Main settings -----

diff --git a/test/confs/5720 b/test/confs/5720
index ca0b1974459b236a28fd5c53644708f01b2e833c..2de47bd8264f6e6c7f068ce23cdffb378c214aef 100644 (file)
--- a/test/confs/5720
+++ b/test/confs/5720
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 timezone = UTC
 
 # ----- Main settings -----

diff --git a/test/confs/5730 b/test/confs/5730
index 8a5b0751c648abdff571e9332ef91e5137ebab06..65fde950d61bfbbb69cd20e2ba56620048d3c4d5 100644 (file)
--- a/test/confs/5730
+++ b/test/confs/5730
@@ -3,14 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = server1.example.com
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 
 # ----- Main settings -----

diff --git a/test/confs/5740 b/test/confs/5740
index 4c6345a8a1aac7c6ae43929a9fb6e2d1b7a6090d..6c4614499980212fb52952bd1a442a7eaca57bf5 100644 (file)
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -6,11 +6,11 @@ SERVER =
 exim_path = EXIM_PATH
 keep_environment = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
-primary_hostname = server1.example.com
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+primary_hostname = server1.example.com
 
 
 # ----- Main settings -----

diff --git a/test/confs/5800 b/test/confs/5800
index af03ee53a8f8dc04bb634d35c4f249a4685a137d..aa75b21a11b97f619f9dedcef496cdf11a131c7b 100644 (file)
--- a/test/confs/5800
+++ b/test/confs/5800
@@ -1,12 +1,9 @@
 # Exim test configuration 5800
 # DANE common
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/5820 b/test/confs/5820
index 9ee830910106a578f2eeeaa121688edc1d714820..6c2f26ce062645b204966c84ef91639781f1c3c3 100644 (file)
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/5840 b/test/confs/5840
index 670ce2c196f5fbac80ddebcc84ae3a2a94f198c0..ac3578dc9a3ca113814ac3d625083433ecaef9fe 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/5860 b/test/confs/5860
index eae2edb0d634a91f201f67c50a5a565aa0bec946..94436c3449b08b9d64a7c052fb138289228b2a5c 100644 (file)
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/9000 b/test/confs/9000
index 9e9d2b00609f317bdb8fd933a5c36fc9d7569de3..eba80b8120bf9bc52f2cea99ffe9e056a05d6497 100644 (file)
--- a/test/confs/9000
+++ b/test/confs/9000
@@ -2,15 +2,10 @@
 
 LDAPSERVERS=
 
-exim_path = EXIM_PATH
+.include DIR/aux-var/std_conf_prefix
+
 keep_environment = LDAPTLS_REQCERT
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/9001 b/test/confs/9001
index cd474796fdbab16f06105fd9237ae10fc25082dc..0518519b83287f93906d9a6d89b41db9ab70d545 100644 (file)
--- a/test/confs/9001
+++ b/test/confs/9001
@@ -1,14 +1,8 @@
 # Exim test configuration 9001
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/9100 b/test/confs/9100
index a633b2879e7ef002fbf5e3cb7db6d7820ec6772a..a031f44decbfb7ee6fbd9df4d9f2e4f6cc1014af 100644 (file)
--- a/test/confs/9100
+++ b/test/confs/9100
@@ -1,14 +1,8 @@
 # Exim test configuration 9100
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/9200 b/test/confs/9200
index f934e51339213367a104e86b3a8a95ce7695c51f..04f52a9a01911fe76efabf5d2b72a26b6a4e3fd9 100644 (file)
--- a/test/confs/9200
+++ b/test/confs/9200
@@ -2,15 +2,9 @@
 
 SERVERS=localhost/test/ph10/
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/9300 b/test/confs/9300
index 45fb6a8de7700cb620268d1a99d712dcf5981b90..086b506c6a35e1f4f1cc11c908534a1dbaa9500b 100644 (file)
--- a/test/confs/9300
+++ b/test/confs/9300
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/9350 b/test/confs/9350
index f3baf2bbe3300ff214675cbf52e9b191343d3360..1ac5ebe5fde34ed744722a6906598fad19cfd453 100644 (file)
--- a/test/confs/9350
+++ b/test/confs/9350
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 

diff --git a/test/confs/9400 b/test/confs/9400
index 0317e853ae6345fab6b418632cd168dd69305bba..66ee61edcd2d193b3a04a57b47ce1de88612d207 100644 (file)
--- a/test/confs/9400
+++ b/test/confs/9400
@@ -1,15 +1,9 @@
 # Exim test configuration 9400
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/9401 b/test/confs/9401
index efa6af29a3d5faff818fe64769ca020954e41cac..a01167ecbe6a68f1d283ccc21d8bbb1f68f2a388 100644 (file)
--- a/test/confs/9401
+++ b/test/confs/9401
@@ -1,13 +1,7 @@
 # Exim test configuration 9401
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/9402 b/test/confs/9402
index b1aa065da433cb0c6a2eb0c53a894ee1a52b9620..6c00f1ee075175dc2972e63c25a3076000cdbff0 100644 (file)
--- a/test/confs/9402
+++ b/test/confs/9402
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/9450 b/test/confs/9450
index 91e0630d3075278c831d42b19424e48126d97c97..cc2379c88198dc18dbb6d1d02a95f537163f09d5 100644 (file)
--- a/test/confs/9450
+++ b/test/confs/9450
@@ -1,14 +1,8 @@
 # Exim test configuration 9450
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/9900 b/test/confs/9900
index 2f55484a769f46a3de6605cb1191005b241581c7..c042cd39a409cd9a2eb79074c0fc8120f1a8b933 100644 (file)
--- a/test/confs/9900
+++ b/test/confs/9900
@@ -1,13 +1,7 @@
 # Exim test configuration 9900
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/9901 b/test/confs/9901
index 3584b71e39b4d1e99cd798ea32fdf2b0f1aa5107..23ea43fefdf8fa25316ab7546beb8c8affb11f8f 100644 (file)
--- a/test/confs/9901
+++ b/test/confs/9901
@@ -3,15 +3,9 @@
 COM=
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/9902 b/test/confs/9902
index 95752ec35bfae28f297fa4c986cfb72acfad3ce8..77dc5a243d1901e2fdf888050f6ff19bd365e67f 100644 (file)
--- a/test/confs/9902
+++ b/test/confs/9902
@@ -4,14 +4,9 @@
 
 ORDER=
 
-exim_path = EXIM_PATH
-keep_environment =
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/9903 b/test/confs/9903
index 200ce25b34725872dae2299af4302bc8699e1942..7ef2c620a8b71e80816e0e6f2b898a078d29d503 100644 (file)
--- a/test/confs/9903
+++ b/test/confs/9903
@@ -1,13 +1,7 @@
 # Exim test configuration 9903
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/log/0196 b/test/log/0196
index dc36d26973696b9152a57d71e470d5b988d4b95e..2922e61976342d66d3106a5a7c952ba9e35b1ae6 100644 (file)
--- a/test/log/0196
+++ b/test/log/0196
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/0214 b/test/log/0214
index a8d17018669ef6f9b64778eb946d0f04a69ef3b8..fe0a673c54a41c56ecb4d85dde1a979ba0d23248 100644 (file)
--- a/test/log/0214
+++ b/test/log/0214
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=[127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address

diff --git a/test/log/0282 b/test/log/0282
index 0739b61eda70c9968e98c9b4f7a0155874c548aa..0f71226c471a161d544f20eb960810d15c425c2e 100644 (file)
--- a/test/log/0282
+++ b/test/log/0282
@@ -1,9 +1,11 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1225 [127.0.0.1]:1226 [ip4.ip4.ip4.ip4]:1227
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1]:1111 I=[127.0.0.1]:1225 P=esmtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1]:1112 I=[127.0.0.1]:1226 P=esmtp S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1225 [127.0.0.1]:1226 [ip4.ip4.ip4.ip4]:1227
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1]:1111 I=[127.0.0.1]:1225 P=esmtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1]:1112 I=[127.0.0.1]:1226 P=esmtp S=sss

diff --git a/test/log/0287 b/test/log/0287
index 5f49b81e75abf5bbff818ca5b61221b69d832ac4..3521d8ce29ca93652b6593f16441b5df2a000080 100644 (file)
--- a/test/log/0287
+++ b/test/log/0287
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 ETRN one received from (rhu.barb) [127.0.0.1]
 1999-03-02 09:44:33 ETRN one received from (rhu.barb) [127.0.0.1]

diff --git a/test/log/0300 b/test/log/0300
index df59db2fe1dce3b5a72ef31ce8a081ff51969738..036ef159c4d059fe25abcbb17d8550ea610d65c3 100644 (file)
--- a/test/log/0300
+++ b/test/log/0300
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "ehlo abcd" H=[127.0.0.1] next input="mail fr<suppressed>
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss

diff --git a/test/log/0301 b/test/log/0301
index 2edabd78ad57d8b735c2731639c17bd21918309e..3d28c21c90df4fb121fe535431cc017082c0e54c 100644 (file)
--- a/test/log/0301
+++ b/test/log/0301
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss

diff --git a/test/log/0420 b/test/log/0420
index fc68727c1ce957ad69a2d8da3a1d9d15f8fb008a..0052dbebe57d146969ca9b28237d92e47d20c377 100644 (file)
--- a/test/log/0420
+++ b/test/log/0420
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 h: <>
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=(client.test.ex) [127.0.0.1] P=smtp S=sss

diff --git a/test/log/0433 b/test/log/0433
index 9a80732d513b804958feb95f16784cab5693f2ce..44889aa72cdf53d24e1f298cbb75924ffd28a301 100644 (file)
--- a/test/log/0433
+++ b/test/log/0433
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4)

diff --git a/test/log/0438 b/test/log/0438
index ea329341382d26e62d541d50bd9394267e5d0f97..8c7ff16262103ae2c63218ac2ec09a4d8d9d2d09 100644 (file)
--- a/test/log/0438
+++ b/test/log/0438
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/0439 b/test/log/0439
index 05245e7f0a2e97eb14bf4c70f226419c179f8b80..c31d3987fe74c18a822b1321530d2d085f95895e 100644 (file)
--- a/test/log/0439
+++ b/test/log/0439
@@ -1,4 +1,6 @@
 1999-03-02 09:44:33 invalid value for message_size_limit: absolute value of integer "8796093022208M" is too large (overflow)
 1999-03-02 09:44:33 invalid message_size_limit: absolute value of integer "8796093022208M" is too large (overflow)
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 invalid message_size_limit: absolute value of integer "8796093022208M" is too large (overflow)

diff --git a/test/log/0454 b/test/log/0454
index 99c870d3af3c0d51c7e565c7d982cec1340745cf..e27fff213d3c53191f5eec2c9dc342ff40605292 100644 (file)
--- a/test/log/0454
+++ b/test/log/0454
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtp S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 => xx <userx@test.ex> R=r2 T=t1

diff --git a/test/log/0458 b/test/log/0458
index 7861a8cf103982769f2f1427ae99ee9a3d68fdb6..1defaf1d56e1af1d8b3af3cbaee3e811a533cef1 100644 (file)
--- a/test/log/0458
+++ b/test/log/0458
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1]:1111 I=[127.0.0.1]:1225 F=<userx@test.ex> rejected RCPT <userx@test.ex>
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1]:1112 I=[127.0.0.1]:1225 F=<userx@test.ex> rejected RCPT <userx@test.ex>

diff --git a/test/log/0460 b/test/log/0460
index e91c501bf37bfd1791d4af58c5ed765f1bc682b8..fd7e9444f0850b2cdb27133aad31dcae972d7e40 100644 (file)
--- a/test/log/0460
+++ b/test/log/0460
@@ -1,4 +1,6 @@
 **NOTE: The delivery lines in this file have been sorted.
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtp S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtp S=sss

diff --git a/test/log/0482 b/test/log/0482
index 3e72c8ae24dd219fa819b5c95cd45b3fe55c40d5..8b7bb7c591883af20fc3027c580ba165a07d61ae 100644 (file)
--- a/test/log/0482
+++ b/test/log/0482
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@test.ex> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx

diff --git a/test/log/0547 b/test/log/0547
index 3b86d2bd588032e2b808d6d4b77c5d5802ab6d94..34defc3476d54347154b619b7f8aae17f42c73f5 100644 (file)
--- a/test/log/0547
+++ b/test/log/0547
@@ -1,7 +1,9 @@
+1999-03-02 09:44:33 U=CALLER rejected EXPN x@y
+1999-03-02 09:44:33 no MAIL in SMTP connection from CALLER D=0s C=EXPN,QUIT
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 no MAIL in SMTP connection from [127.0.0.1] D=0s
 1999-03-02 09:44:33 no MAIL in SMTP connection from [127.0.0.1] D=0s C=QUIT
 1999-03-02 09:44:33 H=(x.y.z) [127.0.0.1] rejected VRFY a@b.c
 1999-03-02 09:44:33 no MAIL in SMTP connection from (x.y.z) [127.0.0.1] D=0s C=EHLO,VRFY,QUIT
-1999-03-02 09:44:33 U=CALLER rejected EXPN x@y
-1999-03-02 09:44:33 no MAIL in SMTP connection from CALLER D=0s C=EXPN,QUIT

diff --git a/test/log/0549 b/test/log/0549
index dc36d26973696b9152a57d71e470d5b988d4b95e..2922e61976342d66d3106a5a7c952ba9e35b1ae6 100644 (file)
--- a/test/log/0549
+++ b/test/log/0549
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/0556 b/test/log/0556
index 5f1631c5aa0a697af8bab018514c50dd74b381c2..1918dc13c5f902930e52ffb5ebd0cabc163943ae 100644 (file)
--- a/test/log/0556
+++ b/test/log/0556
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(abcd) [127.0.0.1] next input="Start: sent early ...\r\n"
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/0559 b/test/log/0559
index fcae1cf93a9baf8633b687af889731229b42d726..86d88c0400a629703b52567967538b06b792345f 100644 (file)
--- a/test/log/0559
+++ b/test/log/0559
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=(abcd) [127.0.0.1] P=esmtp

diff --git a/test/log/0561 b/test/log/0561
index 6c79f5a87733b8d42503c6696c8218cd3a2fec87..36658e8f413b462d1360b59c5a6c481784f0c449 100644 (file)
--- a/test/log/0561
+++ b/test/log/0561
@@ -2,25 +2,15 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: load average 0.01
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: load average 0.01
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 no immediate delivery: load average 0.01
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 no immediate delivery: load average 0.01
 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 no immediate delivery: load average 0.01
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbC-0005vi-00 no immediate delivery: load average 0.02
 1999-03-02 09:44:33 10HmbA-0005vi-00 => usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbC-0005vi-00"
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
@@ -28,3 +18,15 @@
 1999-03-02 09:44:33 10HmbD-0005vi-00 no immediate delivery: load average 0.01
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 1999-03-02 09:44:33 10HmbE-0005vi-00 no immediate delivery: load average 0.02
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 no immediate delivery: load average 0.01
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 no immediate delivery: load average 0.01
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 no immediate delivery: load average 0.01
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 no immediate delivery: load average 0.02

diff --git a/test/log/0562 b/test/log/0562
index 0f19e9cf45afa829a822f1a9a0ee19b179fc8850..14931e6904732f7113001691fae57982b48b0d8a 100644 (file)
--- a/test/log/0562
+++ b/test/log/0562
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 SMTP data timeout (message abandoned) on connection from (abcd) [127.0.0.1] F=<userx@test.ex>
 1999-03-02 09:44:33 NOTQUIT reason: 'data-timeout'

diff --git a/test/log/0570 b/test/log/0570
index f5a90bcdce5815c167aa5edd7435aaa2fc017855..fa76b71f18fd8095569a497844c52ef794e0e1cd 100644 (file)
--- a/test/log/0570
+++ b/test/log/0570
@@ -1,37 +1,18 @@
 **NOTE: The delivery lines in this file have been sorted.
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@primary.test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 => blackhole (RCPT ACL discarded recipients)
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@primary.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients)
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex
-1999-03-02 09:44:33 10HmbC-0005vi-00 => blackhole (RCPT ACL discarded recipients)
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex
-1999-03-02 09:44:33 10HmbD-0005vi-00 => blackhole (RCPT ACL discarded recipients)
-1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
 1999-03-02 09:44:33 10HmbB-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00"
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
@@ -40,6 +21,44 @@
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00"
+1999-03-02 09:44:33 10HmbE-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbG-0005vi-00"
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbH-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00"
+1999-03-02 09:44:33 10HmbH-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbJ-0005vi-00"
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbK-0005vi-00 -> usery@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00"
+1999-03-02 09:44:33 10HmbK-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00"
+1999-03-02 09:44:33 10HmbK-0005vi-00 => userz@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbM-0005vi-00"
+1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex
 1999-03-02 09:44:33 10HmbF-0005vi-00 => blackhole (RCPT ACL discarded recipients)
@@ -48,12 +67,6 @@
 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex
 1999-03-02 09:44:33 10HmbG-0005vi-00 => blackhole (RCPT ACL discarded recipients)
 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00"
-1999-03-02 09:44:33 10HmbE-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbG-0005vi-00"
-1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex
 1999-03-02 09:44:33 10HmbI-0005vi-00 => blackhole (RCPT ACL discarded recipients)
@@ -62,12 +75,6 @@
 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex
 1999-03-02 09:44:33 10HmbJ-0005vi-00 => blackhole (RCPT ACL discarded recipients)
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbH-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00"
-1999-03-02 09:44:33 10HmbH-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbJ-0005vi-00"
-1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domA.ex>: discarded by RCPT ACL
 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex
@@ -77,8 +84,3 @@
 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex
 1999-03-02 09:44:33 10HmbM-0005vi-00 => blackhole (RCPT ACL discarded recipients)
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbK-0005vi-00 -> usery@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00"
-1999-03-02 09:44:33 10HmbK-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00"
-1999-03-02 09:44:33 10HmbK-0005vi-00 => userz@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbM-0005vi-00"
-1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp

diff --git a/test/log/0608 b/test/log/0608
index 7d807e8f0a720f127ec709f459db01b9f59a0a57..a58c807e5fc927d99dd7016900fcccc22ac51111 100644 (file)
--- a/test/log/0608
+++ b/test/log/0608
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 helo localhost dnssec <no>
 1999-03-02 09:44:33 helo l-sec dnssec <yes>

diff --git a/test/log/0614 b/test/log/0614
index f52733f620b2087e714f95aaec653917d7649260..fb4e46837115784444ba8abb39f0a65236dca851 100644 (file)
--- a/test/log/0614
+++ b/test/log/0614
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4] (TCP/IP connection count = 1)
 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4] closed by QUIT

diff --git a/test/log/1007 b/test/log/1007
index 758316a67c6c8aa3d3f69de013190af4f951de7c..bc6a2964494949afe69da21c8e5c969ffbabe35d 100644 (file)
--- a/test/log/1007
+++ b/test/log/1007
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4)
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228

diff --git a/test/log/2002 b/test/log/2002
index 933905460ed80f2d582ccf7073bfaba5a92b361a..61a8a12a772b9dfd0f1a6f285f88f622606f877a 100644 (file)
--- a/test/log/2002
+++ b/test/log/2002
@@ -1,3 +1,13 @@
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
@@ -25,11 +35,3 @@
 1999-03-02 09:44:33 sha256 fingerprint 7E194665AE12FD9AF8E604427D512E846E75EC96032BF78BAD707426F01CFF17
 1999-03-02 09:44:33 der_b64 MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDExMjM0MzhaFw0zODAxMDExMjM0MzhaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALoxxS9eRRSkEJF5CmlLToLY3886wsCOc+vuBo+2V69Q7aCC3Wa13UTZ7SVPhliw29gl48Ua7Go5E6E4+6n7SNL+VfuMtNg2zs4BIhXTfiPZ9U2YF77+Y64MFPBxK98F/RB/wjqAiWf5aigaQCSGX7Bf1bb1s3UwCi0M/wXHYj7TAgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHgYDVR0RBBcwFYITc2VydmVyMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQCZCepTW/JRRZlxxEIcQVlQLpdcxuJnYvNbZwzn7Os0K7og1S7jl4PDncao6APk6f4WAfFjb4ZZc1NytSHPLuodWToY1bUzIBMKwk9Jof2yw2mr/3ElyzRDlVmXri+6b0X5WmfMeWI7npeb6Pl6n18tTYKkGGcFwsFsC+CeuLOzNw==
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=yes DN="CN=server2.example.com" S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf

diff --git a/test/log/2003 b/test/log/2003
index 2d51a6195a699945df91484ebed38ba18051f96e..1505af3f7cbb71544a8d4b81e32417891a8bba58 100644 (file)
--- a/test/log/2003
+++ b/test/log/2003
@@ -1,7 +1,9 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss

diff --git a/test/log/2004 b/test/log/2004
index c3a2fe070bcd440291676bcdf029e04549ae94cc..bf29eba23a62706f416ff1e7850eacf110774181 100644 (file)
--- a/test/log/2004
+++ b/test/log/2004
@@ -1,7 +1,9 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: encryption required
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtp S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: encryption required
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtp S=sss

diff --git a/test/log/2005 b/test/log/2005
index 1cdd5d972a9bc6bddca272de8faa6e93debd1213..ddb0eaae2ab3f63339849c1a2c826128507ee280 100644 (file)
--- a/test/log/2005
+++ b/test/log/2005
@@ -1,4 +1,6 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required

diff --git a/test/log/2006 b/test/log/2006
index c34f51d38ed8dcc20c2856e3ad8686a2f2b8c22c..ce9a5032bf088f34274e06b7052c28a2575567b1 100644 (file)
--- a/test/log/2006
+++ b/test/log/2006
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 SMTP command timeout on TLS connection from [127.0.0.1]

diff --git a/test/log/2014 b/test/log/2014
index a31d93e1c9ee44cb5e82a38e19b209a7e5c1bb8e..8af6a484d5e6d4036275aa6f8f2965889d629e89 100644 (file)
--- a/test/log/2014
+++ b/test/log/2014
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
 1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=

diff --git a/test/log/2015 b/test/log/2015
index 204057a7cab5a4cb13f0cb602027412cb70a1e0e..9f59986409bca960e9da844747571fa052439d5f 100644 (file)
--- a/test/log/2015
+++ b/test/log/2015
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [127.0.0.1] (gnutls_handshake): timed out

diff --git a/test/log/2018 b/test/log/2018
index 15eb43fbf39ac81a8fdfa464b2cb0218c4905ca5..25c51a131d743c419de30140e1eb99e2a3edc341 100644 (file)
--- a/test/log/2018
+++ b/test/log/2018
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: "You must encrypt"

diff --git a/test/log/2019 b/test/log/2019
index 1ba4ba084a843dd6ba8fc4fbaca55c54f6f8a3f0..1e96ea105079ccf745d5fd0821668ca9623a6d41 100644 (file)
--- a/test/log/2019
+++ b/test/log/2019
@@ -1,9 +1,11 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss

diff --git a/test/log/2022 b/test/log/2022
index dc36d26973696b9152a57d71e470d5b988d4b95e..2922e61976342d66d3106a5a7c952ba9e35b1ae6 100644 (file)
--- a/test/log/2022
+++ b/test/log/2022
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/2024 b/test/log/2024
index 117382b5a1baa35b1f26683959822f851df0e7a8..f7f6619c0701823162c7a603b16d7ca21a46cc83 100644 (file)
--- a/test/log/2024
+++ b/test/log/2024
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (certificate verification failed): certificate invalid
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/2029 b/test/log/2029
index e4510feb17c714520d78337e351c1fb8e7552c74..6d667ffc63229a7407a38a17b025fc5acd8f00e7 100644 (file)
--- a/test/log/2029
+++ b/test/log/2029
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated.
 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=[127.0.0.1] P=smtps

diff --git a/test/log/2034 b/test/log/2034
index f59667e7a549a6d6c6f7371002c5f858dbc180c9..33f138ae2845f8941be8f1e19b05f3c13f1e8122 100644 (file)
--- a/test/log/2034
+++ b/test/log/2034
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [127.0.0.1] (gnutls_handshake): timed out
 1999-03-02 09:44:33 SMTP command timeout on connection from (rhu.barb) [127.0.0.1]

diff --git a/test/log/2102 b/test/log/2102
index 838930a8241bca84ff570984e0b34a1e2600c162..41400aba79a2b0c44417a978a50a4f3a7d433ef7 100644 (file)
--- a/test/log/2102
+++ b/test/log/2102
@@ -1,3 +1,13 @@
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
@@ -28,11 +38,3 @@
 1999-03-02 09:44:33 sha256 fingerprint 7E194665AE12FD9AF8E604427D512E846E75EC96032BF78BAD707426F01CFF17
 1999-03-02 09:44:33 der_b64 MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDExMjM0MzhaFw0zODAxMDExMjM0MzhaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALoxxS9eRRSkEJF5CmlLToLY3886wsCOc+vuBo+2V69Q7aCC3Wa13UTZ7SVPhliw29gl48Ua7Go5E6E4+6n7SNL+VfuMtNg2zs4BIhXTfiPZ9U2YF77+Y64MFPBxK98F/RB/wjqAiWf5aigaQCSGX7Bf1bb1s3UwCi0M/wXHYj7TAgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHgYDVR0RBBcwFYITc2VydmVyMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQCZCepTW/JRRZlxxEIcQVlQLpdcxuJnYvNbZwzn7Os0K7og1S7jl4PDncao6APk6f4WAfFjb4ZZc1NytSHPLuodWToY1bUzIBMKwk9Jof2yw2mr/3ElyzRDlVmXri+6b0X5WmfMeWI7npeb6Pl6n18tTYKkGGcFwsFsC+CeuLOzNw==
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLSv1:AES256-SHA:256 CV=yes DN="/CN=server2.example.com" S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf

diff --git a/test/log/2103 b/test/log/2103
index 2dc2a36a0d36c9ede62c2cd68781430df92deb11..9485414c6f6bdc51516b8113a94128607a9f7281 100644 (file)
--- a/test/log/2103
+++ b/test/log/2103
@@ -1,7 +1,9 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLSv1:AES256-SHA:256
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLSv1:AES256-SHA:256 CV=no S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLSv1:AES256-SHA:256
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLSv1:AES256-SHA:256 CV=no S=sss

diff --git a/test/log/2104 b/test/log/2104
index c3a2fe070bcd440291676bcdf029e04549ae94cc..bf29eba23a62706f416ff1e7850eacf110774181 100644 (file)
--- a/test/log/2104
+++ b/test/log/2104
@@ -1,7 +1,9 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: encryption required
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtp S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: encryption required
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtp S=sss

diff --git a/test/log/2105 b/test/log/2105
index 1cdd5d972a9bc6bddca272de8faa6e93debd1213..ddb0eaae2ab3f63339849c1a2c826128507ee280 100644 (file)
--- a/test/log/2105
+++ b/test/log/2105
@@ -1,4 +1,6 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required

diff --git a/test/log/2106 b/test/log/2106
index c34f51d38ed8dcc20c2856e3ad8686a2f2b8c22c..ce9a5032bf088f34274e06b7052c28a2575567b1 100644 (file)
--- a/test/log/2106
+++ b/test/log/2106
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 SMTP command timeout on TLS connection from [127.0.0.1]

diff --git a/test/log/2114 b/test/log/2114
index 6f989674814fa8ff748bdb547805bd34a22b1682..3d42197743177e6e812af98924241d5bd6a7a6cc 100644 (file)
--- a/test/log/2114
+++ b/test/log/2114
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 TLS client disconnected cleanly (rejected our certificate?)

diff --git a/test/log/2115 b/test/log/2115
index 8bbb8bf60fabc258b4883cf22aafac4334f76c5b..bb8794be6b8bdc044401c0188c22fa4e8da37732 100644 (file)
--- a/test/log/2115
+++ b/test/log/2115
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [127.0.0.1] (SSL_accept): timed out

diff --git a/test/log/2118 b/test/log/2118
index 314e524a213c3daa6234284659f26f2df3b24c36..a797ddb2c6b18217403d1a0aae73dc5e8f16ff1a 100644 (file)
--- a/test/log/2118
+++ b/test/log/2118
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtps X=TLSv1:AES256-SHA:256 CV=no S=sss
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: "You must encrypt"

diff --git a/test/log/2119 b/test/log/2119
index 9551633fb05d2d41f591e7761a1ec4d0645fc916..50ba0ab6bf663ed52f37962e0c9c095c341663aa 100644 (file)
--- a/test/log/2119
+++ b/test/log/2119
@@ -1,9 +1,11 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLSv1:AES256-SHA:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLSv1:AES256-SHA:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss

diff --git a/test/log/2122 b/test/log/2122
index dc36d26973696b9152a57d71e470d5b988d4b95e..2922e61976342d66d3106a5a7c952ba9e35b1ae6 100644 (file)
--- a/test/log/2122
+++ b/test/log/2122
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/2124 b/test/log/2124
index 46481910ffef456d43a2b85298d3bca0fabf84ac..ba22aac7fee6f3c68b994024b971878835aa302a 100644 (file)
--- a/test/log/2124
+++ b/test/log/2124
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>

diff --git a/test/log/2132 b/test/log/2132
index c1da0f24c49f7bb16e05014a92c38e3d220e527c..d968a907ae8a668506fe9c984fa9636e73a60621 100644 (file)
--- a/test/log/2132
+++ b/test/log/2132
@@ -1,3 +1,13 @@
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
@@ -10,11 +20,3 @@
 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
 1999-03-02 09:44:33 SN  <CN=server1.example.com>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLSv1:AES256-SHA:256 CV=yes DN="/CN=server1.example.com" S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf

diff --git a/test/log/2150 b/test/log/2150
index 01c430781175525e4e84af385866ed663fef7025..52dcd14c794a13154b79bde1f92d77e05e37d7a5 100644 (file)
--- a/test/log/2150
+++ b/test/log/2150
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=[127.0.0.1] P=smtps

diff --git a/test/log/2201 b/test/log/2201
index d413ddaf30154edefb6fffaf2feef6cb7104f6fb..f1decad00746a4bc2fbb59f83522041e2edd81c2 100644 (file)
--- a/test/log/2201
+++ b/test/log/2201
@@ -1,7 +1,9 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@shorthost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => t@test.ex R=r0 T=remote_delivery H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex

diff --git a/test/log/3000 b/test/log/3000
index 529c9292df9a38609ebfc9dafcbfcd77d1331e56..75f1c67db2f78327a6b44731ebb8f05b6cfbc709 100644 (file)
--- a/test/log/3000
+++ b/test/log/3000
@@ -1,3 +1,5 @@
 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.

diff --git a/test/log/3450 b/test/log/3450
index 427464dd36d779135cc418f17634eb590090e2d1..82a03b10cfc29844159f553957d5e74d4b4589fa 100644 (file)
--- a/test/log/3450
+++ b/test/log/3450
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 H=(foobar) [127.0.0.1] rejected AUTH plain AHVzZXJ4AHNlY3JldA==: STARTTLS required before AUTH

diff --git a/test/log/3453 b/test/log/3453
index ea329341382d26e62d541d50bd9394267e5d0f97..8c7ff16262103ae2c63218ac2ec09a4d8d9d2d09 100644 (file)
--- a/test/log/3453
+++ b/test/log/3453
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/3454 b/test/log/3454
index 27d8866d40e917e7cc4f0f4b835a274b5239a9c6..d047667e76d13b0bde1c4883bd50cf8e2c28e3ad 100644 (file)
--- a/test/log/3454
+++ b/test/log/3454
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated.
 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (send): The specified session has been invalidated for some reason.

diff --git a/test/log/3455 b/test/log/3455
index f64dbff30539f080856dd76e28386eb882375ba2..445ff3e9353ad1d1fb46e32e2796ea33849d274c 100644 (file)
--- a/test/log/3455
+++ b/test/log/3455
@@ -1,12 +1,14 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no A=plain C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=login:usery S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] A=login C="250 OK id=10HmaZ-0005vi-00"
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=login:usery S=sss id=E10HmaX-0005vi-00@myhost.test.ex

diff --git a/test/log/3460 b/test/log/3460
index 427464dd36d779135cc418f17634eb590090e2d1..82a03b10cfc29844159f553957d5e74d4b4589fa 100644 (file)
--- a/test/log/3460
+++ b/test/log/3460
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 H=(foobar) [127.0.0.1] rejected AUTH plain AHVzZXJ4AHNlY3JldA==: STARTTLS required before AUTH

diff --git a/test/log/3463 b/test/log/3463
index ea329341382d26e62d541d50bd9394267e5d0f97..8c7ff16262103ae2c63218ac2ec09a4d8d9d2d09 100644 (file)
--- a/test/log/3463
+++ b/test/log/3463
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/3464 b/test/log/3464
index e513a61dd98d89fe879706e5f9ad68d4a003d2c5..2063b33ba123cce62aa2bb6f2fa809a32477d23f 100644 (file)
--- a/test/log/3464
+++ b/test/log/3464
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 no MAIL in SMTP connection from [127.0.0.1] D=0s X=TLSv1:AES256-SHA:256 CV=no C=EHLO,STARTTLS,AUTH
 1999-03-02 09:44:33 no MAIL in SMTP connection from (foobar) [127.0.0.1] D=0s A=plain:userx X=TLSv1:AES256-SHA:256 CV=no C=EHLO,STARTTLS,EHLO,AUTH,QUIT

diff --git a/test/log/3465 b/test/log/3465
index 3ee4fc49217ecf0a8ef07d809d0259c0564bda13..bfa1f38cdea134dd5887cf0d79ffecbc44397a85 100644 (file)
--- a/test/log/3465
+++ b/test/log/3465
@@ -1,12 +1,14 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:AES256-SHA:256 CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no A=plain C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=login:usery S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] A=login C="250 OK id=10HmaZ-0005vi-00"
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:AES256-SHA:256 CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=login:usery S=sss id=E10HmaX-0005vi-00@myhost.test.ex

diff --git a/test/log/4201 b/test/log/4201
index 5a2740c8713d5beb05b63f0c418bfa236cee8e73..2643dd9ec7b33c32c53bf4224142ea0ae48b303d 100644 (file)
--- a/test/log/4201
+++ b/test/log/4201
@@ -1,15 +1,17 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@test.ex F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for usery@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@test.ex F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
-1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff

diff --git a/test/log/4202 b/test/log/4202
index f2b796de09f42e652608e27d34c327da48bbb191..e99860fd525d857737a9c09d674529225a55cb1f 100644 (file)
--- a/test/log/4202
+++ b/test/log/4202
@@ -1,16 +1,18 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= user.dontcare@test1.com U=CALLER P=local S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= user.dontcare@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for userx@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex F=<user.dontcare@test1.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= user.dontcare@test1.com U=CALLER P=local S=sss for user.他们为什么不说中文@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= user.dontcare@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.他们为什么不说中文@test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => user.他们为什么不说中文@test.ex F=<user.dontcare@test1.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= 他们为什么不说中文@test1.com U=CALLER P=local S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= 他们为什么不说中文@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name for userx@test.ex
 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@test.ex F=<他们为什么不说中文@test1.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= user.dontcare@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for userx@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= user.dontcare@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.他们为什么不说中文@test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= 他们为什么不说中文@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name for userx@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

diff --git a/test/log/4203 b/test/log/4203
index b71e770be9579d281f3527c6b72430c898c666e4..a1acf570ea04b87a6396febb3ad95151b6d4f9f5 100644 (file)
--- a/test/log/4203
+++ b/test/log/4203
@@ -1,4 +1,3 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local U=CALLER P=utf8local-esmtp S=sss for userz@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userz@test.ex F=<यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1]: utf8 support required but not offered for forwarding
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
@@ -8,3 +7,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 => TESTSUITE/test-mail/यहलोगहिन्दीक्योंनहींबोलसकतेहैं <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> F=<> R=bounces T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qfl
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/4204 b/test/log/4204
index 22fcd881646d02d644759b971e929b72680ef0d7..0dd1f89a63291950bfa24723e781ccc5be8a44ce 100644 (file)
--- a/test/log/4204
+++ b/test/log/4204
@@ -1,13 +1,17 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com U=CALLER P=utf8local-esmtp S=sss for userQ@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@test.ex <userQ@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com U=CALLER P=utf8local-esmtp S=sss for userR@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userr@test.ex <userR@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userQ@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
@@ -15,5 +19,3 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8

diff --git a/test/log/4205 b/test/log/4205
index caa52bd9d690d2c989179f028a9d55dc814374fa..a73c38c519b91a81c8f45581e51919fe87fd77e9 100644 (file)
--- a/test/log/4205
+++ b/test/log/4205
@@ -1,8 +1,10 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userU@test.ex U=CALLER P=utf8local-esmtp S=sss for user.γλυκύρριζα@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => user.γλυκύρριζα@test.ex F=<userU@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.γλυκύρριζα@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

diff --git a/test/log/4206 b/test/log/4206
index 78a4d1a5225353e90f39c05fdd3b353ff4570317..cab609f558112985b1ac6a9718804923b28c2b2a 100644 (file)
--- a/test/log/4206
+++ b/test/log/4206
@@ -1,13 +1,19 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userV.වැල්_මී@test.ex U=CALLER P=utf8local-esmtp S=sss for user.அதிமதுரம்@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => user.அதிமதுரம்@test.ex F=<userV.වැල්_මී@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userW@test.ex U=CALLER P=utf8local-esmtp S=sss for user.ഇരട്ടിമധുരം@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => user.ഇരട്ടിമധുരം@test.ex F=<userW@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
+1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.அதிமதுரம்@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
@@ -15,7 +21,3 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
-1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed

diff --git a/test/log/4207 b/test/log/4207
index f6171fd4558b198320ef2f1be9024de2b3b68b98..797a2b9092c7831857ce6e0c85540893005b0238 100644 (file)
--- a/test/log/4207
+++ b/test/log/4207
@@ -1,8 +1,10 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for user.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for xn--user.-f99s29a80cg5i8xgv8fnb734dq4gv6av8eczab60f5jch09a5ea085a0marwd373e180hea90e@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => xn--user.-f99s29a80cg5i8xgv8fnb734dq4gv6av8eczab60f5jch09a5ea085a0marwd373e180hea90e@test.ex <user.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex> F=<xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for xn--user.-f99s29a80cg5i8xgv8fnb734dq4gv6av8eczab60f5jch09a5ea085a0marwd373e180hea90e@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <xn--user.-f99s29a80cg5i8xgv8fnb734dq4gv6av8eczab60f5jch09a5ea085a0marwd373e180hea90e@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

diff --git a/test/log/4208 b/test/log/4208
index 73e18635a0b7a2d96bab7019264aa4b1e4b5f0ad..117c2ca482ce8b10146f78239c2f0325b241053d 100644 (file)
--- a/test/log/4208
+++ b/test/log/4208
@@ -1,2 +1,4 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted

diff --git a/test/log/4209 b/test/log/4209
index 0f42fec2ad3b35d0e96b845ccd80d78d87726296..dd0bbe405e40e8b1c8052a1f5aa53f95e9cae382 100644 (file)
--- a/test/log/4209
+++ b/test/log/4209
@@ -1,17 +1,19 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= 他们为什么不说中文@test1.com U=CALLER P=local S=sss for user.他们为什么不说中文@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.他们为什么不说中文@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => user.他们为什么不说中文@test.ex F=<他们为什么不说中文@test1.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@test1.com U=CALLER P=local S=sss for user.他们为什么不说中文@test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => xn--user.-si1hohvdvf05c4gvj200y0o6f@test.ex <user.他们为什么不说中文@test.ex> F=<xn--ihqwcrb4cv8a8dqg056pqjye@test1.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.他们为什么不说中文@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.他们为什么不说中文@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@test1.com U=CALLER P=local S=sss for user.他们为什么不说中文@test.ex
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for xn--user.-si1hohvdvf05c4gvj200y0o6f@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => xn--user.-si1hohvdvf05c4gvj200y0o6f@test.ex <user.他们为什么不说中文@test.ex> F=<xn--ihqwcrb4cv8a8dqg056pqjye@test1.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <xn--user.-si1hohvdvf05c4gvj200y0o6f@test.ex> R=localuser
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed

diff --git a/test/log/4211 b/test/log/4211
index 3d7441af3d9a3be4fb5f877dcea02a25b765dd48..6e475eeb5da051e174f94e933e72231fbe649c2c 100644 (file)
--- a/test/log/4211
+++ b/test/log/4211
@@ -1,15 +1,17 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@test.ex F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for usery@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@test.ex F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
-1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff

diff --git a/test/log/4213 b/test/log/4213
index a52e735fc28c20e183797a773ba5129b25350d4a..e0c0a43d9495e927fa8122d4f9147664bad11e3d 100644 (file)
--- a/test/log/4213
+++ b/test/log/4213
@@ -1,4 +1,3 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local U=CALLER P=utf8local-esmtp S=sss for userz@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userz@test.ex F=<यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no: utf8 support required but not offered for forwarding
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
@@ -8,3 +7,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 => TESTSUITE/test-mail/यहलोगहिन्दीक्योंनहींबोलसकतेहैं <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> F=<> R=bounces T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qfl
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/4214 b/test/log/4214
index 53f5bbb7f48a020fe3a8e3b09f45835e321b8145..97a89fd80633cde4ffdd79fb9e0a11f6281d6669 100644 (file)
--- a/test/log/4214
+++ b/test/log/4214
@@ -1,13 +1,17 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com U=CALLER P=utf8local-esmtp S=sss for userQ@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@test.ex <userQ@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com U=CALLER P=utf8local-esmtp S=sss for userR@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userr@test.ex <userR@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userQ@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
@@ -15,5 +19,3 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8

diff --git a/test/log/4215 b/test/log/4215
index 727375938f578e317657c13e7fd51a64650b22a4..155008e4a5b663c4f438f40acb8be7880f0460b3 100644 (file)
--- a/test/log/4215
+++ b/test/log/4215
@@ -1,8 +1,10 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userU@test.ex U=CALLER P=utf8local-esmtp S=sss for user.γλυκύρριζα@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => user.γλυκύρριζα@test.ex F=<userU@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.γλυκύρριζα@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

diff --git a/test/log/4216 b/test/log/4216
index ae2171ad33720c88ded964c5c98235c649783c45..75941e1d3fb3301e18f0c2e07973b03edb91825c 100644 (file)
--- a/test/log/4216
+++ b/test/log/4216
@@ -1,13 +1,19 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userV.වැල්_මී@test.ex U=CALLER P=utf8local-esmtp S=sss for user.அதிமதுரம்@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => user.அதிமதுரம்@test.ex F=<userV.වැල්_මී@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userW@test.ex U=CALLER P=utf8local-esmtp S=sss for user.ഇരട്ടിമധുരം@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => user.ഇരട്ടിമധുരം@test.ex F=<userW@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
+1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.அதிமதுரம்@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
@@ -15,7 +21,3 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
-1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed

diff --git a/test/log/4221 b/test/log/4221
index 72dcf1539c60a546df4216fc50e5307f2f1dce0a..9e7adca52749aa6a22df273595ea8e674c1f79ff 100644 (file)
--- a/test/log/4221
+++ b/test/log/4221
@@ -1,15 +1,17 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@test.ex F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for usery@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@test.ex F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
-1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <usery@test.ex> R=localuser
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff

diff --git a/test/log/4223 b/test/log/4223
index 4d8763d66bdac2d126415927ab516352915edaa7..fb5a1defe6e24cd54261af589b90a71d298b12da 100644 (file)
--- a/test/log/4223
+++ b/test/log/4223
@@ -1,4 +1,3 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local U=CALLER P=utf8local-esmtp S=sss for userz@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userz@test.ex F=<यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no: utf8 support required but not offered for forwarding
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
@@ -8,3 +7,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 => TESTSUITE/test-mail/यहलोगहिन्दीक्योंनहींबोलसकतेहैं <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> F=<> R=bounces T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qfl
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

diff --git a/test/log/4224 b/test/log/4224
index a2e969f25b17ce22beaa8ce7308113d56eb8891f..d58181e2490033b89cfd65fd6a8f36887cbe9665 100644 (file)
--- a/test/log/4224
+++ b/test/log/4224
@@ -1,13 +1,17 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com U=CALLER P=utf8local-esmtp S=sss for userQ@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@test.ex <userQ@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com U=CALLER P=utf8local-esmtp S=sss for userR@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userr@test.ex <userR@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userQ@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
@@ -15,5 +19,3 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8

diff --git a/test/log/4225 b/test/log/4225
index de2cda15ebbd641ab0b5a384127bcad3b54cad3e..8723ea7aed83e1b32dde0306426a4bf7cff4e27f 100644 (file)
--- a/test/log/4225
+++ b/test/log/4225
@@ -1,8 +1,10 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userU@test.ex U=CALLER P=utf8local-esmtp S=sss for user.γλυκύρριζα@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => user.γλυκύρριζα@test.ex F=<userU@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.γλυκύρριζα@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

diff --git a/test/log/4226 b/test/log/4226
index 68197ab8f4ba1b7d2379a97eca935f6ee4f72daa..d2e4a1c8d7fd6d11e7333614c3400ac9f1e1de04 100644 (file)
--- a/test/log/4226
+++ b/test/log/4226
@@ -1,13 +1,19 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userV.වැල්_මී@test.ex U=CALLER P=utf8local-esmtp S=sss for user.அதிமதுரம்@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => user.அதிமதுரம்@test.ex F=<userV.වැල්_මී@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userW@test.ex U=CALLER P=utf8local-esmtp S=sss for user.ഇരട്ടിമധുരം@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => user.ഇരട്ടിമധുരം@test.ex F=<userW@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
+1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.அதிமதுரம்@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
@@ -15,7 +21,3 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qqff
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
-1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
-1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed

diff --git a/test/log/4804 b/test/log/4804
index c7ae7058eeda90de0a0f9b6e1d0d57ab341f6ab7..6f450eb2e13c2b8b326d3c294b880f98a5a82901 100644 (file)
--- a/test/log/4804
+++ b/test/log/4804
@@ -1,19 +1,21 @@
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nologging@l-sec.test.ex> R=server
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 => nologging@l-sec.test.ex R=client T=send_to_server H=l-sec.test.ex [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <withlogging@l-sec.test.ex> R=server
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => withlogging@l-sec.test.ex R=client T=send_to_server H=l-sec.test.ex DS [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 => withlogging@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nologging@l-sec.test.ex> R=server
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <withlogging@l-sec.test.ex> R=server
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@myhost.test.ex
 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <withlogging@thishost.test.ex> R=server
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 => withlogging@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed

diff --git a/test/log/5410 b/test/log/5410
index 36c0fe50bbcbab7978e46a52a4afaf998236ee11..805f4d9a7ae6029dcead67b8a40ff7d6bebca09f 100644 (file)
--- a/test/log/5410
+++ b/test/log/5410
@@ -1,16 +1,18 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmaY-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaX-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbA-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbC-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00"
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 no immediate delivery: queued by ACL
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbB-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 no immediate delivery: queued by ACL

diff --git a/test/log/5420 b/test/log/5420
index 5c7761cbeb295671bd1cf28a834fb9c3ec21bf9d..a08d4b292f5f4714714d9aa43646de921e33d878 100644 (file)
--- a/test/log/5420
+++ b/test/log/5420
@@ -1,16 +1,18 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmaY-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaX-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbA-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbC-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00"
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 no immediate delivery: queued by ACL
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbB-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 no immediate delivery: queued by ACL

diff --git a/test/log/5500 b/test/log/5500
index 997a32e3160e1a27363f99778cacb131bb14289d..1d445cab5f69433e6ea49897844793acf1b58484 100644 (file)
--- a/test/log/5500
+++ b/test/log/5500
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 prdr_requested: <yes>
 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R=<userx@test.ex> acceptance

diff --git a/test/log/5600 b/test/log/5600
index 65ce5511838f78910d2f7142a5ae1d9868a7e5b7..b2e7855622322fcbe9ca75c0f2de2b3c08b563a7 100644 (file)
--- a/test/log/5600
+++ b/test/log/5600
@@ -1,13 +1,11 @@
-1999-03-02 09:44:33 1: Server sends good staple on request
+
+******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq)
 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified)
-1999-03-02 09:44:33 2: Server does not staple an outdated response
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq)
-1999-03-02 09:44:33 3: Server does not staple a response for a revoked cert
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq)
-1999-03-02 09:44:33 4: Connection functions when server is prepared to staple but client does not request it
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq)

diff --git a/test/paniclog/0148 b/test/paniclog/0148
index d9985aabdc0b9077e436a9949f5af699a4d6732d..b0433024760db7c8b638bc74d6a4146c5c687ef7 100644 (file)
--- a/test/paniclog/0148
+++ b/test/paniclog/0148
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 12 of TESTSUITE/test-config:
   missing quote at end of string value for hold_domains

diff --git a/test/paniclog/0236 b/test/paniclog/0236
index 6b472bcd885cdd47029f51affe9e12563d9719f4..0b188c736f037db8db9963f01dbf5bc60597c083 100644 (file)
--- a/test/paniclog/0236
+++ b/test/paniclog/0236
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 10 of TESTSUITE/test-config:
   macro name too long (maximum is 63 characters)

diff --git a/test/paniclog/0290 b/test/paniclog/0290
index 40585c690503d9d4dbc7ecc80aefc7c02f87ef7c..3d01d63bbb1a8a489e193dbb31a7c00024da5cd2 100644 (file)
--- a/test/paniclog/0290
+++ b/test/paniclog/0290
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 28 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
   .include specifies a non-absolute path "non/absolute"

diff --git a/test/paniclog/0348 b/test/paniclog/0348
index d18082f4ca07679dba7ffffdec17fb272d58d357..70311339fa2b215661c8cc500908b3eb72e4a2b3 100644 (file)
--- a/test/paniclog/0348
+++ b/test/paniclog/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   bad parameters for retry rule

diff --git a/test/paniclog/0415 b/test/paniclog/0415
index 4e5fcc9c6f6fb130cf4158471ab10bb4916e18ba..2ed26d3f303b7e8be6b7aaf9023e242e9fc7cbd0 100644 (file)
--- a/test/paniclog/0415
+++ b/test/paniclog/0415
@@ -1,20 +1,20 @@
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
   absolute value of integer "4000000M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
   extra characters follow integer value for check_spool_space
-1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
   integer "4000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
   absolute value of integer "999999999999999999" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
   absolute value of integer "999999999K" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
   absolute value of integer "999999M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
   integer expected for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries

diff --git a/test/paniclog/0439 b/test/paniclog/0439
index 9b990fca50760bf42b5a282158414161ea1458f8..18974ef51daf839916cf837033fc500dc81583ee 100644 (file)
--- a/test/paniclog/0439
+++ b/test/paniclog/0439
@@ -1,3 +1,5 @@
 1999-03-02 09:44:33 invalid value for message_size_limit: absolute value of integer "8796093022208M" is too large (overflow)
 1999-03-02 09:44:33 invalid message_size_limit: absolute value of integer "8796093022208M" is too large (overflow)
+
+******** SERVER ********
 1999-03-02 09:44:33 invalid message_size_limit: absolute value of integer "8796093022208M" is too large (overflow)

diff --git a/test/paniclog/0442 b/test/paniclog/0442
index f8afd85ea7ba2b3d4ec1655a6058b63057cb49a1..85904224ebf58e718db72dfb6701630c99c7afc4 100644 (file)
--- a/test/paniclog/0442
+++ b/test/paniclog/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 38 of TESTSUITE/test-config:
   failed to open included configuration file /non/existent

diff --git a/test/rejectlog/0214 b/test/rejectlog/0214
index 614af1fb52aa3a720f4a737d21b40bb48552503c..5cdd84c43931e84be02165fdd311e371707d0969 100644 (file)
--- a/test/rejectlog/0214
+++ b/test/rejectlog/0214
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=[127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address
 Envelope-from: <x@y.x>
 Envelope-to: <x@test.ex>

diff --git a/test/rejectlog/0300 b/test/rejectlog/0300
index 5554fb4503c66479552f8d467157d5d0b921a60e..037f03fdb79aab7efe4040e36ce24ca4b161bd1e 100644 (file)
--- a/test/rejectlog/0300
+++ b/test/rejectlog/0300
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "ehlo abcd" H=[127.0.0.1] next input="mail fr<suppressed>
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(abcd) [127.0.0.1] next input="the mes<suppressed>
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<userx@test.ex>" H=(abcd) [127.0.0.1] next input="rcpt to<suppressed>

diff --git a/test/rejectlog/0301 b/test/rejectlog/0301
index e6346cd9fd3f1ea17855504c3ebb50844b3e2b59..cc6a4b0924617d7900539db8b79d0ddc86ab6cc1 100644 (file)
--- a/test/rejectlog/0301
+++ b/test/rejectlog/0301
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(en.force) [127.0.0.1] next input="the mes<suppressed>

diff --git a/test/rejectlog/0458 b/test/rejectlog/0458
index 99d0039907d29861fc8e5c80c9d671cf187d8a9b..05bacb912e9073d10a655700133a8bcc86f265d7 100644 (file)
--- a/test/rejectlog/0458
+++ b/test/rejectlog/0458
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1]:1111 I=[127.0.0.1]:1225 F=<userx@test.ex> rejected RCPT <userx@test.ex>
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1]:1112 I=[127.0.0.1]:1225 F=<userx@test.ex> rejected RCPT <userx@test.ex>
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1]:1113 I=[127.0.0.1]:1225 rejected MAIL <deny@test.ex>

diff --git a/test/rejectlog/0482 b/test/rejectlog/0482
index f829fb217d34ab4ee9447beb7f072c863fe6cf4f..9bbdd8691d8f777bdd4970b122ee92dc8195e47c 100644 (file)
--- a/test/rejectlog/0482
+++ b/test/rejectlog/0482
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@test.ex> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx
 Envelope-from: <userx@test.ex>
 Envelope-to: <userx@test.ex>

diff --git a/test/rejectlog/0547 b/test/rejectlog/0547
index e72b967dde94fd9f71c44fd169b952cad8e6071c..e9e6a30e6cada86e41ee1b0f0d9656391c76a268 100644 (file)
--- a/test/rejectlog/0547
+++ b/test/rejectlog/0547
@@ -1,2 +1,4 @@
-1999-03-02 09:44:33 H=(x.y.z) [127.0.0.1] rejected VRFY a@b.c
 1999-03-02 09:44:33 U=CALLER rejected EXPN x@y
+
+******** SERVER ********
+1999-03-02 09:44:33 H=(x.y.z) [127.0.0.1] rejected VRFY a@b.c

diff --git a/test/rejectlog/0556 b/test/rejectlog/0556
index 2f0d87f1b3a4fab55b2cdeec726bcf2e5c893473..29c59daf87772a87f1b83223fa0d5e6700a8197f 100644 (file)
--- a/test/rejectlog/0556
+++ b/test/rejectlog/0556
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(abcd) [127.0.0.1] next input="Start: sent early ...\r\n"
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<userx@test.ex>" H=(abcd) [127.0.0.1] next input="rcpt to:<userx@test.ex>\r\n"
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "rcpt to:<userx@test.ex>" H=(abcd) [127.0.0.1] next input="data\r\n"

diff --git a/test/rejectlog/0562 b/test/rejectlog/0562
index 951f79e39c6129543eec58cfa6006a2b926682a9..e40415254231e08c39e0b12805ac45ecd8386c10 100644 (file)
--- a/test/rejectlog/0562
+++ b/test/rejectlog/0562
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many unrecognized commands (last was "unknown")
 1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY foo@bar
 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many nonmail commands (last was "vrfy")

diff --git a/test/rejectlog/0570 b/test/rejectlog/0570
index 89a2fcf74ec159ed239114de636c3e55e671a450..a1acc1559297c769da9576c5b02efd816647f8e6 100644 (file)
--- a/test/rejectlog/0570
+++ b/test/rejectlog/0570
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL

diff --git a/test/rejectlog/2003 b/test/rejectlog/2003
index 97453c15639cdecef52be1871e1ad3b832f22ef1..f4945520b09c142a7e5805a4bfcc6c8eb387e5a8 100644 (file)
--- a/test/rejectlog/2003
+++ b/test/rejectlog/2003
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256

diff --git a/test/rejectlog/2004 b/test/rejectlog/2004
index 717896d9cbd96120c5ce4134aacbbfd26e34b340..b5d5dd8f95768d0cd9f59e5a0f3c822f8651b8d4 100644 (file)
--- a/test/rejectlog/2004
+++ b/test/rejectlog/2004
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: encryption required

diff --git a/test/rejectlog/2005 b/test/rejectlog/2005
index 6d89d40c21817cf55081dbeb2c716149d9ffae12..f6ad104da8ccf3fbd84b6ddc052fe0318a19394f 100644 (file)
--- a/test/rejectlog/2005
+++ b/test/rejectlog/2005
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required

diff --git a/test/rejectlog/2014 b/test/rejectlog/2014
index 95cbff755cffd861dbdafabb10582be82c3822d7..3a7e9a6a332ae4e766e3234b757a47c0f1080d90 100644 (file)
--- a/test/rejectlog/2014
+++ b/test/rejectlog/2014
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
 1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock
 1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock

diff --git a/test/rejectlog/2018 b/test/rejectlog/2018
index 0b2302a2092cde3eff747bf04e88575f4239cdaa..55415be9aaaed2e0e35f0e483a913a479bd656a8 100644 (file)
--- a/test/rejectlog/2018
+++ b/test/rejectlog/2018
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: "You must encrypt"

diff --git a/test/rejectlog/2103 b/test/rejectlog/2103
index 33c5c72e3ffb93178d5e417ba31c7509d005a65a..dc9db16275bd6ee70b22443ac253948ba527faca 100644 (file)
--- a/test/rejectlog/2103
+++ b/test/rejectlog/2103
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLSv1:AES256-SHA:256

diff --git a/test/rejectlog/2104 b/test/rejectlog/2104
index 717896d9cbd96120c5ce4134aacbbfd26e34b340..b5d5dd8f95768d0cd9f59e5a0f3c822f8651b8d4 100644 (file)
--- a/test/rejectlog/2104
+++ b/test/rejectlog/2104
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: encryption required

diff --git a/test/rejectlog/2105 b/test/rejectlog/2105
index 6d89d40c21817cf55081dbeb2c716149d9ffae12..f6ad104da8ccf3fbd84b6ddc052fe0318a19394f 100644 (file)
--- a/test/rejectlog/2105
+++ b/test/rejectlog/2105
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required

diff --git a/test/rejectlog/2114 b/test/rejectlog/2114
index 0fbcb0fcdcee2c5f73ceba3737d298949f5b0c84..895425c5a7516b4bacd7a3b25df03e971e81b8e8 100644 (file)
--- a/test/rejectlog/2114
+++ b/test/rejectlog/2114
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
 1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
 1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock

diff --git a/test/rejectlog/2118 b/test/rejectlog/2118
index 0b2302a2092cde3eff747bf04e88575f4239cdaa..55415be9aaaed2e0e35f0e483a913a479bd656a8 100644 (file)
--- a/test/rejectlog/2118
+++ b/test/rejectlog/2118
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: "You must encrypt"

diff --git a/test/rejectlog/3450 b/test/rejectlog/3450
index d7395e725e6879f10026488831f63a30f1218c64..b2fa6d6df2457732da59d8502c7e3c867e0388b8 100644 (file)
--- a/test/rejectlog/3450
+++ b/test/rejectlog/3450
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(foobar) [127.0.0.1] rejected AUTH plain AHVzZXJ4AHNlY3JldA==: STARTTLS required before AUTH

diff --git a/test/rejectlog/3460 b/test/rejectlog/3460
index d7395e725e6879f10026488831f63a30f1218c64..b2fa6d6df2457732da59d8502c7e3c867e0388b8 100644 (file)
--- a/test/rejectlog/3460
+++ b/test/rejectlog/3460
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=(foobar) [127.0.0.1] rejected AUTH plain AHVzZXJ4AHNlY3JldA==: STARTTLS required before AUTH

diff --git a/test/rejectlog/4204 b/test/rejectlog/4204
index efd8f157692fbdbf32fac56ac799fa36f94368a0..555b43e40ddf2e433029b94adaa68532b1e5a2fd 100644 (file)
--- a/test/rejectlog/4204
+++ b/test/rejectlog/4204
@@ -1,3 +1,5 @@
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+
+******** SERVER ********
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted

diff --git a/test/rejectlog/4206 b/test/rejectlog/4206
index b25c82afefd8c9c8f63895403faf53dad6b20e71..e2430e4b82e97ffb2cafdf2d3c66b6a612361e4c 100644 (file)
--- a/test/rejectlog/4206
+++ b/test/rejectlog/4206
@@ -1,5 +1,7 @@
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
 1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed
+
+******** SERVER ********
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted

diff --git a/test/rejectlog/4208 b/test/rejectlog/4208
index 2bbfb4fc65d1875f280db8f1a30cf31f06c4d391..939cfe8a95e38591a9b0f90a242b55b511861b40 100644 (file)
--- a/test/rejectlog/4208
+++ b/test/rejectlog/4208
@@ -1 +1,3 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted

diff --git a/test/rejectlog/4214 b/test/rejectlog/4214
index 85f34c0c1f19e21b48f367c1e212e4f1a3299782..bf6cb2398a766d23195d359ea3caebbdc4a10896 100644 (file)
--- a/test/rejectlog/4214
+++ b/test/rejectlog/4214
@@ -1,3 +1,5 @@
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+
+******** SERVER ********
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted

diff --git a/test/rejectlog/4216 b/test/rejectlog/4216
index 9c68237c104b651086309261d41977a9b7a191cc..e8d8f00f5ff59f8ecc20ca316290302c6dedfe73 100644 (file)
--- a/test/rejectlog/4216
+++ b/test/rejectlog/4216
@@ -1,5 +1,7 @@
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
 1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed
+
+******** SERVER ********
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted

diff --git a/test/rejectlog/4224 b/test/rejectlog/4224
index 61373c7c8c044d1d4c5c7922f04f81dd56de4541..e36be9236592f8bd6158e08c051743170b0b0ebf 100644 (file)
--- a/test/rejectlog/4224
+++ b/test/rejectlog/4224
@@ -1,3 +1,5 @@
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+
+******** SERVER ********
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted

diff --git a/test/rejectlog/4226 b/test/rejectlog/4226
index e09273c2eb938a01bcd379f9eab92a3b7794f06e..dd75f12fb74acee9f0f93ec08cd0503b2fb3c7f0 100644 (file)
--- a/test/rejectlog/4226
+++ b/test/rejectlog/4226
@@ -1,5 +1,7 @@
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
 1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
 1999-03-02 09:44:33 U=CALLER sender verify fail for <userB.જેઠીમધ@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed
+
+******** SERVER ********
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted

diff --git a/test/rejectlog/5500 b/test/rejectlog/5500
index 89372dcfdca0a0c04b6d3c896241330c2510a8fa..6b2ce923e4a3ede00742fae32de4f1584eda1add 100644 (file)
--- a/test/rejectlog/5500
+++ b/test/rejectlog/5500
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(rhu.barb) [127.0.0.1] F=<> rejected after DATA
 Envelope-from: <>
 Envelope-to: <userp@test.ex>

diff --git a/test/scripts/5600-OCSP-OpenSSL/5600 b/test/scripts/5600-OCSP-OpenSSL/5600
index 2e63d0e0a921e5f3daac8d4496fe67bc99f66844..aa3e3fb19d5993d9cb0264e94fe9c663e9f1c09b 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5600
+++ b/test/scripts/5600-OCSP-OpenSSL/5600
@@ -2,8 +2,7 @@
 #
 #
 #
-exim -z '1: Server sends good staple on request'
-****
+# '1: Server sends good staple on request'
 #
 exim -bd -oX PORT_D -DSERVER=server \
  -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
@@ -32,8 +31,7 @@ killdaemon
 #
 #
 #
-exim -z '2: Server does not staple an outdated response'
-****
+# '2: Server does not staple an outdated response'
 #
 exim -bd -oX PORT_D -DSERVER=server \
  -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
@@ -58,8 +56,7 @@ killdaemon
 #
 #
 #
-exim -z '3: Server does not staple a response for a revoked cert'
-****
+# '3: Server does not staple a response for a revoked cert'
 #
 exim -bd -oX PORT_D -DSERVER=server \
  -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
@@ -84,8 +81,7 @@ killdaemon
 #
 #
 #
-exim -z '4: Connection functions when server is prepared to staple but client does not request it'
-****
+# '4: Connection functions when server is prepared to staple but client does not request it'
 #
 exim -bd -oX PORT_D -DSERVER=server \
  -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp

diff --git a/test/stderr/0013 b/test/stderr/0013
index 74c607a1bf5ea56e07a1dc90e3f5f6b6495d5ba4..93af8e7a5b913ede2fd76aa5344521350f3e8d0c 100644 (file)
--- a/test/stderr/0013
+++ b/test/stderr/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 10 of TESTSUITE/test-config:
   extra characters follow string value for relay_hosts

diff --git a/test/stderr/0148 b/test/stderr/0148
index f7153995d7d8665c27b846d5259d547b4bf7c21e..789b2a92e8efc7a68312a20a158d996873ce35a7 100644 (file)
--- a/test/stderr/0148
+++ b/test/stderr/0148
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 18 of TESTSUITE/test-config:
+  Exim configuration error in line 12 of TESTSUITE/test-config:
   missing quote at end of string value for hold_domains

diff --git a/test/stderr/0236 b/test/stderr/0236
index 75ed334bf8c951679494b60d446d9fcdd218a295..f51e4e8cf2bfef60d582d863330beafe1d63585e 100644 (file)
--- a/test/stderr/0236
+++ b/test/stderr/0236
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 16 of TESTSUITE/test-config:
+  Exim configuration error in line 10 of TESTSUITE/test-config:
   macro name too long (maximum is 63 characters)

diff --git a/test/stderr/0290 b/test/stderr/0290
index 729780b716ee0e518936f12fa690f044ae36e82c..da59384243e232af0d47b9b86f6007b2a3f9e93a 100644 (file)
--- a/test/stderr/0290
+++ b/test/stderr/0290
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 28 of TESTSUITE/test-config:
+  Exim configuration error in line 22 of TESTSUITE/test-config:
   .include specifies a non-absolute path "non/absolute"

diff --git a/test/stderr/0348 b/test/stderr/0348
index d18082f4ca07679dba7ffffdec17fb272d58d357..70311339fa2b215661c8cc500908b3eb72e4a2b3 100644 (file)
--- a/test/stderr/0348
+++ b/test/stderr/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   bad parameters for retry rule

diff --git a/test/stderr/0415 b/test/stderr/0415
index 95b5e7f5ee1baa96afe570d6af4133f868a2aa4e..f2c8612e86cbdf2f52bb19941047b3f558e31d39 100644 (file)
--- a/test/stderr/0415
+++ b/test/stderr/0415
@@ -1,30 +1,30 @@
 LOG: PANIC DIE
-  Exim configuration error in line 21 of TESTSUITE/test-config:
+  Exim configuration error in line 15 of TESTSUITE/test-config:
   absolute value of integer "4000000M" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 21 of TESTSUITE/test-config:
+  Exim configuration error in line 15 of TESTSUITE/test-config:
   extra characters follow integer value for check_spool_space
 LOG: PANIC DIE
-  Exim configuration error in line 22 of TESTSUITE/test-config:
+  Exim configuration error in line 16 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 22 of TESTSUITE/test-config:
+  Exim configuration error in line 16 of TESTSUITE/test-config:
   integer "4000000.123" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 18 of TESTSUITE/test-config:
   absolute value of integer "999999999999999999" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 18 of TESTSUITE/test-config:
   absolute value of integer "999999999K" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 18 of TESTSUITE/test-config:
   absolute value of integer "999999M" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 18 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 18 of TESTSUITE/test-config:
   integer expected for finduser_retries
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 18 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries

diff --git a/test/stderr/0442 b/test/stderr/0442
index f8afd85ea7ba2b3d4ec1655a6058b63057cb49a1..85904224ebf58e718db72dfb6701630c99c7afc4 100644 (file)
--- a/test/stderr/0442
+++ b/test/stderr/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 38 of TESTSUITE/test-config:
   failed to open included configuration file /non/existent

diff --git a/test/stderr/5410 b/test/stderr/5410
index 1ed0824e879ba92cec03182e7eee202f831a839a..41f6bab6f0cd33000170d50073305336633f74d6 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -223,7 +223,7 @@ considering:
      result: Received: from CALLER (helo=myhost.test.ex)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaY-0005vi-00
+       id 10HmaX-0005vi-00
        for userx@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
@@ -231,9 +231,9 @@ considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
-  SMTP<< 250 OK id=10HmaX-0005vi-00
+  SMTP<< 250 OK id=10HmaY-0005vi-00
 LOG: MAIN
-  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaX-0005vi-00"
+  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00"
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
@@ -437,7 +437,7 @@ considering:
      result: Received: from CALLER (helo=myhost.test.ex)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbA-0005vi-00
+       id 10HmaZ-0005vi-00
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
@@ -445,9 +445,9 @@ considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
-  SMTP<< 250 OK id=10HmaZ-0005vi-00
+  SMTP<< 250 OK id=10HmbA-0005vi-00
 LOG: MAIN
-  >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
+  >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
@@ -651,7 +651,7 @@ considering:
      result: Received: from CALLER (helo=myhost.test.ex)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbC-0005vi-00
+       id 10HmbB-0005vi-00
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
@@ -659,9 +659,9 @@ considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
-  SMTP<< 250 OK id=10HmbB-0005vi-00
+  SMTP<< 250 OK id=10HmbC-0005vi-00
 LOG: MAIN
-  >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00"
+  >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN

diff --git a/test/stderr/5420 b/test/stderr/5420
index 05135dd5a279592e7de2f4473032fd3209b7be29..2cac1a73f016e389b9419cfdccb0dbfec67b42b7 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -222,7 +222,7 @@ considering:
      result: Received: from CALLER (helo=myhost.test.ex)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaY-0005vi-00
+       id 10HmaX-0005vi-00
        for userx@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
@@ -230,9 +230,9 @@ considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
-  SMTP<< 250 OK id=10HmaX-0005vi-00
+  SMTP<< 250 OK id=10HmaY-0005vi-00
 LOG: MAIN
-  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaX-0005vi-00"
+  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
@@ -436,7 +436,7 @@ considering:
      result: Received: from CALLER (helo=myhost.test.ex)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbA-0005vi-00
+       id 10HmaZ-0005vi-00
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
@@ -444,9 +444,9 @@ considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
-  SMTP<< 250 OK id=10HmaZ-0005vi-00
+  SMTP<< 250 OK id=10HmbA-0005vi-00
 LOG: MAIN
-  >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
+  >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
@@ -650,7 +650,7 @@ considering:
      result: Received: from CALLER (helo=myhost.test.ex)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbC-0005vi-00
+       id 10HmbB-0005vi-00
        for usery@domain.com
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
@@ -658,9 +658,9 @@ considering: ${tod_full}
   expanding: ${tod_full}
      result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
-  SMTP<< 250 OK id=10HmbB-0005vi-00
+  SMTP<< 250 OK id=10HmbC-0005vi-00
 LOG: MAIN
-  >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00"
+  >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN

diff --git a/test/stdout/0572 b/test/stdout/0572
index 0c8d6e9b765c3c8a1a4ed653f75a972ab7bbc5b3..d6efce012e62d1b90677a0269248a57846fa2482 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -72,14 +72,20 @@ size_addition = 1024
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =
+# 5 "TESTSUITE/test-config"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/tls_conf_prefix"
 exim_path = TESTSUITE/eximdir/exim
 keep_environment =
-hide host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 5 "TESTSUITE/test-config"
+primary_hostname = myhost.test.ex
 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
@@ -104,14 +110,20 @@ begin transports
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =
+# 5 "TESTSUITE/test-config"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/tls_conf_prefix"
 exim_path = TESTSUITE/eximdir/exim
 keep_environment =
-hide host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 5 "TESTSUITE/test-config"
+primary_hostname = myhost.test.ex
 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept

diff --git a/test/stdout/4201 b/test/stdout/4201
index 8b89b2bd3c94a347083f02d47cd91a4094bbd702..5a110f292e78042ef1b3b6c2ac3b3732528ea134 100644 (file)
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -28,7 +28,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaZ-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -63,7 +63,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmbA-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -78,5 +78,5 @@ End of script
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r

diff --git a/test/stdout/4211 b/test/stdout/4211
index a0e463dc24fa9546a70ba7080a8c916166935546..2dc81350934950079974281aef5b26fc073cb90b 100644 (file)
--- a/test/stdout/4211
+++ b/test/stdout/4211
@@ -30,7 +30,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaZ-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -67,7 +67,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmbA-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -83,5 +83,5 @@ End of script
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r

diff --git a/test/stdout/4221 b/test/stdout/4221
index a0e463dc24fa9546a70ba7080a8c916166935546..2dc81350934950079974281aef5b26fc073cb90b 100644 (file)
--- a/test/stdout/4221
+++ b/test/stdout/4221
@@ -30,7 +30,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaZ-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -67,7 +67,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmbA-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -83,5 +83,5 @@ End of script
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r

diff --git a/test/stdout/5410 b/test/stdout/5410
index edf01f8baf3b36f9fc1e0cf4aacbc3f1c2767a55..365fe2502d2ea32b4c850fe0c2963d93983256f2 100644 (file)
--- a/test/stdout/5410
+++ b/test/stdout/5410
@@ -8,7 +8,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaX-0005vi-00\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at myhost.test.ex\r
@@ -20,7 +20,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmaZ-0005vi-00\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at myhost.test.ex\r
@@ -32,5 +32,5 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbC-0005vi-00\r
+250 OK id=10HmbB-0005vi-00\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/5420 b/test/stdout/5420
index edf01f8baf3b36f9fc1e0cf4aacbc3f1c2767a55..365fe2502d2ea32b4c850fe0c2963d93983256f2 100644 (file)
--- a/test/stdout/5420
+++ b/test/stdout/5420
@@ -8,7 +8,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaX-0005vi-00\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at myhost.test.ex\r
@@ -20,7 +20,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmaZ-0005vi-00\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at myhost.test.ex\r
@@ -32,5 +32,5 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbC-0005vi-00\r
+250 OK id=10HmbB-0005vi-00\r
 221 myhost.test.ex closing connection\r