diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-07-11 12:02:12 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-07-11 12:45:09 +0100 |
| commit | d4dc049f9a9e80ac3a470fd644418668eefedecb (patch) | |
| tree | eb276ce9c53cb5f55fcd2a173a49cb1155fb533b | |
| parent | ae8386f03e54cc05f92fcb78b8edcf87184f29aa (diff) | |
testsuite: abstract out common conf settings
940 files changed, 2209 insertions, 6681 deletions
diff --git a/test/aux-var-src/std_conf_prefix b/test/aux-var-src/std_conf_prefix new file mode 100644 index 000000000..2565c2677 --- /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 index 000000000..3beafd9db --- /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 ccf723761..af93db7c6 100644 --- 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 12cd8dba9..8ebec4d98 100644 --- 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 b503b81a5..7c0689c16 100644 --- 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 4cd84a275..c01a2fe2e 100644 --- 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 910c5a7f0..05631cc39 100644 --- 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 de228d31e..91db09111 100644 --- 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 34dee6e0a..422fe3d1d 100644 --- 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 9bf862dd4..39e3fcf88 100644 --- 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 f1aa77a5e..f8c04763d 100644 --- 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 7df08cb09..b367e8992 100644 --- 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 61f0d579d..1b2cec88f 100644 --- 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 7f15c4108..1fdd92d0c 100644 --- 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 593c29555..c6fccd316 100644 --- 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 7001b9774..4260c88be 100644 --- 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 6e36a38ea..74585c689 100644 --- 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 6fbfb4342..4b85cf3d3 100644 --- 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 5757c1cf6..dbb303b6e 100644 --- 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 6672ccf2f..ce48c884c 100644 --- 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 c48c0e08e..6205eae63 100644 --- 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 7a2742790..bd04442aa 100644 --- 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 b59a52f92..2481976ce 100644 --- 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 ee60a322e..3dbbc2c25 100644 --- 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 6477950be..3ecc5dd68 100644 --- 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 2b1763f87..07fa40976 100644 --- 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 f671831b0..9c775bd5d 100644 --- 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 6308f8358..149d8eda8 100644 --- 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 d65cf1181..09e77963f 100644 --- 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 89ced1f25..446a7ede8 100644 --- 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 2716b59cb..e3f0360fc 100644 --- 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 8368f155a..961cefadd 100644 --- 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 825126bb7..ca06da772 100644 --- 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 8dbe9ea1d..8eb9dce69 100644 --- 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 a8cd5c66a..8d34269a2 100644 --- 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 7d54acbee..48479c787 100644 --- 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 56323db4b..8ba94ded1 100644 --- 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 b95b140b5..0ef9028f1 100644 --- 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 5ca25b2e4..8ca8b1eec 100644 --- 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 88b63f1f7..35453a0dd 100644 --- 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 e0b820fb2..5157170f2 100644 --- 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 a4a81bfbe..14c8a9635 100644 --- 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 4db392cd1..0bf3547c7 100644 --- 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 9e3f020c9..e4db43db0 100644 --- 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 f8caf1419..a59c8e2c1 100644 --- 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 4e7ff862a..9fff3b91b 100644 --- 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 5e7d27d97..187f855ef 100644 --- 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 86560d587..9c2d4428f 100644 --- 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 0de91eeed..a00dde1f5 100644 --- 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 f709ad674..32a822a9b 100644 --- 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 34016ab81..2fde9e557 100644 --- 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 2e2c13133..2af555cca 100644 --- 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 16702ffeb..04263a59f 100644 --- 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 ee63ec24b..3ad875157 100644 --- 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 ce1b22514..72a2be740 100644 --- 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 299448369..1678e2063 100644 --- 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 f2bc88f8a..db09830ad 100644 --- 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 2b15f6290..2b52453a0 100644 --- 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 f591bf6b3..40e877be8 100644 --- 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 8ce8d1012..6ff220906 100644 --- 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 70d21834e..07c85e4a9 100644 --- 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 7e6474655..b5d47c862 100644 --- 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 be66b1a3f..b297ec011 100644 --- 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 4feaed25d..f0d9e9618 100644 --- 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 7d08f9640..fb01f3772 100644 --- 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 959b878e3..dcf3bcffc 100644 --- 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 ac2af9c19..35bd3b24c 100644 --- 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 2de360fbd..f8078fdf3 100644 --- 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 23685e40e..ca81da915 100644 --- 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 4ffe3668c..9ef3b2ad8 100644 --- 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 e18ab0bbf..d7ab2ff5d 100644 --- 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 94c4dcbe5..9bb73984d 100644 --- 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 f6c18247d..da716efb6 100644 --- 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 ab3007455..3102206b0 100644 --- 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 cb9d472ff..8b8c77ca6 100644 --- 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 bd3863cf7..1415280f9 100644 --- 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 b2138536e..564554e39 100644 --- 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 1be361abd..aa1e445f3 100644 --- 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 f9be08244..25ef65879 100644 --- 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 4bc2e3a3b..fbe026c26 100644 --- 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 4e2f4949e..f403728c3 100644 --- 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 b4bfc7693..29ff8d15c 100644 --- 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 37c7bac2e..fcae1f5d1 100644 --- 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 b4530996f..94e386e02 100644 --- 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 0a74e1591..25eea9e90 100644 --- 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 256cc6047..a0a29b62d 100644 --- 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 f59143e3f..8141edb98 100644 --- 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 0c1d5884e..054944d95 100644 --- 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 ccb0283e2..b8bd142db 100644 --- 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 3612e8aa8..907d27544 100644 --- 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 3dcc12b0a..2ef91af8f 100644 --- 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 8497dc044..e5cdf119a 100644 --- 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 0cdc58b38..2ed0a5207 100644 --- 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 b586dc434..04c9d8078 100644 --- 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 fb79c9d28..c20b06d7c 100644 --- 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 5ef2ec20e..ff5f5cebc 100644 --- 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 2ad1b5e1f..0841952bf 100644 --- 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 60402deaf..465c2310a 100644 --- 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 122856ce7..8db58dcb0 100644 --- 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 55cd947b5..c404d5a73 100644 --- 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 05832fb45..377eae705 100644 --- 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 ac33f72f4..dde11a5e9 100644 --- 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 9d40134e7..9a136c7bc 100644 --- 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 6101f0c1c..de0889adb 100644 --- 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 a6763313f..1b954f460 100644 --- 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 52130ede0..ef91e8b10 100644 --- 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 06e7b83ae..9bbb7e7a3 100644 --- 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 37c53de6e..a4ee442e2 100644 --- 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 38401bdb9..59957b96b 100644 --- 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 d8fb4a9e7..361c12fb4 100644 --- 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 377a9a062..61fc9a887 100644 --- 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 bb133227f..06e436abb 100644 --- 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 a24c029b5..1fd61009f 100644 --- 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 acaf05c03..d5a60bb00 100644 --- 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 ad4d469a1..799112f08 100644 --- 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 da70ac0e5..313d32c63 100644 --- 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 f0bcd89f3..5a266d32b 100644 --- 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 0223df01f..cf8838f32 100644 --- 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 74cd7ae2c..4514635e5 100644 --- 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 ddba4d32d..95a5b3e8a 100644 --- 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 3d5e84721..ca2d338a1 100644 --- 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 bec8032f7..3fec1235d 100644 --- 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 250ac1d16..6eae763a1 100644 --- 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 5cc803841..da81a998a 100644 --- 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 9bc55c728..69fe2d674 100644 --- 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 8a8474aa3..537060608 100644 --- 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 33c72e352..1906bb430 100644 --- 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 d0e8cc4c4..9acfb5e9d 100644 --- 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 378a6b904..c91b02587 100644 --- 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 5871fc75f..02a095358 100644 --- 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 4ca5af5f4..c55813e77 100644 --- 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 50bce7969..83bbb3608 100644 --- 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 7150db724..bc4e6283f 100644 --- 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 c8f8227b0..9530df652 100644 --- 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 913373d8a..2c62f0473 100644 --- 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 c6bd5f557..efc73c58d 100644 --- 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 b36a701c2..1a2094ef3 100644 --- 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 9de30ce7d..66539d6b0 100644 --- 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 b1a243e42..eb3990c72 100644 --- 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 8ab406add..fbc64b43b 100644 --- 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 ddb05cd66..96f6ef112 100644 --- 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 2e25d4438..748e76b8b 100644 --- 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 a6dfbb61f..5a6ee34a9 100644 --- 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 3c5c4d035..34b38230f 100644 --- 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 f4f96590d..16b02a858 100644 --- 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 a0f8a4c40..d8b6067e7 100644 --- 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 bf78500f4..996d064be 100644 --- 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 a01bbf26a..ea31cddbe 100644 --- 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 30c35b400..60c742acf 100644 --- 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 818f1a28b..dd421a125 100644 --- 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 5c8565e2e..d5d178654 100644 --- 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 f8ca25104..7671d52ed 100644 --- 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 171d6f5ac..c16f88fe9 100644 --- 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 3e9006eaa..bc5ffb899 100644 --- 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 3fe4bb3c6..a85ebe5d7 100644 --- 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 e718552d6..d1faa7514 100644 --- 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 674ed171e..1589f82ed 100644 --- 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 e9001bc27..ccd261e56 100644 --- 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 d5eb44a7b..e648d9304 100644 --- 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 f1ab669d0..f64883729 100644 --- 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 3a5626ad9..8b91ea053 100644 --- 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 d62d8a1c9..0ec376230 100644 --- 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 923968659..7b19d9f16 100644 --- 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 c81cc617e..6d94efdfd 100644 --- 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 dd9ec9ff1..03e9a825e 100644 --- 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 85a75fe9e..93489dc56 100644 --- 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 06b857efc..a65b9ed65 100644 --- 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 a16aa9813..196b8e60c 100644 --- 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 db212a2e5..beafec56d 100644 --- 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 227acdbf2..5e25e24d8 100644 --- 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 37f4b5c91..fe4fc2c15 100644 --- 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 96567f25e..9dcc42f81 100644 --- 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 7fd9179dd..1b423e152 100644 --- 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 ece486e34..b7fe882e2 100644 --- 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 838a0736d..b20e4fe1a 100644 --- 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 2b76446f4..81d0b5ddf 100644 --- 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 3bc3ab024..7921a8b55 100644 --- 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 e93137930..bdabf6afa 100644 --- 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 14539bec4..fdd5fb10c 100644 --- 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 29014f7e9..dd47db6a3 100644 --- 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 5e1624a32..f00a9b28a 100644 --- 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 ed75a6ca8..17d60789c 100644 --- 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 6ca0ed027..6699237a2 100644 --- 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 95aaa14f2..9e15a4895 100644 --- 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 b17f72a97..d6e9fe020 100644 --- 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 8e88ab109..21b31060c 100644 --- 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 6731b6230..bca41b5f7 100644 --- 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 2385462ef..d94506ef5 100644 --- 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 28831d622..5d12465b3 100644 --- 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 fb4fdc90c..03ded9ce2 100644 --- 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 04597e5ae..9dba8c35d 100644 --- 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 da0a6ffa7..d7bd3c1b1 100644 --- 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 dbc7ef62f..4dbb06679 100644 --- 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 548a91545..d813d9290 100644 --- 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 4b479e601..2d51bebfa 100644 --- 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 73a71142f..38a839144 100644 --- 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 0ed172695..b3f25c4c0 100644 --- 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 4cdb86a2e..f754a3187 100644 --- 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 17437ef63..8b0e760f5 100644 --- 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 1c6e9f675..ab50f36df 100644 --- 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 1575bcd9c..5385baa9a 100644 --- 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 f7a51edd4..dc68127ae 100644 --- 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 2dc3d2790..38e879010 100644 --- 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 e5792de54..138dbe0a1 100644 --- 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 60c943e2c..069e85033 100644 --- 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 f6fc540e2..628d2ec4d 100644 --- 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 9a7d5bfa9..eed3e2565 100644 --- 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 8d74eabfc..5a0b9f153 100644 --- 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 e24138956..82046c7bc 100644 --- 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 33306388f..b1db52218 100644 --- 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 5a86785dd..96f3beac1 100644 --- 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 feea11533..39db8c800 100644 --- 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 71c716faf..ba0b9e403 100644 --- 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 6ba026d02..0e97c0ba6 100644 --- 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 075b2b54c..ad40d6338 100644 --- 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 253e001e1..01e1dd801 100644 --- 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 44dce1345..0b3abb71d 100644 --- 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 fae18f0e1..b5cb57691 100644 --- 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 9a44a46b0..edf8f4abf 100644 --- 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 0c21b5af6..36cf87223 100644 --- 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 f9584d18e..f7855a678 100644 --- 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 00eddf642..e69bbb3d0 100644 --- 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 7747a8716..e42df517e 100644 --- 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 377bd5a23..d1c425b47 100644 --- 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 9d4e4abf2..3139eea5b 100644 --- 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 5d56c6e9d..0b6eeff74 100644 --- 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 7100f6a15..1ca729551 100644 --- 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 3bbd157f2..19f6cb7cd 100644 --- 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 b6ddcc192..5389f97bc 100644 --- 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 7e0480b22..d9cecf3d4 100644 --- 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 7350256a9..d0adf3907 100644 --- 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 03989bf02..59e1ae918 100644 --- 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 95d0ef1aa..77dcca3b2 100644 --- 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 b64904116..5d34833ac 100644 --- 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 186b6f1b7..704767568 100644 --- 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 55146a134..e44fb46cd 100644 --- 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 5258593ac..be2f5abd2 100644 --- 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 cc874bb09..15aa22052 100644 --- 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 4507b53a0..f4b1a68ba 100644 --- 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 27756fced..bb4519ef8 100644 --- 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 04acfd975..fc2dd70ba 100644 --- 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 5692765ed..7396045ba 100644 --- 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 d2a83365f..668627e7a 100644 --- 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 1e8662ee6..13cb7038e 100644 --- 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 c73729cd0..fb959527d 100644 --- 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 df324b523..38e171019 100644 --- 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 c0f7b529f..517a2f665 100644 --- 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 151c69422..1d7491be6 100644 --- 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 b6d8d001d..80030ecd5 100644 --- 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 aa9d4ec0d..180620f11 100644 --- 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 78f894eea..28ce3419f 100644 --- 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 ae62fda81..cd2c777de 100644 --- 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 06c7b797d..45f5784bc 100644 --- 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 0a6788b72..e01c41baf 100644 --- 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 40f69062c..c5d5d4b4e 100644 --- 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 e15c34a13..f61689380 100644 --- 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 a3f80baae..720cc4073 100644 --- 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 7940945ab..6b9bc29ab 100644 --- 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 b0c549d46..6366cd0ad 100644 --- 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 b377ae779..30ec087fd 100644 --- 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 0f4b905bb..dc6a1d4af 100644 --- 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 80ce677bb..53b0064e7 100644 --- 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 aef8d8747..792b304dd 100644 --- 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 a94ab67ef..b26583a41 100644 --- 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 dd4b431e3..d1e944dc2 100644 --- 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 114de9421..bb134441b 100644 --- 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 4ea429f7f..e1e0be848 100644 --- 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 57733812e..8aca95bd1 100644 --- 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 772f456be..86f81d837 100644 --- 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 f3df54738..93c27241d 100644 --- 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 aaedd38d5..f3788f15c 100644 --- 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 557dd51b2..0a12a6762 100644 --- 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 ab98f68dd..2eb7bb60b 100644 --- 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 af5da63f2..3734e03ea 100644 --- 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 9aab39bde..257cf4593 100644 --- 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 74c93a085..8e1bdc375 100644 --- 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 0809141e2..a7adb29ec 100644 --- 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 f6d990d96..f4334f479 100644 --- 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 004144a8f..40187df77 100644 --- 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 ad18629d3..277328ed4 100644 --- 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 31c673455..2660c7f7d 100644 --- 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 6d91a6f9c..31d9339a2 100644 --- 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 a3bac7b5b..d38f38390 100644 --- 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 dad843af1..f0871a565 100644 --- 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 b05cf02a5..8ec70bfbb 100644 --- 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 fbb674a35..d3f08a205 100644 --- 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 17d4ee58f..12c308baf 100644 --- 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 0c4b1f28d..8cd201862 100644 --- 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 5c4a7aa18..e7c501c91 100644 --- 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 d9bc47e63..406c54faa 100644 --- 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 3fdbeb299..6e70a7925 100644 --- 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 4a57eb37f..0512860f4 100644 --- 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 fffb9ed3f..6e17b832d 100644 --- 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 04e5b36a8..997b83c6b 100644 --- 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 9af875015..e62a3d1a1 100644 --- 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 fe5616a40..b07fc54cb 100644 --- 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 a6cc98495..3ca06f87f 100644 --- 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 fa351a774..5d648b85d 100644 --- 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 ce36a0366..814f8ee0f 100644 --- 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 4e1aab68e..2ce525c01 100644 --- 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 275f6f00c..81aadbba1 100644 --- 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 d2613324e..b96063e96 100644 --- 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 5bbada409..6c899aaec 100644 --- 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 14366f6b5..33e97ef6a 100644 --- 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 6e14b31dd..6d6d9658a 100644 --- 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 db499851a..3252b4615 100644 --- 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 68a433e66..dd2f6dd50 100644 --- 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 05f6893ae..4d6449009 100644 --- 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 44953ba85..0f324da1d 100644 --- 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 f26236f5a..99082cb7f 100644 --- 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 590131b00..dad5d083c 100644 --- 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 5ff28b230..7849526db 100644 --- 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 f52695892..2ad32dba6 100644 --- 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 7566ca2b6..fed3ceca1 100644 --- 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 b26273c59..22fea04ca 100644 --- 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 cafcfe9cf..754231606 100644 --- 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 fcb3c454c..51633d997 100644 --- 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 68cff3f89..aaa21d730 100644 --- 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 cdde86c85..6f287a89c 100644 --- 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 b32615a6b..624202e65 100644 --- 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 94864147a..567dcf479 100644 --- 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 3eebcb2e3..554ccbaf8 100644 --- 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 1c946102a..129e5df4c 100644 --- 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 2a5bf6377..e81e63b42 100644 --- 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 fb9b5c945..8f44d3c34 100644 --- 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 f3216575c..481aaa7ae 100644 --- 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 f14d1c7b6..76f898552 100644 --- 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 9529207b2..f9d5bcbb5 100644 --- 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 b4a7a164a..78701a9c5 100644 --- 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 8c62e2298..48ddf9037 100644 --- 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 5bf3a093b..4fe3b3fd4 100644 --- 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 ed9e665db..419229285 100644 --- 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 48951f992..553763b0a 100644 --- 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 7f236cf36..6529028d5 100644 --- 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 b52635959..8ec447591 100644 --- 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 3fe87dbda..7dedf5fe1 100644 --- 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 a721b55b9..d373f477c 100644 --- 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 1f877ec49..843dd0222 100644 --- 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 f9a083ff9..a4b49d8ad 100644 --- 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 b8c0fb904..726793390 100644 --- 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 cf1141761..dba9020f4 100644 --- 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 52f90bc12..c613da449 100644 --- 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 1f067ced2..0b29b0629 100644 --- 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 d6456345e..99bdce0b4 100644 --- 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 de9e4d076..1c4b51c50 100644 --- 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 af2fef817..993b3fd1f 100644 --- 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 0adeb040a..60f8d208b 100644 --- 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 411dcdcd9..f11957d2e 100644 --- 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 cbdf68ecc..09bd635db 100644 --- 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 7cfe1a2f5..b00ee7497 100644 --- 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 8bf302e7e..aaa980941 100644 --- 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 d3504c69d..fb53d6d69 100644 --- 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 5446ae876..03ea43f83 100644 --- 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 73dc6b131..78b1484c7 100644 --- 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 e96eef8d1..c6e9e94a1 100644 --- 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 6fd1bc65f..07f3fc857 100644 --- 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 8dd6a80b3..24611d0fb 100644 --- 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 57fc1c227..6b6b8c093 100644 --- 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 d5ecc9009..d226449a8 100644 --- 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 dfc29deb8..f9007ec0c 100644 --- 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 17a252c59..6588f609f 100644 --- 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 e5bf738ca..c43040876 100644 --- 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 4192bad16..e15bc9127 100644 --- 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 4cbc22d33..0bd6cc161 100644 --- 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 f681f75c9..de5d9cfc8 100644 --- 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 10174692a..2d69a07ab 100644 --- 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 466257414..fee202781 100644 --- 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 d062137db..511c541f6 100644 --- 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 00f3f458b..315a56872 100644 --- 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 b2cf41dc6..eb4d07fb8 100644 --- 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 b08ac66c4..983d596a1 100644 --- 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 16f0d637e..10d64b782 100644 --- 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 4361bcc52..652a5062b 100644 --- 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 3b622ae9f..06b16f383 100644 --- 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 04731c975..6162c2c9d 100644 --- 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 3d77e208d..bd3391b3a 100644 --- 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 5604eb325..3e4d85a81 100644 --- 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 6342780fc..2f1216b1f 100644 --- 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 5264a7d83..90d1f933b 100644 --- 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 8eaa38fb0..0a9d8dc20 100644 --- 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 f9d36eebf..d27b8e3f7 100644 --- 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 034ccaea9..ea2f1dc28 100644 --- 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 5ce6fec05..80450a7e8 100644 --- 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 baa5af040..f66e6b818 100644 --- 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 7e8c487ae..5eecfcc98 100644 --- 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 0833efd48..b8ed35ccc 100644 --- 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 54651ad29..9a7be305d 100644 --- 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 f06cf19dd..f2439bf58 100644 --- 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 5fb589255..972e925d9 100644 --- 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 4a2f41474..4ab5cfddd 100644 --- 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 9b062526b..e76c86772 100644 --- 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 e75af0399..c029d0d71 100644 --- 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 9a71beef9..c1a556357 100644 --- 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 5962ad34a..b7fc3fd58 100644 --- 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 3d06554d3..ef2ad8a55 100644 --- 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 3e3f5a589..9fbe1b8da 100644 --- 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 ee9b4f6c7..5584e509c 100644 --- 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 05ffaeb45..1a8a8e43b 100644 --- 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 dbc77005f..b8c105983 100644 --- 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 f83c45337..57e027c03 100644 --- 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 a4e5f76eb..26d1cd6fe 100644 --- 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 76a1f74f3..9d0dc5c90 100644 --- 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 3db8b2493..edf720c48 100644 --- 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 f517624ff..1c1ec205f 100644 --- 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 9dba8d7e0..616b80a13 100644 --- 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 413a50758..903b4ca7c 100644 --- 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 8f6564588..3cc072b20 100644 --- 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 dcc0f6419..904073d3b 100644 --- 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 aea60f897..fa24e9fd0 100644 --- 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 fca635748..f8b9c69ff 100644 --- 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 77133f891..118dbcfe9 100644 --- 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 8dc486e17..c0fbeffdb 100644 --- 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 1bec61aac..06459597f 100644 --- 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 58b7505ec..752ba0495 100644 --- 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 e107c5a6e..41c5ed975 100644 --- 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 f6d7bae8d..3ab5740c0 100644 --- 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 a8c7d7d6d..39f634c63 100644 --- 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 204e86e3c..a115c7249 100644 --- 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 6b1143394..6d12ce20b 100644 --- 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 567bb7853..14255d621 100644 --- 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 c6228f7e1..3effe6cc4 100644 --- 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 0efbd6393..2ce709db0 100644 --- 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 688cecf22..6c9383a41 100644 --- 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 70e9a1a43..fbac9ecfd 100644 --- 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 68f5512aa..cdbc8ae3e 100644 --- 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 2c14aad61..38601f30b 100644 --- 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 b543b05ca..49df93001 100644 --- 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 dd3a96ab0..552b0d010 100644 --- 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 497481ef3..7590fa9d4 100644 --- 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 bc1dc93de..e8e6e3552 100644 --- 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 81860a5ed..55fb85e96 100644 --- 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 aeff22f83..0d77fa095 100644 --- 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 92dc1abb8..21148174f 100644 --- 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 c9ac15027..2fcaef961 100644 --- 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 0a966451c..bf1b55061 100644 --- 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 25199dff8..feb42f596 100644 --- 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 7f264c84d..2bef8c961 100644 --- 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 89adf7f97..71153a7fe 100644 --- 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 0deb598c9..2e1b17dee 100644 --- 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 df03b5dfb..154c8edba 100644 --- 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 182d1021a..2c103ff69 100644 --- 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 5d1a3e92d..f42606b12 100644 --- 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 290ea60be..90e8a0245 100644 --- 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 2b4e5935f..57b992d1b 100644 --- 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 cadec6310..f18f8f539 100644 --- 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 6345b5897..d08da8341 100644 --- 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 511362db5..2dff861a1 100644 --- 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 0e7e0b14e..7d25049d4 100644 --- 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 f7b7aa40a..a94295a98 100644 --- 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 755a9c000..3ecc86591 100644 --- 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 2afdf517b..359d0d917 100644 --- 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 5937b4f04..390c28a95 100644 --- 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 b62274ce9..362d6b549 100644 --- 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 b8f3d6d14..866950e9a 100644 --- 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 4ddcba5f7..e964cb0c7 100644 --- 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 b07df6634..46d037557 100644 --- 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 b40bd0ce6..52628ab25 100644 --- 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 ac0206b1e..30abd50a9 100644 --- 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 84b63e1e4..36d18412d 100644 --- 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 1dcb8bd18..8be1d95c1 100644 --- 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 ddf1afc79..21e41cb08 100644 --- 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 35efd39a1..45ec3314e 100644 --- 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 3544af289..880a41e33 100644 --- 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 9479b2b0b..147aca64e 100644 --- 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 9eb84e1a6..c04a04e61 100644 --- 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 8bf9e3408..a008dde00 100644 --- 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 e02aa4ccd..a0f0b5027 100644 --- 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 d6e918816..f7e0a9f0b 100644 --- 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 6bbd93fac..09d563329 100644 --- 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 d733ff9ea..6dd6b8898 100644 --- 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 bb6cfaf1c..35b4805e5 100644 --- 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 4a38bec16..dfca55c78 100644 --- 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 c67109895..fd6106b16 100644 --- 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 edca4b212..04d836591 100644 --- 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 243e47b2a..d9fd0a5ce 100644 --- 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 67462c3d2..bfb9b8613 100644 --- 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 2b399144a..6c2b688ec 100644 --- 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 c4f512fee..ae1b78819 100644 --- 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 7f590909e..ba29b81db 100644 --- 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 4475165fe..e9c1f09e5 100644 --- 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 7c44a2845..65ca274f2 100644 --- 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 b1864e9bd..ad31830e0 100644 --- 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 6b0a2a21c..40c995112 100644 --- 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 8511955ba..a9c1babc0 100644 --- 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 ad1748eb1..de7a7af29 100644 --- 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 fcf666062..878565d21 100644 --- 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 e4acefb1d..ca3c1c2fe 100644 --- 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 a25b6ad7c..c7d3eaec0 100644 --- 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 8e76eb743..a939fe125 100644 --- 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 675490770..dd38fbc49 100644 --- 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 d12d4c07b..8027cf482 100644 --- 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 a9585e006..5bfec709f 100644 --- 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 6f8add61d..351cd802a 100644 --- 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 08fc06631..2154c3c2c 100644 --- 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 899b14a3d..c26f43a8a 100644 --- 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 0261f1ee3..b7a0b7980 100644 --- 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 ac9c6eec6..f3b225c66 100644 --- 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 6acd356e2..f3085e839 100644 --- 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 a9df68e18..d1314891d 100644 --- 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 50e330093..aab6cdb54 100644 --- 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 687173b4a..b2dadfcb3 100644 --- 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 c931db4d3..99b64bfa3 100644 --- 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 971de86e2..d20db5f2f 100644 --- 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 a204f64fd..6449e056a 100644 --- 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 9dadd7139..17a1dec10 100644 --- 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 9ca2a3759..bc3dc50a8 100644 --- 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 b8545dc53..c73a1b402 100644 --- 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 af87c3011..1ecc19998 100644 --- 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 f2da0f304..15e424a51 100644 --- 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 b023de35d..d449a81ea 100644 --- 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 7c0cb1b7e..36a2ac3d2 100644 --- 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 af38a1568..c3f57ba2c 100644 --- 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 086b880ec..78ebfd121 100644 --- 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 6094e6be2..cbb2d4dbb 100644 --- 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 b30acf42e..c413faa95 100644 --- 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 8a9485549..e6dbb0090 100644 --- 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 083d49b7b..1106fd896 100644 --- 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 b47129f14..8c9c70042 100644 --- 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 fb282b6e7..4909db849 100644 --- 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 15374f8e2..9415855d7 100644 --- 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 a535db705..a94122c38 100644 --- 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 e1e736d4d..a6e429172 100644 --- 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 8d0df009e..e2e927667 100644 --- 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 1b312078f..2932f6907 100644 --- 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 6b08d9cf0..e7313a5ca 100644 --- 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 52c31a55e..09e81d06e 100644 --- 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 f1f9b0dc5..9eeb4cc9f 100644 --- 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 c7dc39e7a..2f72810cf 100644 --- 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 1ba2162c4..e50c5de0e 100644 --- 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 1d48005e3..1dbc83b61 100644 --- 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 4cb89c98f..db19f253a 100644 --- 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 67b4bbab6..004f795f5 100644 --- 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 ba5baf10d..e451f81fe 100644 --- 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 90c901be4..2498dc3ce 100644 --- 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 1c4cf990e..9081aa572 100644 --- 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 de89c3f6c..2ca8e253a 100644 --- 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 b05108cf5..7ebbdd2b4 100644 --- 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 ffc20d0af..73e8284d9 100644 --- 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 36348e4f8..ca824d5c1 100644 --- 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 316e5abe4..88e74e58f 100644 --- 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 8d656ed88..09949a3fa 100644 --- 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 890afb7b1..a78236a4a 100644 --- 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 788ce905a..2d5cae7b3 100644 --- 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 0e04da3f8..5d172447e 100644 --- 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 f0f418958..3e1f0ebfc 100644 --- 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 4578f0c45..f3da5f486 100644 --- 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 621c3a1f4..caf3ceda7 100644 --- 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 a29f75051..b37b74cf7 100644 --- 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 f676cd4a2..c4c2f5e98 100644 --- 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 523be00eb..c9ceaa59e 100644 --- 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 b76286b13..cbcd357a9 100644 --- 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 eceba18b6..c86050fa6 100644 --- 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 16d8f9957..965d68120 100644 --- 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 0452e851d..5c944e9cd 100644 --- 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 55b149cf6..c163cf37c 100644 --- 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 dbcdc7b61..7f0107b15 100644 --- 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 f7f85fc46..da6e7decd 100644 --- 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 f895e6c58..5ccf4dcc3 100644 --- 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 31e631c99..d79c8bb07 100644 --- 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 8233e1a79..0d053a080 100644 --- 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 34b36f53d..cc661f78b 100644 --- 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 c23d7da8a..267566561 100644 --- 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 b9bf32d73..3d562b6e7 100644 --- 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 0ed683927..1c2ca0a25 100644 --- 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 79b816ac7..cf4881a0a 100644 --- 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 9ceeffc8e..23da35a09 100644 --- 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 49169756f..3c2b1aae1 100644 --- 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 6b869514a..9afc55247 100644 --- 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 d629e818d..e99bba917 100644 --- 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 e75f94476..b75b67804 100644 --- 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 103ecfbaa..29bc5bf1a 100644 --- 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 9048b092c..12a789d12 100644 --- 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 44dc86606..baa3ea08c 100644 --- 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 80c130cbe..ec5195511 100644 --- 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 0c81dea7b..2b5185c57 100644 --- 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 b29bf45d3..25706976a 100644 --- 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 a8ea01943..03c052316 100644 --- 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 17ddc1b14..0ca40c770 100644 --- 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 45eb099d7..e1ec0853e 100644 --- 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 9f1e25307..0567d8aaf 100644 --- 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 cac65b184..44f2e74d6 100644 --- 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 a2243930a..5094759eb 100644 --- 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 4d90095a7..d19be4e74 100644 --- 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 59c113d22..f27d4ff6f 100644 --- 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 1fc4aaa11..e4ed6779b 100644 --- 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 f39ea1e9b..f0a4518f3 100644 --- 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 b000339d8..bdbd2e6c3 100644 --- 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 f3a2b62a2..35767932d 100644 --- 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 56610fdff..f46fba932 100644 --- 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 7ab9688cc..3f354f9c9 100644 --- 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 087ae5aea..e3307044f 100644 --- 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 a9aa730f4..af6e27642 100644 --- 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 ac4407168..2f2456bc2 100644 --- 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 c34c4f313..9ca325f2a 100644 --- 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 f1dc48078..9ab4cc384 100644 --- 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 679dccf96..535be91eb 100644 --- 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 17a781911..c3eece620 100644 --- 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 7fc1ab261..4cd622cef 100644 --- 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 519eb06ab..110bbef22 100644 --- 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 3808ceeb9..63ed36a4e 100644 --- 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 934387512..7b58b73ee 100644 --- 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 a84ced8a2..83b30502a 100644 --- 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 dbc8b871e..59139f27e 100644 --- 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 bc1225fd3..2cedb89cf 100644 --- 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 5148a90ea..8fbc55595 100644 --- 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 bddd8ac4a..ebd253691 100644 --- 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 f5fc2bb2d..f9e2e6a22 100644 --- 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 cdf3e592b..e17fc29e9 100644 --- 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 c706e2d11..b14e1f300 100644 --- 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 b61fba587..a699f2d78 100644 --- 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 6f61f9832..58c1219e5 100644 --- 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 57c527d30..fdc030c23 100644 --- 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 bb80cdd93..ccd201719 100644 --- 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 b4d098c94..47892ceb5 100644 --- 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 e735334d6..9f1630929 100644 --- 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 9d10d006d..64502d56b 100644 --- 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 ac1476b10..feaa815a1 100644 --- 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 6429fec7d..cc47218fb 100644 --- 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 71d708d57..68ca077be 100644 --- 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 0fdd8e617..40c56f0c2 100644 --- 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 80bf30b3e..e2ee0e223 100644 --- 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 d7e140844..38713735b 100644 --- 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 0ecd87b44..9f69adca2 100644 --- 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 944c5e7ca..73dcde61e 100644 --- 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 df56723d3..f61091683 100644 --- 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 c404caadd..a0e1fe46f 100644 --- 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 b7893de75..4223430a3 100644 --- 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 fc56df40d..a9daf05b7 100644 --- 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 8118ef889..7cd35f0e2 100644 --- 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 1b9444aa5..c77c1547f 100644 --- 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 1857f6c94..56d8d6a3d 100644 --- 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 34fb338bc..9487445cc 100644 --- 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 a32e7e46a..f09213be9 100644 --- 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 4987211e1..8703d1967 100644 --- 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 045f21d9a..72754a6d9 100644 --- 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 d69f2a612..7f872fa06 100644 --- 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 38283826d..aab264820 100644 --- 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 3ba6bc620..f2c49c9b8 100644 --- 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 d856e98bc..398e2135d 100644 --- 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 f28f02260..ab1f6dcdd 100644 --- 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 b9f3cd8e1..d57d3a112 100644 --- 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 8a56c713d..b6a557667 100644 --- 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 5d2d193f8..d3e77201d 100644 --- 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 f4c228650..26ae4c1bc 100644 --- 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 75b8dfa7f..1288d7f12 100644 --- 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 166278f7e..573ea379a 100644 --- 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 477812e3c..154603d5d 100644 --- 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 d5da83ef5..8c89e9aae 100644 --- 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 2809f6ce9..70d7435a5 100644 --- 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 95b3f0d2d..e179f9685 100644 --- 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 182895a19..9f0af7cf6 100644 --- 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 da7d2867f..b177444e9 100644 --- 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 6b43541d5..ecdb68be0 100644 --- 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 6040c1fa6..379d2c98a 100644 --- 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 cb5c4a714..43db2ac1c 100644 --- 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 804cd749d..7fb561bdc 100644 --- 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 93ad43f04..ff4350809 100644 --- 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 810ab712a..072e8e438 100644 --- 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 50df137fb..f6b5263fa 100644 --- 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 65919ba8e..904ccfb18 100644 --- 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 c463033fc..dce78ed7a 100644 --- 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 62272a0ab..825be913e 100644 --- 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 dd097fad8..a355bfcdf 100644 --- 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 018457c7b..bc4f4fbc6 100644 --- 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 91915ae1d..b7ad9a800 100644 --- 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 a4c12adf0..72bb374ec 100644 --- 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 2fd56f130..b485b0102 100644 --- 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 ea855471e..566e260f2 100644 --- 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 d6daf0eb2..34e3b11ea 100644 --- 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 4b41aab70..9789808fb 100644 --- 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 58ecc663f..9f39fcf53 100644 --- 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 c82c704a3..c3cd41aac 100644 --- 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 337f90a0c..0593fac66 100644 --- 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 3c75e2138..442f8e85e 100644 --- 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 22f0813a8..2c9d28bf9 100644 --- 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 a7326acda..b3b77be38 100644 --- 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 a2e5b4e87..b5ac52727 100644 --- 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 f4a64bd5e..e4085ad6c 100644 --- 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 955444086..6880dcf90 100644 --- 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 1fa360d43..46266e4c8 100644 --- 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 ebaa4ebdd..d5a442ddb 100644 --- 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 3478c8aed..61e9f2b36 100644 --- 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 c179b0a33..96035debd 100644 --- 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 1627194b3..f52bae994 100644 --- 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 f80f55d2f..5752f91ed 100644 --- 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 85e5d75dd..792ccc574 100644 --- 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 8496e435b..6b817c2f4 100644 --- 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 bfb9b3795..afcd48251 100644 --- 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 35b45f1a4..d22aa99a7 100644 --- 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 9f62506da..813b3b941 100644 --- 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 b9d07b1cc..a76581de2 100644 --- 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 f1079ac93..e9c7b7ea3 100644 --- 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 fa567ba49..17debde22 100644 --- 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 ac7390021..11f7659e6 100644 --- 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 e3e9a4b04..14f5c6249 100644 --- 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 de5957484..bfa01a576 100644 --- 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 dc05734b0..39435d18c 100644 --- 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 2e521db92..44feae7bd 100644 --- 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 ea9ad6689..c0a1c5509 100644 --- 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 bce9cb0fa..7329ddccc 100644 --- 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 c468d6423..37c7629f5 100644 --- 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 f76652f95..930a2240f 100644 --- 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 19e3a6b27..facc8b8ee 100644 --- 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 1c0a478cd..d66253992 100644 --- 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 b36e1fa04..5971c0804 100644 --- 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 199db1590..8d8a008eb 100644 --- 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 b45b9183c..4561c58f7 100644 --- 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 3d33fb650..bfa30b445 100644 --- 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 84e585a5c..7e104c7c9 100644 --- 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 45a28fd62..b4843b488 100644 --- 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 10b6cb952..33fabbc04 100644 --- 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 f6228f979..ab15af225 100644 --- 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 7f2d2777d..eba6aa6eb 100644 --- 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 1b73148cc..dfe6b9921 100644 --- 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 fbcd12c9d..68cf703be 100644 --- 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 690979a2d..c63e76739 100644 --- 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 7c6549f46..f6d4f8605 100644 --- 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 667131e3f..94bd26ebd 100644 --- 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 bc4ccd8fd..c8ad7f8aa 100644 --- 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 0ab60d1a4..85e68a587 100644 --- 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 a4e7cad7c..dde49c3b2 100644 --- 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 abfb4aef5..fbcf3021c 100644 --- 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 e489ee93f..9bc22ce2e 100644 --- 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 e7da5a56d..0ebb2be7b 100644 --- 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 a0b74f1c1..3efca602c 100644 --- 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 df41eebf7..55bfcfafb 100644 --- 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 7cba2689f..a3bb87f73 100644 --- 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 45f95edc2..98f696f44 100644 --- 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 62ef3e6ac..f01baf3cf 100644 --- 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 d37b0d8fc..8dfd46888 100644 --- 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 de11185bb..4a1f682a9 100644 --- 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 b8f7ec45a..467d74d8d 100644 --- 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 8c101e818..2a45bf908 100644 --- 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 f7df70b97..681319353 100644 --- 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 298eb847d..e12e13828 100644 --- 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 a5cc47ad1..bcd5a4fd1 100644 --- 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 a5cc47ad1..bcd5a4fd1 100644 --- 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 61a04f6b0..bf4f1f6ad 100644 --- 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 45e6d1463..47f4b74c9 100644 --- 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 5a86785dd..96f3beac1 100644 --- 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 a1ba90dd1..a891d14dc 100644 --- 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 3a1868470..6ddee035e 100644 --- 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 7925a61f1..e3328c6a1 100644 --- 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 fbc9f6dc7..db8c7dc1f 100644 --- 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 924e5adf1..81edaab2a 100644 --- 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 8c2b6f551..763567326 100644 --- 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 7d4739f10..75c4eaef9 100644 --- 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 52216ce69..d5d497a06 100644 --- 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 ca45d9b38..385d4fe08 100644 --- 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 435aea650..98f70ee6d 100644 --- 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 3e8e55530..027ba7a54 100644 --- 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 bc945aa9f..a632dd223 100644 --- 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 a7d392ecd..462d7dcf2 100644 --- 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 c3ebee170..61a371176 100644 --- 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 bb33142ea..1dbe3e466 100644 --- 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 b1341fd32..eaa742b83 100644 --- 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 dfd897d55..7212fb30e 100644 --- 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 323b473e8..cafd2fb5e 100644 --- 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 e84e2a3b7..f273d92fa 100644 --- 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 5fa1a7702..19855fff3 100644 --- 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 9d348fa7b..40f4c8370 100644 --- 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 e44645991..5f379b8f1 100644 --- 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 74bab74e7..efa2de121 100644 --- 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 3ef70a42c..37e89e65f 100644 --- 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 8b45d32f5..bfd32bb3b 100644 --- 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 5574fed8e..e32dcfc94 100644 --- 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 c27e110ba..b3df43085 100644 --- 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 cda78f89e..1ba89388b 100644 --- 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 5ce5eeedb..f727ebca0 100644 --- 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 8cf757768..f87f985fd 100644 --- 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 636a3b614..0d93fe5bc 100644 --- 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 2c1038015..0984e0cc9 100644 --- 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 70ec647d0..a4576a5aa 100644 --- 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 4c59adb95..96ec87496 100644 --- 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 bb559116e..44a1fdee4 100644 --- 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 df818af1f..1b25be1f8 100644 --- 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 41b424798..ab42b242e 100644 --- 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 c05bcfcf9..a15936d83 100644 --- 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 267f4e071..185b06745 100644 --- 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 8d07b7a9c..ee1ae3c50 100644 --- 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 fe9d3bceb..32f8ab67b 100644 --- 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 613ebef44..031e690b3 100644 --- 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 47c8e7c50..e61fadc5e 100644 --- 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 ca0b19744..2de47bd82 100644 --- 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 8a5b0751c..65fde950d 100644 --- 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 4c6345a8a..6c4614499 100644 --- 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 af03ee53a..aa75b21a1 100644 --- 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 9ee830910..6c2f26ce0 100644 --- 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 670ce2c19..ac3578dc9 100644 --- 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 eae2edb0d..94436c344 100644 --- 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 9e9d2b006..eba80b812 100644 --- 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 cd474796f..0518519b8 100644 --- 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 a633b2879..a031f44de 100644 --- 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 f934e5133..04f52a9a0 100644 --- 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 45fb6a8de..086b506c6 100644 --- 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 f3baf2bbe..1ac5ebe5f 100644 --- 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 0317e853a..66ee61edc 100644 --- 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 efa6af29a..a01167ecb 100644 --- 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 b1aa065da..6c00f1ee0 100644 --- 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 91e0630d3..cc2379c88 100644 --- 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 2f55484a7..c042cd39a 100644 --- 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 3584b71e3..23ea43fef 100644 --- 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 95752ec35..77dc5a243 100644 --- 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 200ce25b3..7ef2c620a 100644 --- 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 dc36d2697..2922e6197 100644 --- 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 a8d170186..fe0a673c5 100644 --- 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 0739b61ed..0f71226c4 100644 --- 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 5f49b81e7..3521d8ce2 100644 --- 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 df59db2fe..036ef159c 100644 --- 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 2edabd78a..3d28c21c9 100644 --- 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 fc68727c1..0052dbebe 100644 --- 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 9a80732d5..44889aa72 100644 --- 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 ea3293413..8c7ff1626 100644 --- 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 05245e7f0..c31d3987f 100644 --- 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 99c870d3a..e27fff213 100644 --- 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 7861a8cf1..1defaf1d5 100644 --- 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 e91c501bf..fd7e9444f 100644 --- 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 3e72c8ae2..8b7bb7c59 100644 --- 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 3b86d2bd5..34defc347 100644 --- 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 dc36d2697..2922e6197 100644 --- 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 5f1631c5a..1918dc13c 100644 --- 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 fcae1cf93..86d88c040 100644 --- 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 6c79f5a87..36658e8f4 100644 --- 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 0f19e9cf4..14931e690 100644 --- 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 f5a90bcdc..fa76b71f1 100644 --- 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 7d807e8f0..a58c807e5 100644 --- 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 f52733f62..fb4e46837 100644 --- 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 758316a67..bc6a29644 100644 --- 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 933905460..61a8a12a7 100644 --- 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 2d51a6195..1505af3f7 100644 --- 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 c3a2fe070..bf29eba23 100644 --- 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 1cdd5d972..ddb0eaae2 100644 --- 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 c34f51d38..ce9a5032b 100644 --- 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 a31d93e1c..8af6a484d 100644 --- 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 204057a7c..9f5998640 100644 --- 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 15eb43fbf..25c51a131 100644 --- 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 1ba4ba084..1e96ea105 100644 --- 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 dc36d2697..2922e6197 100644 --- 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 117382b5a..f7f6619c0 100644 --- 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 e4510feb1..6d667ffc6 100644 --- 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 f59667e7a..33f138ae2 100644 --- 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 838930a82..41400aba7 100644 --- 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 2dc2a36a0..9485414c6 100644 --- 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 c3a2fe070..bf29eba23 100644 --- 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 1cdd5d972..ddb0eaae2 100644 --- 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 c34f51d38..ce9a5032b 100644 --- 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 6f9896748..3d4219774 100644 --- 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 8bbb8bf60..bb8794be6 100644 --- 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 314e524a2..a797ddb2c 100644 --- 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 9551633fb..50ba0ab6b 100644 --- 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 dc36d2697..2922e6197 100644 --- 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 46481910f..ba22aac7f 100644 --- 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 c1da0f24c..d968a907a 100644 --- 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 01c430781..52dcd14c7 100644 --- 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 d413ddaf3..f1decad00 100644 --- 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 529c9292d..75f1c67db 100644 --- 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 427464dd3..82a03b10c 100644 --- 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 ea3293413..8c7ff1626 100644 --- 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 27d8866d4..d047667e7 100644 --- 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 f64dbff30..445ff3e93 100644 --- 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 427464dd3..82a03b10c 100644 --- 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 ea3293413..8c7ff1626 100644 --- 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 e513a61dd..2063b33ba 100644 --- 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 3ee4fc492..bfa1f38cd 100644 --- 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 5a2740c87..2643dd9ec 100644 --- 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 f2b796de0..e99860fd5 100644 --- 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 b71e770be..a1acf570e 100644 --- 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 22fcd8816..0dd1f89a6 100644 --- 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 caa52bd9d..a73c38c51 100644 --- 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 78a4d1a52..cab609f55 100644 --- 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 f6171fd45..797a2b909 100644 --- 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 73e18635a..117c2ca48 100644 --- 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 0f42fec2a..dd0bbe405 100644 --- 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 3d7441af3..6e475eeb5 100644 --- 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 a52e735fc..e0c0a43d9 100644 --- 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 53f5bbb7f..97a89fd80 100644 --- 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 727375938..155008e4a 100644 --- 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 ae2171ad3..75941e1d3 100644 --- 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 72dcf1539..9e7adca52 100644 --- 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 4d8763d66..fb5a1defe 100644 --- 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 a2e969f25..d58181e24 100644 --- 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 de2cda15e..8723ea7ae 100644 --- 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 68197ab8f..d2e4a1c8d 100644 --- 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 c7ae7058e..6f450eb2e 100644 --- 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 36c0fe50b..805f4d9a7 100644 --- 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 5c7761cbe..a08d4b292 100644 --- 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 997a32e31..1d445cab5 100644 --- 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 65ce55118..b2e785562 100644 --- 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 d9985aabd..b04330247 100644 --- 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 6b472bcd8..0b188c736 100644 --- 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 40585c690..3d01d63bb 100644 --- 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 d18082f4c..70311339f 100644 --- 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 4e5fcc9c6..2ed26d3f3 100644 --- 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 9b990fca5..18974ef51 100644 --- 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 f8afd85ea..85904224e 100644 --- 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 614af1fb5..5cdd84c43 100644 --- 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 5554fb450..037f03fdb 100644 --- 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 e6346cd9f..cc6a4b092 100644 --- 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 99d003990..05bacb912 100644 --- 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 f829fb217..9bbdd8691 100644 --- 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 e72b967dd..e9e6a30e6 100644 --- 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 2f0d87f1b..29c59daf8 100644 --- 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 951f79e39..e40415254 100644 --- 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 89a2fcf74..a1acc1559 100644 --- 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 97453c156..f4945520b 100644 --- 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 717896d9c..b5d5dd8f9 100644 --- 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 6d89d40c2..f6ad104da 100644 --- 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 95cbff755..3a7e9a6a3 100644 --- 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 0b2302a20..55415be9a 100644 --- 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 33c5c72e3..dc9db1627 100644 --- 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 717896d9c..b5d5dd8f9 100644 --- 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 6d89d40c2..f6ad104da 100644 --- 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 0fbcb0fcd..895425c5a 100644 --- 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 0b2302a20..55415be9a 100644 --- 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 d7395e725..b2fa6d6df 100644 --- 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 d7395e725..b2fa6d6df 100644 --- 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 efd8f1576..555b43e40 100644 --- 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 b25c82afe..e2430e4b8 100644 --- 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 2bbfb4fc6..939cfe8a9 100644 --- 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 85f34c0c1..bf6cb2398 100644 --- 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 9c68237c1..e8d8f00f5 100644 --- 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 61373c7c8..e36be9236 100644 --- 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 e09273c2e..dd75f12fb 100644 --- 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 89372dcfd..6b2ce923e 100644 --- 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 2e63d0e0a..aa3e3fb19 100644 --- 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 74c607a1b..93af8e7a5 100644 --- 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 f7153995d..789b2a92e 100644 --- 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 75ed334bf..f51e4e8cf 100644 --- 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 729780b71..da5938424 100644 --- 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 d18082f4c..70311339f 100644 --- 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 95b5e7f5e..f2c8612e8 100644 --- 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 f8afd85ea..85904224e 100644 --- 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 1ed0824e8..41f6bab6f 100644 --- 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 05135dd5a..2cac1a73f 100644 --- 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 0c8d6e9b7..d6efce012 100644 --- 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 8b89b2bd3..5a110f292 100644 --- 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
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
diff --git a/test/stdout/4211 b/test/stdout/4211 index a0e463dc2..2dc813509 100644 --- 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
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
diff --git a/test/stdout/4221 b/test/stdout/4221 index a0e463dc2..2dc813509 100644 --- 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
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
diff --git a/test/stdout/5410 b/test/stdout/5410 index edf01f8ba..365fe2502 100644 --- a/test/stdout/5410 +++ b/test/stdout/5410 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -20,7 +20,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -32,5 +32,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbB-0005vi-00
221 myhost.test.ex closing connection
diff --git a/test/stdout/5420 b/test/stdout/5420 index edf01f8ba..365fe2502 100644 --- a/test/stdout/5420 +++ b/test/stdout/5420 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -20,7 +20,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -32,5 +32,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbB-0005vi-00
221 myhost.test.ex closing connection
|