diff options
Diffstat (limited to 'test/confs')
759 files changed, 2456 insertions, 64 deletions
diff --git a/test/confs/0000 b/test/confs/0000 index 25474a063..a0c5072d6 100644 --- a/test/confs/0000 +++ b/test/confs/0000 @@ -8,5 +8,6 @@ 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/0001 b/test/confs/0001 index ab9ad45f2..2b53c0942 100644 --- a/test/confs/0001 +++ b/test/confs/0001 @@ -203,6 +203,7 @@ system_filter_user = 99 tcp_nodelay = false timeout_frozen_after = 7d timezone = EDT +tls_advertise_hosts = trusted_groups = 42 trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}} unknown_login = unknownlogin diff --git a/test/confs/0002 b/test/confs/0002 index a6a1581d9..0616f5ecf 100644 --- a/test/confs/0002 +++ b/test/confs/0002 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0003 b/test/confs/0003 index 5c1382c7c..0c95732cc 100644 --- a/test/confs/0003 +++ b/test/confs/0003 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = acl_smtp_rcpt = check_recipient domainlist local_domains = test.ex diff --git a/test/confs/0004 b/test/confs/0004 index 5db3d6a2a..8faf1c60a 100644 --- a/test/confs/0004 +++ b/test/confs/0004 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = acl_smtp_rcpt = check_recipient domainlist local_domains = test.ex diff --git a/test/confs/0005 b/test/confs/0005 index f7d5b8027..de20203a3 100644 --- a/test/confs/0005 +++ b/test/confs/0005 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0006 b/test/confs/0006 index 3f5c25d33..597c6bafb 100644 --- a/test/confs/0006 +++ b/test/confs/0006 @@ -6,11 +6,13 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- acl_smtp_rcpt = accept trusted_users = CALLER +log_selector = +smtp_no_mail # ----- Routers ----- diff --git a/test/confs/0007 b/test/confs/0007 index 5e01e1de2..e31fd4c5c 100644 --- a/test/confs/0007 +++ b/test/confs/0007 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0008 b/test/confs/0008 index bf2d5b0ea..1a3ce395f 100644 --- a/test/confs/0008 +++ b/test/confs/0008 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0009 b/test/confs/0009 index 2049f10e1..ce366fd38 100644 --- a/test/confs/0009 +++ b/test/confs/0009 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0010 b/test/confs/0010 index 466b97c35..074928a87 100644 --- a/test/confs/0010 +++ b/test/confs/0010 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0011 b/test/confs/0011 index 36aa77762..53864399f 100644 --- a/test/confs/0011 +++ b/test/confs/0011 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0012 b/test/confs/0012 index f554c9f15..7b07d27fc 100644 --- a/test/confs/0012 +++ b/test/confs/0012 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0013 b/test/confs/0013 index 08f976a25..bc266e5fd 100644 --- a/test/confs/0013 +++ b/test/confs/0013 @@ -8,6 +8,7 @@ spool_directory = DIR/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 9785f5fe1..da0abb449 100644 --- a/test/confs/0014 +++ b/test/confs/0014 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e5637556b..04dc46cf2 100644 --- a/test/confs/0015 +++ b/test/confs/0015 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0016 b/test/confs/0016 index 5d9d99fdb..d68778639 100644 --- a/test/confs/0016 +++ b/test/confs/0016 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0017 b/test/confs/0017 index 9a9c2003d..c1b94ccd0 100644 --- a/test/confs/0017 +++ b/test/confs/0017 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0018 b/test/confs/0018 index 170a4c1c2..1eb1b08f7 100644 --- a/test/confs/0018 +++ b/test/confs/0018 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0019 b/test/confs/0019 index 6143a4d22..2ca5d5893 100644 --- a/test/confs/0019 +++ b/test/confs/0019 @@ -6,6 +6,7 @@ spool_directory = DIR/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 14fadcd77..1182e6a84 100644 --- a/test/confs/0020 +++ b/test/confs/0020 @@ -7,6 +7,7 @@ spool_directory = DIR/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 96dccd4af..31cf2c670 100644 --- a/test/confs/0021 +++ b/test/confs/0021 @@ -10,6 +10,7 @@ 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 38a844cc9..e2ebe66f9 100644 --- a/test/confs/0022 +++ b/test/confs/0022 @@ -9,6 +9,7 @@ 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 2e5e15cb2..0883bffa4 100644 --- a/test/confs/0023 +++ b/test/confs/0023 @@ -9,9 +9,12 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- +disable_ipv6 = true + addresslist ok_senders = ok@ok.ok domainlist local_domains = test.ex : *.test.ex @@ -98,6 +101,10 @@ acl_9_9_9: acl_V4NET_0_0: require verify = reverse_host_lookup accept +acl_V4NET_99_99: + accept local_parts = defer_ok + verify = reverse_host_lookup/defer_ok + accept verify = reverse_host_lookup acl_V4NET_11_12: deny message = host in DNS list $dnslist_domain: $dnslist_text diff --git a/test/confs/0024 b/test/confs/0024 index a70197579..0d5578423 100644 --- a/test/confs/0024 +++ b/test/confs/0024 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f17e0d5b2..a655d5f88 100644 --- a/test/confs/0025 +++ b/test/confs/0025 @@ -7,6 +7,7 @@ spool_directory = DIR/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 db267d502..f40587980 100644 --- a/test/confs/0026 +++ b/test/confs/0026 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -24,6 +25,7 @@ begin acl acl_data: deny log_message = body contains trigger condition = ${if match{$message_body}{trigger}{yes}{no}} + warn logwrite = \$h_from: '$h_from:' require verify = header_syntax warn message = X-warning: this is a test warning accept senders = ! : diff --git a/test/confs/0027 b/test/confs/0027 index 36116e863..b508a5b65 100644 --- a/test/confs/0027 +++ b/test/confs/0027 @@ -7,6 +7,7 @@ spool_directory = DIR/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 23d6c935d..cc0784b06 100644 --- a/test/confs/0028 +++ b/test/confs/0028 @@ -7,6 +7,7 @@ spool_directory = DIR/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 353415c08..a4eb1b1db 100644 --- a/test/confs/0029 +++ b/test/confs/0029 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c2ba7ab4f..c7c5f0867 100644 --- a/test/confs/0030 +++ b/test/confs/0030 @@ -7,6 +7,7 @@ spool_directory = DIR/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 d4452ac3a..0328320ca 100644 --- a/test/confs/0031 +++ b/test/confs/0031 @@ -7,6 +7,7 @@ spool_directory = DIR/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 9d2a0255b..1648fd217 100644 --- a/test/confs/0032 +++ b/test/confs/0032 @@ -7,6 +7,7 @@ spool_directory = DIR/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 aef4591e9..9e95388c3 100644 --- a/test/confs/0033 +++ b/test/confs/0033 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8317a0cd2..e5f7931c3 100644 --- a/test/confs/0034 +++ b/test/confs/0034 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a591b7521..36ad12a83 100644 --- a/test/confs/0035 +++ b/test/confs/0035 @@ -10,6 +10,7 @@ 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 218de7b4c..0c5044445 100644 --- a/test/confs/0036 +++ b/test/confs/0036 @@ -9,6 +9,7 @@ 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 84385f07a..98ef4d3d4 100644 --- a/test/confs/0037 +++ b/test/confs/0037 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0038 b/test/confs/0038 index 6c4c332ae..514af9e8a 100644 --- a/test/confs/0038 +++ b/test/confs/0038 @@ -11,6 +11,7 @@ spool_directory = DIR/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 36a7d509b..f8ad999f5 100644 --- a/test/confs/0039 +++ b/test/confs/0039 @@ -9,6 +9,7 @@ spool_directory = DIR/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 c686bcc02..71f903845 100644 --- a/test/confs/0040 +++ b/test/confs/0040 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0041 b/test/confs/0041 index 996e322e7..51cba04ac 100644 --- a/test/confs/0041 +++ b/test/confs/0041 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0042 b/test/confs/0042 index 8a3847420..c65be6f99 100644 --- a/test/confs/0042 +++ b/test/confs/0042 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0043 b/test/confs/0043 index 301bee438..eaa13a859 100644 --- a/test/confs/0043 +++ b/test/confs/0043 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0044 b/test/confs/0044 index 922944341..963a55ea3 100644 --- a/test/confs/0044 +++ b/test/confs/0044 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0045 b/test/confs/0045 index f60aec0ec..764a7f213 100644 --- a/test/confs/0045 +++ b/test/confs/0045 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0046 b/test/confs/0046 index 3c70acc52..a64d3d9ea 100644 --- a/test/confs/0046 +++ b/test/confs/0046 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0047 b/test/confs/0047 index 1e59305b6..ff8aea173 100644 --- a/test/confs/0047 +++ b/test/confs/0047 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0048 b/test/confs/0048 index 374dbaf88..c15945f98 100644 --- a/test/confs/0048 +++ b/test/confs/0048 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0049 b/test/confs/0049 index e2b7279e0..4dc39d87b 100644 --- a/test/confs/0049 +++ b/test/confs/0049 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8bcfdbab0..47869246c 100644 --- a/test/confs/0050 +++ b/test/confs/0050 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0051 b/test/confs/0051 index 8e11e7177..af1e10acd 100644 --- a/test/confs/0051 +++ b/test/confs/0051 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0052 b/test/confs/0052 index 34c05989b..3b36daf04 100644 --- a/test/confs/0052 +++ b/test/confs/0052 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0053 b/test/confs/0053 index 646eee96f..0e6a98546 100644 --- a/test/confs/0053 +++ b/test/confs/0053 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0054 b/test/confs/0054 index 1a0ddd3c6..13ca588a4 100644 --- a/test/confs/0054 +++ b/test/confs/0054 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0055 b/test/confs/0055 index 9f1b0087c..0c64561b3 100644 --- a/test/confs/0055 +++ b/test/confs/0055 @@ -7,6 +7,7 @@ spool_directory = DIR/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 51fa53b27..cc151dd70 100644 --- a/test/confs/0056 +++ b/test/confs/0056 @@ -7,6 +7,7 @@ spool_directory = DIR/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 37bb1987c..2b13c187d 100644 --- a/test/confs/0057 +++ b/test/confs/0057 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f095f3713..4c3472379 100644 --- a/test/confs/0058 +++ b/test/confs/0058 @@ -7,6 +7,7 @@ spool_directory = DIR/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 b21c5cab5..6c771f1d2 100644 --- a/test/confs/0059 +++ b/test/confs/0059 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0bf8bc4d6..c17f00372 100644 --- a/test/confs/0060 +++ b/test/confs/0060 @@ -7,6 +7,7 @@ spool_directory = DIR/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 84d41498b..5f8521499 100644 --- a/test/confs/0061 +++ b/test/confs/0061 @@ -7,6 +7,7 @@ spool_directory = DIR/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 9becb261f..3e3ee757d 100644 --- a/test/confs/0062 +++ b/test/confs/0062 @@ -7,6 +7,7 @@ spool_directory = DIR/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 d45c79cef..e832aa81a 100644 --- a/test/confs/0063 +++ b/test/confs/0063 @@ -7,6 +7,7 @@ spool_directory = DIR/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 d2de32529..5046f2375 100644 --- a/test/confs/0064 +++ b/test/confs/0064 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0f18c5ebb..47b90b199 100644 --- a/test/confs/0065 +++ b/test/confs/0065 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8143b632e..6271d5a0d 100644 --- a/test/confs/0066 +++ b/test/confs/0066 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4d53f3a7e..de9a0db9c 100644 --- a/test/confs/0067 +++ b/test/confs/0067 @@ -7,6 +7,7 @@ spool_directory = DIR/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 bc3e88d23..f4239beea 100644 --- a/test/confs/0068 +++ b/test/confs/0068 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0069 b/test/confs/0069 index c03aa20b9..3514a1ea1 100644 --- a/test/confs/0069 +++ b/test/confs/0069 @@ -9,9 +9,12 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- +disable_ipv6 = true + domainlist local_domains = test.ex : myhost.ex acl_smtp_rcpt = check_recipient$local_part diff --git a/test/confs/0070 b/test/confs/0070 index 768f7d614..1c439b72b 100644 --- a/test/confs/0070 +++ b/test/confs/0070 @@ -9,6 +9,7 @@ spool_directory = DIR/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 749781c78..00d45578a 100644 --- a/test/confs/0071 +++ b/test/confs/0071 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0072 b/test/confs/0072 index 110d3b1a9..69ad904cd 100644 --- a/test/confs/0072 +++ b/test/confs/0072 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0073 b/test/confs/0073 index b39477878..dfea2c293 100644 --- a/test/confs/0073 +++ b/test/confs/0073 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0074 b/test/confs/0074 index 515330050..c967ba27c 100644 --- a/test/confs/0074 +++ b/test/confs/0074 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0075 b/test/confs/0075 index 5ed1218ce..e4a6fdfca 100644 --- a/test/confs/0075 +++ b/test/confs/0075 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0076 b/test/confs/0076 index e95ee98da..840fde7e3 100644 --- a/test/confs/0076 +++ b/test/confs/0076 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0077 b/test/confs/0077 index aef2fd685..18edff925 100644 --- a/test/confs/0077 +++ b/test/confs/0077 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a9e660a71..7955d10c5 100644 --- a/test/confs/0078 +++ b/test/confs/0078 @@ -7,6 +7,7 @@ spool_directory = DIR/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 522c9053b..3279e52e8 100644 --- a/test/confs/0079 +++ b/test/confs/0079 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0080 b/test/confs/0080 index cb83d3890..fc5f82449 100644 --- a/test/confs/0080 +++ b/test/confs/0080 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0081 b/test/confs/0081 index 4bca680a4..29a35862b 100644 --- a/test/confs/0081 +++ b/test/confs/0081 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0082 b/test/confs/0082 index b6fe0f453..7219daf2d 100644 --- a/test/confs/0082 +++ b/test/confs/0082 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0083 b/test/confs/0083 index 6cbb42e23..e7b1a0486 100644 --- a/test/confs/0083 +++ b/test/confs/0083 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0084 b/test/confs/0084 index 30a8cccb8..44e57633d 100644 --- a/test/confs/0084 +++ b/test/confs/0084 @@ -7,6 +7,7 @@ spool_directory = DIR/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 59bd0eea4..efd52533c 100644 --- a/test/confs/0085 +++ b/test/confs/0085 @@ -7,6 +7,7 @@ spool_directory = DIR/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 2bf285a97..f512e3194 100644 --- a/test/confs/0086 +++ b/test/confs/0086 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -20,7 +21,8 @@ recipient_unqualified_hosts = V4NET.10.10.9 begin acl check_message: - require verify = header_syntax + deny !verify = header_syntax + logwrite = acl_verify_message: '$acl_verify_message' accept # End diff --git a/test/confs/0087 b/test/confs/0087 index 71cdc701c..2e8200a3d 100644 --- a/test/confs/0087 +++ b/test/confs/0087 @@ -7,6 +7,7 @@ spool_directory = DIR/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 96aaca6e7..13f0ffc62 100644 --- a/test/confs/0088 +++ b/test/confs/0088 @@ -7,6 +7,7 @@ spool_directory = DIR/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 3b7f145c9..4b6bc6500 100644 --- a/test/confs/0089 +++ b/test/confs/0089 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ec524c83f..735ea021a 100644 --- a/test/confs/0090 +++ b/test/confs/0090 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c65a94799..58bd6df71 100644 --- a/test/confs/0091 +++ b/test/confs/0091 @@ -7,6 +7,7 @@ spool_directory = DIR/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 62157cb33..e0c221bbf 100644 --- a/test/confs/0092 +++ b/test/confs/0092 @@ -14,6 +14,7 @@ spool_directory = DIR/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 c8124fa82..e94481518 100644 --- a/test/confs/0093 +++ b/test/confs/0093 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0094 b/test/confs/0094 index fd25acc31..79825c758 100644 --- a/test/confs/0094 +++ b/test/confs/0094 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0095 b/test/confs/0095 index f19bec7c1..ba3e7b805 100644 --- a/test/confs/0095 +++ b/test/confs/0095 @@ -10,6 +10,7 @@ spool_directory = DIR/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 98ac5f85a..074dc2fd4 100644 --- a/test/confs/0096 +++ b/test/confs/0096 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0097 b/test/confs/0097 index 9c4f7d931..3c711253a 100644 --- a/test/confs/0097 +++ b/test/confs/0097 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0098 b/test/confs/0098 index f23da44c6..03f94ac37 100644 --- a/test/confs/0098 +++ b/test/confs/0098 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0099 b/test/confs/0099 index e54cf628c..0b4c1372b 100644 --- a/test/confs/0099 +++ b/test/confs/0099 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -21,12 +22,20 @@ log_selector = +received_recipients begin routers +bydns: + driver = dnslookup + domains = mxt2.test.ex + transport = smtp + fail_defer_domains = * + all: driver = manualroute route_list = simple thishost.test.ex byname \ ; complex thisloop.test.ex byname \ + ; nonexist nonexist.test.ex byname \ ; * 127.0.0.1 byname self = send + host_find_failed = defer transport = smtp @@ -50,6 +59,7 @@ begin retry rcpt45x.test.ex rcpt_45x F,10d,2m rcpt463.test.ex rcpt_463 F,10d,3m rcpt4xx.test.ex rcpt_4xx F,10d,1m +* lookup F,10d,30m *@\N^\d * F,5d,1m *@*.abcd.ex * F,5d,2m diff --git a/test/confs/0100 b/test/confs/0100 index 6d78adf06..d9843d074 100644 --- a/test/confs/0100 +++ b/test/confs/0100 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0101 b/test/confs/0101 index ccee4194d..3b421a755 100644 --- a/test/confs/0101 +++ b/test/confs/0101 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0102 b/test/confs/0102 index 3b3e3d52e..e9e7512df 100644 --- a/test/confs/0102 +++ b/test/confs/0102 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0103 b/test/confs/0103 index bff294a96..63311a21a 100644 --- a/test/confs/0103 +++ b/test/confs/0103 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0104 b/test/confs/0104 index e6c15b8c8..18ce0b046 100644 --- a/test/confs/0104 +++ b/test/confs/0104 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0105 b/test/confs/0105 index 73550b395..3cc1a80e9 100644 --- a/test/confs/0105 +++ b/test/confs/0105 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0106 b/test/confs/0106 index bd7cb84f8..faaccd0c8 100644 --- a/test/confs/0106 +++ b/test/confs/0106 @@ -7,6 +7,7 @@ spool_directory = DIR/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 6fd34ce7c..72bc6c5c2 100644 --- a/test/confs/0107 +++ b/test/confs/0107 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0108 b/test/confs/0108 index bbcb3e57f..f8e5d0b12 100644 --- a/test/confs/0108 +++ b/test/confs/0108 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0109 b/test/confs/0109 index d42a79d58..ebc53295d 100644 --- a/test/confs/0109 +++ b/test/confs/0109 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0110 b/test/confs/0110 index b02cf5929..63377228c 100644 --- a/test/confs/0110 +++ b/test/confs/0110 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0111 b/test/confs/0111 index cb95f577f..9a840e956 100644 --- a/test/confs/0111 +++ b/test/confs/0111 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0112 b/test/confs/0112 index 2b3b7bd4a..312baae73 100644 --- a/test/confs/0112 +++ b/test/confs/0112 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0113 b/test/confs/0113 index 0d1240e29..a5bc653fc 100644 --- a/test/confs/0113 +++ b/test/confs/0113 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0114 b/test/confs/0114 index 8a4595f22..10cf42a82 100644 --- a/test/confs/0114 +++ b/test/confs/0114 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0115 b/test/confs/0115 index 3f5fb8b4d..aaf04e501 100644 --- a/test/confs/0115 +++ b/test/confs/0115 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0116 b/test/confs/0116 index 41aaf0d33..e657b11c2 100644 --- a/test/confs/0116 +++ b/test/confs/0116 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0117 b/test/confs/0117 index 11b940984..f80fc9ae5 100644 --- a/test/confs/0117 +++ b/test/confs/0117 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0118 b/test/confs/0118 index bf517b14d..45b9f79e4 100644 --- a/test/confs/0118 +++ b/test/confs/0118 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0119 b/test/confs/0119 index a25646b5e..f33253242 100644 --- a/test/confs/0119 +++ b/test/confs/0119 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0120 b/test/confs/0120 index 8fd162d09..6ede1ee4e 100644 --- a/test/confs/0120 +++ b/test/confs/0120 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0121 b/test/confs/0121 index 897c90a92..6c6f65d3a 100644 --- a/test/confs/0121 +++ b/test/confs/0121 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0122 b/test/confs/0122 index b8bc34213..8ed176fe3 100644 --- a/test/confs/0122 +++ b/test/confs/0122 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0123 b/test/confs/0123 index df35baf3d..fc8ded626 100644 --- a/test/confs/0123 +++ b/test/confs/0123 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0124 b/test/confs/0124 index 5f156e1f6..8dff37eeb 100644 --- a/test/confs/0124 +++ b/test/confs/0124 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0125 b/test/confs/0125 index 3b74967be..23547965f 100644 --- a/test/confs/0125 +++ b/test/confs/0125 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0126 b/test/confs/0126 index 04583de9e..5b4bb9c3b 100644 --- a/test/confs/0126 +++ b/test/confs/0126 @@ -7,6 +7,7 @@ spool_directory = DIR/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 3e95cf8d1..f3dbe76e6 100644 --- a/test/confs/0127 +++ b/test/confs/0127 @@ -7,6 +7,7 @@ spool_directory = DIR/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 95271e30c..f81392e9c 100644 --- a/test/confs/0128 +++ b/test/confs/0128 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0129 b/test/confs/0129 index b03391476..0fe74070b 100644 --- a/test/confs/0129 +++ b/test/confs/0129 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0130 b/test/confs/0130 index 5ecdfc395..c6dfcc420 100644 --- a/test/confs/0130 +++ b/test/confs/0130 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0131 b/test/confs/0131 index 50ae1db14..85aa1250d 100644 --- a/test/confs/0131 +++ b/test/confs/0131 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0132 b/test/confs/0132 index 0ed262a73..b018f2d6c 100644 --- a/test/confs/0132 +++ b/test/confs/0132 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0133 b/test/confs/0133 index c43202121..c85cc8dc3 100644 --- a/test/confs/0133 +++ b/test/confs/0133 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0134 b/test/confs/0134 index 08519f38d..8217278c4 100644 --- a/test/confs/0134 +++ b/test/confs/0134 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0135 b/test/confs/0135 index 4cef8c451..549579f5b 100644 --- a/test/confs/0135 +++ b/test/confs/0135 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0136 b/test/confs/0136 index 014425213..b35b4e078 100644 --- a/test/confs/0136 +++ b/test/confs/0136 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0137 b/test/confs/0137 index 45f3c442a..82714a382 100644 --- a/test/confs/0137 +++ b/test/confs/0137 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0138 b/test/confs/0138 index abe4665e4..a59fc8d46 100644 --- a/test/confs/0138 +++ b/test/confs/0138 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0139 b/test/confs/0139 index 3a10b713c..a5a315e0a 100644 --- a/test/confs/0139 +++ b/test/confs/0139 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0140 b/test/confs/0140 index e3d032431..d44f11a04 100644 --- a/test/confs/0140 +++ b/test/confs/0140 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0141 b/test/confs/0141 index 275e7e3b6..a9d2d2f68 100644 --- a/test/confs/0141 +++ b/test/confs/0141 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0142 b/test/confs/0142 index 672f0f4ec..86d911101 100644 --- a/test/confs/0142 +++ b/test/confs/0142 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0143 b/test/confs/0143 index e1dd55ffb..fd3bb295d 100644 --- a/test/confs/0143 +++ b/test/confs/0143 @@ -7,6 +7,7 @@ spool_directory = DIR/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 116416ec7..d337a8e1e 100644 --- a/test/confs/0144 +++ b/test/confs/0144 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0145 b/test/confs/0145 index 011b4c6d5..ab8cc6691 100644 --- a/test/confs/0145 +++ b/test/confs/0145 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0146 b/test/confs/0146 index ae08e6ae2..f2f0e26a3 100644 --- a/test/confs/0146 +++ b/test/confs/0146 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0147 b/test/confs/0147 index a7ad86bee..643e86d44 100644 --- a/test/confs/0147 +++ b/test/confs/0147 @@ -14,6 +14,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0148 b/test/confs/0148 index 6a2a2f1c6..6a87274d4 100644 --- a/test/confs/0148 +++ b/test/confs/0148 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0149 b/test/confs/0149 index c652322c5..33c022f22 100644 --- a/test/confs/0149 +++ b/test/confs/0149 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0150 b/test/confs/0150 index 3bdb03f64..fa4bac12e 100644 --- a/test/confs/0150 +++ b/test/confs/0150 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0151 b/test/confs/0151 index 7f514cd45..58aa30eed 100644 --- a/test/confs/0151 +++ b/test/confs/0151 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0152 b/test/confs/0152 index 8272de7d4..2804f6616 100644 --- a/test/confs/0152 +++ b/test/confs/0152 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0153 b/test/confs/0153 index 0a4b448a6..c7fc79d54 100644 --- a/test/confs/0153 +++ b/test/confs/0153 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0154 b/test/confs/0154 index 159d5e2f8..84ed47d7d 100644 --- a/test/confs/0154 +++ b/test/confs/0154 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0155 b/test/confs/0155 index cd8ee91ac..b51837c4d 100644 --- a/test/confs/0155 +++ b/test/confs/0155 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0156 b/test/confs/0156 index fcf969a2c..389811416 100644 --- a/test/confs/0156 +++ b/test/confs/0156 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0157 b/test/confs/0157 index 237896558..69556016e 100644 --- a/test/confs/0157 +++ b/test/confs/0157 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0158 b/test/confs/0158 index 06789cf36..5af747138 100644 --- a/test/confs/0158 +++ b/test/confs/0158 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0159 b/test/confs/0159 index 64be164a9..59d3087c9 100644 --- a/test/confs/0159 +++ b/test/confs/0159 @@ -9,6 +9,7 @@ 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 1edac2f4a..68a5fe77a 100644 --- a/test/confs/0160 +++ b/test/confs/0160 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e5409f011..46175d9a0 100644 --- a/test/confs/0161 +++ b/test/confs/0161 @@ -7,6 +7,7 @@ spool_directory = DIR/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 077b9a41d..b8bc6ae55 100644 --- a/test/confs/0162 +++ b/test/confs/0162 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4193741c2..4b217eef6 100644 --- a/test/confs/0163 +++ b/test/confs/0163 @@ -7,6 +7,7 @@ spool_directory = DIR/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 814ea8109..1d28066b4 100644 --- a/test/confs/0164 +++ b/test/confs/0164 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0165 b/test/confs/0165 index 5db2c0ae9..03be27c40 100644 --- a/test/confs/0165 +++ b/test/confs/0165 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0166 b/test/confs/0166 index c8c20315e..6d492d7fd 100644 --- a/test/confs/0166 +++ b/test/confs/0166 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0167 b/test/confs/0167 index b74f1fa01..633993424 100644 --- a/test/confs/0167 +++ b/test/confs/0167 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0168 b/test/confs/0168 index 01db84368..ea10f1244 100644 --- a/test/confs/0168 +++ b/test/confs/0168 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0169 b/test/confs/0169 index 62504656f..4a42f0de2 100644 --- a/test/confs/0169 +++ b/test/confs/0169 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e1f773a09..735b7b262 100644 --- a/test/confs/0170 +++ b/test/confs/0170 @@ -7,6 +7,7 @@ spool_directory = DIR/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 05b023abb..2c2d18e41 100644 --- a/test/confs/0171 +++ b/test/confs/0171 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0172 b/test/confs/0172 index ea4cc6059..82d1feac8 100644 --- a/test/confs/0172 +++ b/test/confs/0172 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0173 b/test/confs/0173 index ddde76cb4..6f8ded7cb 100644 --- a/test/confs/0173 +++ b/test/confs/0173 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0174 b/test/confs/0174 index 31e11e8ab..a3e11143e 100644 --- a/test/confs/0174 +++ b/test/confs/0174 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0175 b/test/confs/0175 index 4f8be4fa5..2898683e5 100644 --- a/test/confs/0175 +++ b/test/confs/0175 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0176 b/test/confs/0176 index 48bd6ec5d..cf5d41f15 100644 --- a/test/confs/0176 +++ b/test/confs/0176 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0177 b/test/confs/0177 index 4782202c4..ccf9611f9 100644 --- a/test/confs/0177 +++ b/test/confs/0177 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0178 b/test/confs/0178 index 647f5f8eb..aaa83f0eb 100644 --- a/test/confs/0178 +++ b/test/confs/0178 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0179 b/test/confs/0179 index 39363d4ad..d3a6da6fd 100644 --- a/test/confs/0179 +++ b/test/confs/0179 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4f291f492..663780b90 100644 --- a/test/confs/0180 +++ b/test/confs/0180 @@ -9,6 +9,7 @@ spool_directory = DIR/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 a4e38dc78..ab3bfdb2f 100644 --- a/test/confs/0181 +++ b/test/confs/0181 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1f0890578..f76ae7f67 100644 --- a/test/confs/0182 +++ b/test/confs/0182 @@ -7,6 +7,7 @@ spool_directory = DIR/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 89b735a5e..65643d477 100644 --- a/test/confs/0183 +++ b/test/confs/0183 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1cc0c7bc7..9e43a38fd 100644 --- a/test/confs/0184 +++ b/test/confs/0184 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0185 b/test/confs/0185 index d4a5dac1c..d88d1e2f9 100644 --- a/test/confs/0185 +++ b/test/confs/0185 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0186 b/test/confs/0186 index e22f42647..5aa2c70d5 100644 --- a/test/confs/0186 +++ b/test/confs/0186 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0187 b/test/confs/0187 index 9750ae090..af570f0e0 100644 --- a/test/confs/0187 +++ b/test/confs/0187 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0188 b/test/confs/0188 index 8778e1420..70eabdd51 100644 --- a/test/confs/0188 +++ b/test/confs/0188 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0189 b/test/confs/0189 index fcf63ff02..bc29d4961 100644 --- a/test/confs/0189 +++ b/test/confs/0189 @@ -7,6 +7,7 @@ spool_directory = DIR/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 6925a373b..e76cdbbd1 100644 --- a/test/confs/0190 +++ b/test/confs/0190 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0191 b/test/confs/0191 index 666eceb22..4585e390a 100644 --- a/test/confs/0191 +++ b/test/confs/0191 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -33,7 +34,8 @@ smtp: driver = smtp port = PORT_S transport_filter = \ - /bin/sh -c "cat >/dev/null; /bin/echo -n Line without end" + /bin/sh -c \ + "cat >/dev/null; printf Line-without-end || /bin/echo -n Line-without-end" # End diff --git a/test/confs/0192 b/test/confs/0192 index 419bc6fb6..42fb603ca 100644 --- a/test/confs/0192 +++ b/test/confs/0192 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e819e7066..1cba850e7 100644 --- a/test/confs/0193 +++ b/test/confs/0193 @@ -7,6 +7,7 @@ spool_directory = DIR/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 94f810f05..e2c4160ea 100644 --- a/test/confs/0194 +++ b/test/confs/0194 @@ -7,6 +7,7 @@ spool_directory = DIR/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 fd2e76782..75c19ca62 100644 --- a/test/confs/0195 +++ b/test/confs/0195 @@ -7,6 +7,7 @@ spool_directory = DIR/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 522cd4bb1..096aa30ab 100644 --- a/test/confs/0196 +++ b/test/confs/0196 @@ -7,6 +7,7 @@ spool_directory = DIR/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 96a8e0b8d..32760b5a1 100644 --- a/test/confs/0197 +++ b/test/confs/0197 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = queue_run_in_order trusted_users = CALLER diff --git a/test/confs/0198 b/test/confs/0198 index de7b1f3bb..3946f8441 100644 --- a/test/confs/0198 +++ b/test/confs/0198 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = queue_run_in_order trusted_users = CALLER diff --git a/test/confs/0199 b/test/confs/0199 index 2d3f204c7..e7e17716f 100644 --- a/test/confs/0199 +++ b/test/confs/0199 @@ -7,6 +7,7 @@ spool_directory = DIR/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 9eccd234c..0660b9a2e 100644 --- a/test/confs/0200 +++ b/test/confs/0200 @@ -7,6 +7,7 @@ spool_directory = DIR/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 69bb69b82..0c1a0510a 100644 --- a/test/confs/0201 +++ b/test/confs/0201 @@ -7,6 +7,7 @@ spool_directory = DIR/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 77eab7f21..56f601416 100644 --- a/test/confs/0202 +++ b/test/confs/0202 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0203 b/test/confs/0203 index 64dd19c4c..3e7f49652 100644 --- a/test/confs/0203 +++ b/test/confs/0203 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0204 b/test/confs/0204 index a9ff5bbdd..fa0400a91 100644 --- a/test/confs/0204 +++ b/test/confs/0204 @@ -7,6 +7,7 @@ spool_directory = DIR/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 eeff8972f..4dc1be78a 100644 --- a/test/confs/0205 +++ b/test/confs/0205 @@ -7,6 +7,7 @@ spool_directory = DIR/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 d42392ef4..80fc0d851 100644 --- a/test/confs/0206 +++ b/test/confs/0206 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c8981ee76..1bc90fe41 100644 --- a/test/confs/0207 +++ b/test/confs/0207 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1212564d6..8a1a87dfe 100644 --- a/test/confs/0208 +++ b/test/confs/0208 @@ -9,6 +9,7 @@ spool_directory = DIR/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 c8a473915..28a3d6d77 100644 --- a/test/confs/0209 +++ b/test/confs/0209 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0210 b/test/confs/0210 index 9e709f761..28e29cd6d 100644 --- a/test/confs/0210 +++ b/test/confs/0210 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0211 b/test/confs/0211 index 89e98a4ea..6a532b6a0 100644 --- a/test/confs/0211 +++ b/test/confs/0211 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -34,7 +35,7 @@ begin routers others: driver = manualroute domains = ! +local_domains - route_list = * 127.0.0.1 byname + route_list = * localhost4.test.ex byname self = send transport = smtp no_more diff --git a/test/confs/0212 b/test/confs/0212 index 1d14d8972..a4c623bd8 100644 --- a/test/confs/0212 +++ b/test/confs/0212 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0213 b/test/confs/0213 index 226ade9ce..e28136352 100644 --- a/test/confs/0213 +++ b/test/confs/0213 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0214 b/test/confs/0214 index baaa2c06e..e06affae8 100644 --- a/test/confs/0214 +++ b/test/confs/0214 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0109d89b6..30277dac8 100644 --- a/test/confs/0215 +++ b/test/confs/0215 @@ -11,6 +11,7 @@ spool_directory = DIR/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 3250331b1..777737c07 100644 --- a/test/confs/0216 +++ b/test/confs/0216 @@ -9,6 +9,7 @@ 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 d1371dd10..a446c2896 100644 --- a/test/confs/0217 +++ b/test/confs/0217 @@ -9,6 +9,7 @@ spool_directory = DIR/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 2a4bff68d..4a96d825e 100644 --- a/test/confs/0218 +++ b/test/confs/0218 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f3538a780..9ae32da17 100644 --- a/test/confs/0219 +++ b/test/confs/0219 @@ -7,6 +7,7 @@ spool_directory = DIR/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 095d207e0..ef71838ac 100644 --- a/test/confs/0220 +++ b/test/confs/0220 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a28af6a16..8cf29a197 100644 --- a/test/confs/0221 +++ b/test/confs/0221 @@ -7,6 +7,7 @@ spool_directory = DIR/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 412baf220..f2ed82213 100644 --- a/test/confs/0222 +++ b/test/confs/0222 @@ -7,6 +7,7 @@ spool_directory = DIR/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 93da92c5f..640b98cd1 100644 --- a/test/confs/0223 +++ b/test/confs/0223 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0224 b/test/confs/0224 index 6b87aa682..10b429e49 100644 --- a/test/confs/0224 +++ b/test/confs/0224 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0225 b/test/confs/0225 index 279b84a40..5a2cacef7 100644 --- a/test/confs/0225 +++ b/test/confs/0225 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0226 b/test/confs/0226 index 9ebdb7917..b7117f257 100644 --- a/test/confs/0226 +++ b/test/confs/0226 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0227 b/test/confs/0227 index adc942f06..8aaf7a881 100644 --- a/test/confs/0227 +++ b/test/confs/0227 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c143f9bcf..4253c38e0 100644 --- a/test/confs/0228 +++ b/test/confs/0228 @@ -7,6 +7,7 @@ spool_directory = DIR/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 151ed137c..0a299bfda 100644 --- a/test/confs/0229 +++ b/test/confs/0229 @@ -7,6 +7,7 @@ spool_directory = DIR/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 df25468ed..c5fc9584c 100644 --- a/test/confs/0230 +++ b/test/confs/0230 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -36,6 +37,14 @@ check_recipient: begin routers +.ifdef RT +to_server: + driver = manualroute + transport = remote + route_list = * 127.0.0.1 + self = send +.endif + fail_remote_domains: driver = redirect domains = ! +local_domains @@ -57,6 +66,9 @@ local_delivery: headers_add = Port: $sender_host_port user = CALLER +remote: + driver = smtp + port = PORT_D # ----- Retry ----- diff --git a/test/confs/0231 b/test/confs/0231 index beb9da51f..c8dcbd2c9 100644 --- a/test/confs/0231 +++ b/test/confs/0231 @@ -7,6 +7,7 @@ spool_directory = DIR/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 be4f39bf0..9c9f55851 100644 --- a/test/confs/0232 +++ b/test/confs/0232 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a96661a5f..0fb615de7 100644 --- a/test/confs/0233 +++ b/test/confs/0233 @@ -7,6 +7,7 @@ spool_directory = DIR/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 b94456cb4..65df41a31 100644 --- a/test/confs/0234 +++ b/test/confs/0234 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ef6da69f6..42cd93491 100644 --- a/test/confs/0235 +++ b/test/confs/0235 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a6bd6750c..05a544f13 100644 --- a/test/confs/0236 +++ b/test/confs/0236 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e23daa1cc..a70f84f4d 100644 --- a/test/confs/0237 +++ b/test/confs/0237 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0238 b/test/confs/0238 index 6c1e8f3e5..b66c2160a 100644 --- a/test/confs/0238 +++ b/test/confs/0238 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0239 b/test/confs/0239 index a68a76d9d..7d7194dcd 100644 --- a/test/confs/0239 +++ b/test/confs/0239 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0240 b/test/confs/0240 index acccc8f8b..beaf6c985 100644 --- a/test/confs/0240 +++ b/test/confs/0240 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0241 b/test/confs/0241 index f907b5f02..224c94a96 100644 --- a/test/confs/0241 +++ b/test/confs/0241 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0242 b/test/confs/0242 index dfaa17aab..3d4e6d825 100644 --- a/test/confs/0242 +++ b/test/confs/0242 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f13453f22..5f9811084 100644 --- a/test/confs/0243 +++ b/test/confs/0243 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a144720a6..6dd6b0cfe 100644 --- a/test/confs/0244 +++ b/test/confs/0244 @@ -7,6 +7,7 @@ spool_directory = DIR/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 7e87be030..d2050c7a3 100644 --- a/test/confs/0245 +++ b/test/confs/0245 @@ -7,6 +7,7 @@ spool_directory = DIR/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 2cd7c3168..9aad3e1a6 100644 --- a/test/confs/0246 +++ b/test/confs/0246 @@ -7,6 +7,7 @@ spool_directory = DIR/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 395a8ca62..bab6c9220 100644 --- a/test/confs/0247 +++ b/test/confs/0247 @@ -7,6 +7,7 @@ spool_directory = DIR/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 5828021ef..c91d4602d 100644 --- a/test/confs/0248 +++ b/test/confs/0248 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8367e24ed..c9425d8d6 100644 --- a/test/confs/0249 +++ b/test/confs/0249 @@ -7,6 +7,7 @@ spool_directory = DIR/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 78d960932..da0fb2e5d 100644 --- a/test/confs/0250 +++ b/test/confs/0250 @@ -7,6 +7,7 @@ spool_directory = DIR/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 32e184c44..a6945ccca 100644 --- a/test/confs/0251 +++ b/test/confs/0251 @@ -9,6 +9,7 @@ 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 05e2aa626..c5d6fb6aa 100644 --- a/test/confs/0252 +++ b/test/confs/0252 @@ -7,6 +7,7 @@ spool_directory = DIR/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 cc730cb8d..00a4b60d8 100644 --- a/test/confs/0253 +++ b/test/confs/0253 @@ -7,6 +7,7 @@ spool_directory = DIR/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 799bc699e..f072c649e 100644 --- a/test/confs/0254 +++ b/test/confs/0254 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8f90f3486..341f704d4 100644 --- a/test/confs/0255 +++ b/test/confs/0255 @@ -9,6 +9,7 @@ spool_directory = DIR/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 1ebdd2b71..2e02fef4b 100644 --- a/test/confs/0256 +++ b/test/confs/0256 @@ -7,6 +7,7 @@ spool_directory = DIR/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 445ef68d0..f2403a368 100644 --- a/test/confs/0257 +++ b/test/confs/0257 @@ -7,6 +7,7 @@ spool_directory = DIR/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 3c13d6c4c..de433734b 100644 --- a/test/confs/0258 +++ b/test/confs/0258 @@ -7,6 +7,7 @@ spool_directory = DIR/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 fef46a187..e5a42dd4a 100644 --- a/test/confs/0259 +++ b/test/confs/0259 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0260 b/test/confs/0260 index c2d9a8bfd..442ab2880 100644 --- a/test/confs/0260 +++ b/test/confs/0260 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0ac6903aa..e39db4670 100644 --- a/test/confs/0261 +++ b/test/confs/0261 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0f84c7a5c..92e65f428 100644 --- a/test/confs/0262 +++ b/test/confs/0262 @@ -7,6 +7,7 @@ spool_directory = DIR/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 417bfeaaa..ac5599967 100644 --- a/test/confs/0263 +++ b/test/confs/0263 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ffa460296..3d9505e88 100644 --- a/test/confs/0264 +++ b/test/confs/0264 @@ -7,6 +7,7 @@ spool_directory = DIR/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 87ffd2ee9..586805b78 100644 --- a/test/confs/0265 +++ b/test/confs/0265 @@ -7,6 +7,7 @@ spool_directory = DIR/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 3a151f5df..9fe2dfe26 100644 --- a/test/confs/0266 +++ b/test/confs/0266 @@ -7,6 +7,7 @@ spool_directory = DIR/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 73dc94b8b..1e335bee3 100644 --- a/test/confs/0267 +++ b/test/confs/0267 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0d22e85d9..858397a25 100644 --- a/test/confs/0268 +++ b/test/confs/0268 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e7b63605c..ce735dbe5 100644 --- a/test/confs/0269 +++ b/test/confs/0269 @@ -7,6 +7,7 @@ spool_directory = DIR/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 3cd379d50..117579e84 100644 --- a/test/confs/0270 +++ b/test/confs/0270 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4e08b8fd1..47aa77b8d 100644 --- a/test/confs/0271 +++ b/test/confs/0271 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f4e8604f8..42ae1a614 100644 --- a/test/confs/0272 +++ b/test/confs/0272 @@ -7,6 +7,7 @@ spool_directory = DIR/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 180e30f7d..b60b66271 100644 --- a/test/confs/0273 +++ b/test/confs/0273 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ed318d228..cd76881c4 100644 --- a/test/confs/0274 +++ b/test/confs/0274 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e4fc444b8..2e62a907c 100644 --- a/test/confs/0275 +++ b/test/confs/0275 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e3b3dc485..db4afafdc 100644 --- a/test/confs/0276 +++ b/test/confs/0276 @@ -7,6 +7,7 @@ spool_directory = DIR/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 47d528656..eeb79e6c7 100644 --- a/test/confs/0277 +++ b/test/confs/0277 @@ -7,6 +7,7 @@ spool_directory = DIR/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 3b47eb751..255ecef34 100644 --- a/test/confs/0278 +++ b/test/confs/0278 @@ -7,6 +7,7 @@ spool_directory = DIR/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 5bcba7951..d8ec85dc2 100644 --- a/test/confs/0279 +++ b/test/confs/0279 @@ -7,6 +7,7 @@ spool_directory = DIR/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 389176e60..3552582b0 100644 --- a/test/confs/0280 +++ b/test/confs/0280 @@ -7,6 +7,7 @@ spool_directory = DIR/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 94527a2d2..19e2e5527 100644 --- a/test/confs/0281 +++ b/test/confs/0281 @@ -7,6 +7,7 @@ spool_directory = DIR/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 90875f5c0..a77ac9ab5 100644 --- a/test/confs/0282 +++ b/test/confs/0282 @@ -7,6 +7,7 @@ spool_directory = DIR/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 23949cb1f..93107d6db 100644 --- a/test/confs/0283 +++ b/test/confs/0283 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f11e99bc2..5ba209af5 100644 --- a/test/confs/0284 +++ b/test/confs/0284 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c06762dab..65095f0c0 100644 --- a/test/confs/0285 +++ b/test/confs/0285 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c5426f45f..b720a80c2 100644 --- a/test/confs/0286 +++ b/test/confs/0286 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8f9105c94..08a87a3f4 100644 --- a/test/confs/0287 +++ b/test/confs/0287 @@ -7,6 +7,7 @@ spool_directory = DIR/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 270ffb29e..0e9136bf3 100644 --- a/test/confs/0288 +++ b/test/confs/0288 @@ -1,4 +1,5 @@ # Exim test configuration 0288 +# serialize_hosts option on smtp transport exim_path = EXIM_PATH host_lookup_order = bydns @@ -7,6 +8,7 @@ spool_directory = DIR/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 a3d42e8c2..66734518a 100644 --- a/test/confs/0289 +++ b/test/confs/0289 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0290 b/test/confs/0290 index 47b2cec34..57e328216 100644 --- a/test/confs/0290 +++ b/test/confs/0290 @@ -17,6 +17,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0291 b/test/confs/0291 index a3b3277b7..8eb6af279 100644 --- a/test/confs/0291 +++ b/test/confs/0291 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0292 b/test/confs/0292 index 708909793..a388ebd3a 100644 --- a/test/confs/0292 +++ b/test/confs/0292 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0293 b/test/confs/0293 index 4f841bb1f..84f79b88a 100644 --- a/test/confs/0293 +++ b/test/confs/0293 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0294 b/test/confs/0294 index e1338b022..6b8a6112e 100644 --- a/test/confs/0294 +++ b/test/confs/0294 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0295 b/test/confs/0295 index a273eb2b9..ea16f79d7 100644 --- a/test/confs/0295 +++ b/test/confs/0295 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/0296 b/test/confs/0296 index 4f820bdc3..fe7531502 100644 --- a/test/confs/0296 +++ b/test/confs/0296 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0e2ca1bd9..8e692b690 100644 --- a/test/confs/0297 +++ b/test/confs/0297 @@ -7,6 +7,7 @@ spool_directory = DIR/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 5517f8f5e..47228e6af 100644 --- a/test/confs/0298 +++ b/test/confs/0298 @@ -7,6 +7,7 @@ spool_directory = DIR/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 7487182d5..619132bc7 100644 --- a/test/confs/0299 +++ b/test/confs/0299 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4587852ef..cf47c2b79 100644 --- a/test/confs/0300 +++ b/test/confs/0300 @@ -10,6 +10,7 @@ spool_directory = DIR/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 813143149..493f5a0dd 100644 --- a/test/confs/0301 +++ b/test/confs/0301 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f41f6b389..41c7af7fe 100644 --- a/test/confs/0302 +++ b/test/confs/0302 @@ -7,6 +7,7 @@ spool_directory = DIR/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 963d786d6..7670b60b6 100644 --- a/test/confs/0303 +++ b/test/confs/0303 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1f292a98c..7f1e658bd 100644 --- a/test/confs/0304 +++ b/test/confs/0304 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c208832c7..ceb51a82a 100644 --- a/test/confs/0305 +++ b/test/confs/0305 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a6bf031a9..2526d9df1 100644 --- a/test/confs/0306 +++ b/test/confs/0306 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e64a14edd..5e664452b 100644 --- a/test/confs/0307 +++ b/test/confs/0307 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0d917c772..cf90b6e23 100644 --- a/test/confs/0308 +++ b/test/confs/0308 @@ -7,6 +7,7 @@ spool_directory = DIR/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 13a53b360..2f7ccf0c3 100644 --- a/test/confs/0309 +++ b/test/confs/0309 @@ -7,6 +7,7 @@ spool_directory = DIR/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 aec448cbe..45eab9213 100644 --- a/test/confs/0310 +++ b/test/confs/0310 @@ -7,6 +7,7 @@ spool_directory = DIR/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 644cc5eb0..5f7a791dd 100644 --- a/test/confs/0311 +++ b/test/confs/0311 @@ -7,6 +7,7 @@ spool_directory = DIR/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 b0adf43eb..78a56c03e 100644 --- a/test/confs/0312 +++ b/test/confs/0312 @@ -7,6 +7,7 @@ spool_directory = DIR/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 7cb021d61..64e061215 100644 --- a/test/confs/0313 +++ b/test/confs/0313 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0314 b/test/confs/0314 index 9baef2e20..d9a066075 100644 --- a/test/confs/0314 +++ b/test/confs/0314 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0315 b/test/confs/0315 index 61a712e0f..afa292ddc 100644 --- a/test/confs/0315 +++ b/test/confs/0315 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0316 b/test/confs/0316 index 3d836d6c0..1a6238b8c 100644 --- a/test/confs/0316 +++ b/test/confs/0316 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0317 b/test/confs/0317 index efce1f8ee..2c3e66198 100644 --- a/test/confs/0317 +++ b/test/confs/0317 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0318 b/test/confs/0318 index a88b37eac..e57fe8eee 100644 --- a/test/confs/0318 +++ b/test/confs/0318 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0319 b/test/confs/0319 index 549c55f39..8a279a521 100644 --- a/test/confs/0319 +++ b/test/confs/0319 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0320 b/test/confs/0320 index e553a967c..e9191ee35 100644 --- a/test/confs/0320 +++ b/test/confs/0320 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0321 b/test/confs/0321 index 61dcd07ea..6ea0bcfe9 100644 --- a/test/confs/0321 +++ b/test/confs/0321 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0322 b/test/confs/0322 index 34385f708..2901010ad 100644 --- a/test/confs/0322 +++ b/test/confs/0322 @@ -9,6 +9,7 @@ spool_directory = DIR/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 049bf1c1b..253f8372c 100644 --- a/test/confs/0323 +++ b/test/confs/0323 @@ -7,6 +7,7 @@ spool_directory = DIR/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 814239701..e1353ccc1 100644 --- a/test/confs/0324 +++ b/test/confs/0324 @@ -7,6 +7,7 @@ spool_directory = DIR/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 d6f006e7b..4d145d851 100644 --- a/test/confs/0325 +++ b/test/confs/0325 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a8d6c6634..5081f88a2 100644 --- a/test/confs/0326 +++ b/test/confs/0326 @@ -7,6 +7,7 @@ spool_directory = DIR/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 b6d8baa35..28922ed73 100644 --- a/test/confs/0327 +++ b/test/confs/0327 @@ -7,6 +7,7 @@ spool_directory = DIR/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 516012a46..48d29a4a3 100644 --- a/test/confs/0328 +++ b/test/confs/0328 @@ -7,6 +7,7 @@ spool_directory = DIR/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 58ddc4086..1d853fa91 100644 --- a/test/confs/0329 +++ b/test/confs/0329 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a5043257f..9d53d7a79 100644 --- a/test/confs/0330 +++ b/test/confs/0330 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0331 b/test/confs/0331 index 96108ba65..934030529 100644 --- a/test/confs/0331 +++ b/test/confs/0331 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0332 b/test/confs/0332 index c7785dc58..bf16c2ea7 100644 --- a/test/confs/0332 +++ b/test/confs/0332 @@ -7,6 +7,7 @@ spool_directory = DIR/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 3113131f9..388987333 100644 --- a/test/confs/0333 +++ b/test/confs/0333 @@ -7,6 +7,7 @@ spool_directory = DIR/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 989f66785..a04081e52 100644 --- a/test/confs/0334 +++ b/test/confs/0334 @@ -7,6 +7,7 @@ spool_directory = DIR/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 72d9a291a..e78f4ebe1 100644 --- a/test/confs/0335 +++ b/test/confs/0335 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ae6136b9a..d85ab8489 100644 --- a/test/confs/0336 +++ b/test/confs/0336 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ce80752de..026d4f724 100644 --- a/test/confs/0337 +++ b/test/confs/0337 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4c14bc01c..1ea147be3 100644 --- a/test/confs/0338 +++ b/test/confs/0338 @@ -7,6 +7,7 @@ spool_directory = DIR/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 04b8683df..8048352fd 100644 --- a/test/confs/0339 +++ b/test/confs/0339 @@ -7,6 +7,7 @@ spool_directory = DIR/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 aa3a97577..a824813ac 100644 --- a/test/confs/0340 +++ b/test/confs/0340 @@ -7,6 +7,7 @@ spool_directory = DIR/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 fcb187ac3..f873809e2 100644 --- a/test/confs/0341 +++ b/test/confs/0341 @@ -9,6 +9,7 @@ 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 be285fd77..b0053226a 100644 --- a/test/confs/0342 +++ b/test/confs/0342 @@ -7,6 +7,7 @@ spool_directory = DIR/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 60fa9626c..2dc7d6e49 100644 --- a/test/confs/0343 +++ b/test/confs/0343 @@ -7,6 +7,7 @@ spool_directory = DIR/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 9483069ad..591294deb 100644 --- a/test/confs/0344 +++ b/test/confs/0344 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ad35ca5ec..d57ba1100 100644 --- a/test/confs/0345 +++ b/test/confs/0345 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0346 b/test/confs/0346 index 560c55699..9d648dcde 100644 --- a/test/confs/0346 +++ b/test/confs/0346 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0347 b/test/confs/0347 index a68f43380..506524279 100644 --- a/test/confs/0347 +++ b/test/confs/0347 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0348 b/test/confs/0348 index c196b41e8..651a94fe4 100644 --- a/test/confs/0348 +++ b/test/confs/0348 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0349 b/test/confs/0349 index 65b1083f2..ff3bd857e 100644 --- a/test/confs/0349 +++ b/test/confs/0349 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0350 b/test/confs/0350 index c842a2a4f..a3d606946 100644 --- a/test/confs/0350 +++ b/test/confs/0350 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f67365209..0c306f5c0 100644 --- a/test/confs/0351 +++ b/test/confs/0351 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0352 b/test/confs/0352 index 67e48371f..e3e9555f3 100644 --- a/test/confs/0352 +++ b/test/confs/0352 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0353 b/test/confs/0353 index e090d4850..566cb284c 100644 --- a/test/confs/0353 +++ b/test/confs/0353 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0354 b/test/confs/0354 index 523257c6e..b1b92692d 100644 --- a/test/confs/0354 +++ b/test/confs/0354 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0355 b/test/confs/0355 index 8615e0804..7523892a9 100644 --- a/test/confs/0355 +++ b/test/confs/0355 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0356 b/test/confs/0356 index 5a9311931..12dc13ab8 100644 --- a/test/confs/0356 +++ b/test/confs/0356 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0357 b/test/confs/0357 index a83c3899c..45ca7d320 100644 --- a/test/confs/0357 +++ b/test/confs/0357 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0358 b/test/confs/0358 index 4a2b7dd20..d6665da51 100644 --- a/test/confs/0358 +++ b/test/confs/0358 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0359 b/test/confs/0359 index 5effea5f8..1975cf378 100644 --- a/test/confs/0359 +++ b/test/confs/0359 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0360 b/test/confs/0360 index a00f1029b..b24010459 100644 --- a/test/confs/0360 +++ b/test/confs/0360 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0361 b/test/confs/0361 index b374e1d6e..275ae21a4 100644 --- a/test/confs/0361 +++ b/test/confs/0361 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0362 b/test/confs/0362 index 2afdca6aa..15ea70fbe 100644 --- a/test/confs/0362 +++ b/test/confs/0362 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0363 b/test/confs/0363 index 9b094f865..bddeb243e 100644 --- a/test/confs/0363 +++ b/test/confs/0363 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0364 b/test/confs/0364 index 141189182..706618d1b 100644 --- a/test/confs/0364 +++ b/test/confs/0364 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0365 b/test/confs/0365 index fb7e872d3..dbe113d28 100644 --- a/test/confs/0365 +++ b/test/confs/0365 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0366 b/test/confs/0366 index 4ad94b157..ec639aee7 100644 --- a/test/confs/0366 +++ b/test/confs/0366 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0367 b/test/confs/0367 index 9f6a9d34b..bf743c883 100644 --- a/test/confs/0367 +++ b/test/confs/0367 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0368 b/test/confs/0368 index 5afb8e786..08fffb406 100644 --- a/test/confs/0368 +++ b/test/confs/0368 @@ -7,6 +7,7 @@ spool_directory = DIR/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 40043c47b..7829414f1 100644 --- a/test/confs/0369 +++ b/test/confs/0369 @@ -7,6 +7,7 @@ spool_directory = DIR/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 865dd6a9f..63aad00be 100644 --- a/test/confs/0370 +++ b/test/confs/0370 @@ -7,6 +7,7 @@ spool_directory = DIR/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 679a54bd9..680377fcd 100644 --- a/test/confs/0371 +++ b/test/confs/0371 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0372 b/test/confs/0372 index ac2b4bb2f..6e457e7f5 100644 --- a/test/confs/0372 +++ b/test/confs/0372 @@ -9,6 +9,7 @@ spool_directory = DIR/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 b0407ebd8..9f672ced0 100644 --- a/test/confs/0373 +++ b/test/confs/0373 @@ -7,6 +7,7 @@ spool_directory = DIR/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 b345a9f28..87b3e182d 100644 --- a/test/confs/0374 +++ b/test/confs/0374 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1c246afa0..229230209 100644 --- a/test/confs/0375 +++ b/test/confs/0375 @@ -7,6 +7,7 @@ spool_directory = DIR/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 7a0b0fc42..de6feb6d1 100644 --- a/test/confs/0376 +++ b/test/confs/0376 @@ -9,6 +9,7 @@ spool_directory = DIR/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 729e80cbc..362ec37f1 100644 --- a/test/confs/0377 +++ b/test/confs/0377 @@ -7,6 +7,7 @@ spool_directory = DIR/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 9f1ed6801..8046c87f8 100644 --- a/test/confs/0378 +++ b/test/confs/0378 @@ -7,6 +7,7 @@ spool_directory = DIR/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 7fca137e0..6dae00b93 100644 --- a/test/confs/0379 +++ b/test/confs/0379 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8403ccb5c..4b478d3d4 100644 --- a/test/confs/0380 +++ b/test/confs/0380 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4f7304e2c..02a84a85c 100644 --- a/test/confs/0381 +++ b/test/confs/0381 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e986a284b..3dae69dd4 100644 --- a/test/confs/0382 +++ b/test/confs/0382 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1749bfad2..51d8f8f37 100644 --- a/test/confs/0383 +++ b/test/confs/0383 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f8dce40f6..0287358c0 100644 --- a/test/confs/0384 +++ b/test/confs/0384 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e21e3cb1c..39689c556 100644 --- a/test/confs/0385 +++ b/test/confs/0385 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c9715f171..b466066a3 100644 --- a/test/confs/0386 +++ b/test/confs/0386 @@ -7,6 +7,7 @@ spool_directory = DIR/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 5b7d59171..4193a139f 100644 --- a/test/confs/0387 +++ b/test/confs/0387 @@ -7,6 +7,7 @@ spool_directory = DIR/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 3806182d8..38166b449 100644 --- a/test/confs/0388 +++ b/test/confs/0388 @@ -7,6 +7,7 @@ spool_directory = DIR/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 b3d5f660a..fabc15179 100644 --- a/test/confs/0389 +++ b/test/confs/0389 @@ -7,6 +7,7 @@ spool_directory = DIR/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 06932291c..5b88cd7b2 100644 --- a/test/confs/0390 +++ b/test/confs/0390 @@ -7,6 +7,7 @@ spool_directory = DIR/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 2bea70832..a2ee5ef9d 100644 --- a/test/confs/0391 +++ b/test/confs/0391 @@ -7,6 +7,7 @@ spool_directory = DIR/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 bb6c683eb..ae809d52f 100644 --- a/test/confs/0392 +++ b/test/confs/0392 @@ -7,6 +7,7 @@ spool_directory = DIR/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 7b1d0fb13..d83857170 100644 --- a/test/confs/0393 +++ b/test/confs/0393 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0394 b/test/confs/0394 index f7dfe9095..7e6511964 100644 --- a/test/confs/0394 +++ b/test/confs/0394 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0395 b/test/confs/0395 index dda9055e9..4e00be813 100644 --- a/test/confs/0395 +++ b/test/confs/0395 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0396 b/test/confs/0396 index 5fd547f1a..2dac89ab9 100644 --- a/test/confs/0396 +++ b/test/confs/0396 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0397 b/test/confs/0397 index 99c86ac0a..50403df7a 100644 --- a/test/confs/0397 +++ b/test/confs/0397 @@ -5,6 +5,7 @@ host_lookup_order = bydns spool_directory = DIR/spool gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0398 b/test/confs/0398 index b894e46d8..0bed7ddbb 100644 --- a/test/confs/0398 +++ b/test/confs/0398 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0399 b/test/confs/0399 index 45e68e3c4..38da70b6c 100644 --- a/test/confs/0399 +++ b/test/confs/0399 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0400 b/test/confs/0400 index d2721dfeb..2c44a2b74 100644 --- a/test/confs/0400 +++ b/test/confs/0400 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0401 b/test/confs/0401 index 6a267d2b3..bd9a15c82 100644 --- a/test/confs/0401 +++ b/test/confs/0401 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0402 b/test/confs/0402 index b231629b8..9e9ccf956 100644 --- a/test/confs/0402 +++ b/test/confs/0402 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0403 b/test/confs/0403 index dc7f09cbb..bdc84841a 100644 --- a/test/confs/0403 +++ b/test/confs/0403 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0404 b/test/confs/0404 index 5fe8c9b50..e9b23f0f0 100644 --- a/test/confs/0404 +++ b/test/confs/0404 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0405 b/test/confs/0405 index 8fe224808..d1f77cd82 100644 --- a/test/confs/0405 +++ b/test/confs/0405 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0406 b/test/confs/0406 index 26d4c2d64..37b6bab07 100644 --- a/test/confs/0406 +++ b/test/confs/0406 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0407 b/test/confs/0407 index 5da660ce7..364786199 100644 --- a/test/confs/0407 +++ b/test/confs/0407 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0408 b/test/confs/0408 index 9f1af13cb..6df40fa9e 100644 --- a/test/confs/0408 +++ b/test/confs/0408 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0409 b/test/confs/0409 index d84f882ee..c077da26b 100644 --- a/test/confs/0409 +++ b/test/confs/0409 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0410 b/test/confs/0410 index 6d416fc6a..8fb017178 100644 --- a/test/confs/0410 +++ b/test/confs/0410 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0411 b/test/confs/0411 index d60c0ae44..c2c238507 100644 --- a/test/confs/0411 +++ b/test/confs/0411 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0412 b/test/confs/0412 index da851b376..9a38058d7 100644 --- a/test/confs/0412 +++ b/test/confs/0412 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0413 b/test/confs/0413 index daadb477e..e0d4fa329 100644 --- a/test/confs/0413 +++ b/test/confs/0413 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0414 b/test/confs/0414 index 8a3b109f7..9d269d959 100644 --- a/test/confs/0414 +++ b/test/confs/0414 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0415 b/test/confs/0415 index 13e61d994..aceaacc46 100644 --- a/test/confs/0415 +++ b/test/confs/0415 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0416 b/test/confs/0416 index c2780b0d5..2290da4b3 100644 --- a/test/confs/0416 +++ b/test/confs/0416 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0417 b/test/confs/0417 index 12c9f6890..f759e63d6 100644 --- a/test/confs/0417 +++ b/test/confs/0417 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0418 b/test/confs/0418 index 9cf13e30c..b44214388 100644 --- a/test/confs/0418 +++ b/test/confs/0418 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0419 b/test/confs/0419 index 74e7c6978..9fcf361db 100644 --- a/test/confs/0419 +++ b/test/confs/0419 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0420 b/test/confs/0420 index 4db37bf80..38cf50c22 100644 --- a/test/confs/0420 +++ b/test/confs/0420 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0421 b/test/confs/0421 index ba1988103..a65df5fdd 100644 --- a/test/confs/0421 +++ b/test/confs/0421 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0422 b/test/confs/0422 index 00d8000f3..5ad06071e 100644 --- a/test/confs/0422 +++ b/test/confs/0422 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0423 b/test/confs/0423 index f6c9778e1..30ba84b82 100644 --- a/test/confs/0423 +++ b/test/confs/0423 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0424 b/test/confs/0424 index 657741c2c..902f9ccb8 100644 --- a/test/confs/0424 +++ b/test/confs/0424 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0425 b/test/confs/0425 index ca5ef4326..5c4378fea 100644 --- a/test/confs/0425 +++ b/test/confs/0425 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0426 b/test/confs/0426 index 45ab74fe0..f50d54067 100644 --- a/test/confs/0426 +++ b/test/confs/0426 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0427 b/test/confs/0427 index f20028e49..95e6b5264 100644 --- a/test/confs/0427 +++ b/test/confs/0427 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0428 b/test/confs/0428 index fa00a43bf..0fb20a14a 100644 --- a/test/confs/0428 +++ b/test/confs/0428 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0429 b/test/confs/0429 index aa9a4c77a..3dbf4fcb2 100644 --- a/test/confs/0429 +++ b/test/confs/0429 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4a0f8e3c4..b38f3057b 100644 --- a/test/confs/0430 +++ b/test/confs/0430 @@ -10,6 +10,7 @@ spool_directory = DIR/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 bdb81372f..33b3631c3 100644 --- a/test/confs/0431 +++ b/test/confs/0431 @@ -9,6 +9,7 @@ spool_directory = DIR/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 cbc77885f..ffb97452f 100644 --- a/test/confs/0432 +++ b/test/confs/0432 @@ -7,6 +7,7 @@ spool_directory = DIR/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 905a6e57f..4513f6db0 100644 --- a/test/confs/0433 +++ b/test/confs/0433 @@ -11,6 +11,7 @@ spool_directory = DIR/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 19d7e11ad..5616b9cee 100644 --- a/test/confs/0434 +++ b/test/confs/0434 @@ -9,6 +9,7 @@ spool_directory = DIR/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 a2c43ad94..b251a0120 100644 --- a/test/confs/0435 +++ b/test/confs/0435 @@ -7,6 +7,7 @@ spool_directory = DIR/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 358522b41..9c24f1ff5 100644 --- a/test/confs/0436 +++ b/test/confs/0436 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0437 b/test/confs/0437 index 6d050c508..7e0583d79 100644 --- a/test/confs/0437 +++ b/test/confs/0437 @@ -8,6 +8,7 @@ spool_directory = DIR/${lookup{spool}lsearch{DIR/aux-fixed/TESTNUM.ls}} 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 9e89feb03..58d617824 100644 --- a/test/confs/0438 +++ b/test/confs/0438 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8b3941ce5..c63503634 100644 --- a/test/confs/0439 +++ b/test/confs/0439 @@ -7,6 +7,7 @@ spool_directory = DIR/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 06eb6ecdd..6a61c130a 100644 --- a/test/confs/0440 +++ b/test/confs/0440 @@ -7,6 +7,7 @@ spool_directory = DIR/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 45bd0f31e..3e10aa309 100644 --- a/test/confs/0441 +++ b/test/confs/0441 @@ -7,6 +7,7 @@ spool_directory = DIR/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 004e1de6a..29ecc1568 100644 --- a/test/confs/0442 +++ b/test/confs/0442 @@ -9,6 +9,7 @@ spool_directory = DIR/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 5f85d8b49..bd5dad286 100644 --- a/test/confs/0443 +++ b/test/confs/0443 @@ -7,6 +7,7 @@ spool_directory = DIR/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 79f2d1ad6..f6dff0169 100644 --- a/test/confs/0444 +++ b/test/confs/0444 @@ -7,6 +7,7 @@ spool_directory = DIR/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 bce937a10..32d3c6544 100644 --- a/test/confs/0445 +++ b/test/confs/0445 @@ -7,6 +7,7 @@ spool_directory = DIR/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 16969e7cd..8adfcc6b1 100644 --- a/test/confs/0446 +++ b/test/confs/0446 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ecdc5cd41..112978f88 100644 --- a/test/confs/0447 +++ b/test/confs/0447 @@ -9,6 +9,7 @@ spool_directory = DIR/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 b42ea187d..cccf16498 100644 --- a/test/confs/0448 +++ b/test/confs/0448 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1228f0914..2d8c2f51e 100644 --- a/test/confs/0449 +++ b/test/confs/0449 @@ -7,6 +7,7 @@ spool_directory = DIR/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 d55634a8f..409098d30 100644 --- a/test/confs/0450 +++ b/test/confs/0450 @@ -9,6 +9,7 @@ spool_directory = DIR/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 b95c74bcd..6ae4d3c5e 100644 --- a/test/confs/0451 +++ b/test/confs/0451 @@ -7,6 +7,7 @@ spool_directory = DIR/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 47efb163f..a8531320b 100644 --- a/test/confs/0452 +++ b/test/confs/0452 @@ -7,6 +7,7 @@ spool_directory = DIR/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 5ab9f79f2..e4294aeb2 100644 --- a/test/confs/0453 +++ b/test/confs/0453 @@ -9,6 +9,7 @@ spool_directory = DIR/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 c91ca1d36..bb4e8b79e 100644 --- a/test/confs/0454 +++ b/test/confs/0454 @@ -7,6 +7,7 @@ spool_directory = DIR/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 7b1849d70..d6688d932 100644 --- a/test/confs/0455 +++ b/test/confs/0455 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0456 b/test/confs/0456 index c6c8f7ddd..da9814360 100644 --- a/test/confs/0456 +++ b/test/confs/0456 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0457 b/test/confs/0457 index 4a8ea4a44..c3538607e 100644 --- a/test/confs/0457 +++ b/test/confs/0457 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0458 b/test/confs/0458 index 17ed2b546..bb6e4fcb3 100644 --- a/test/confs/0458 +++ b/test/confs/0458 @@ -7,6 +7,7 @@ spool_directory = DIR/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 86350d230..f16dc0b3c 100644 --- a/test/confs/0459 +++ b/test/confs/0459 @@ -7,6 +7,7 @@ spool_directory = DIR/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 505139b3c..aa53b9722 100644 --- a/test/confs/0460 +++ b/test/confs/0460 @@ -7,6 +7,7 @@ spool_directory = DIR/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 033082e89..c78c2a94a 100644 --- a/test/confs/0461 +++ b/test/confs/0461 @@ -12,6 +12,7 @@ spool_directory = DIR/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 87d0adc35..9e602a57f 100644 --- a/test/confs/0462 +++ b/test/confs/0462 @@ -9,6 +9,7 @@ spool_directory = DIR/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 8f3a31101..187ea46fe 100644 --- a/test/confs/0463 +++ b/test/confs/0463 @@ -7,6 +7,7 @@ spool_directory = DIR/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 49c9d612b..8a484ee8f 100644 --- a/test/confs/0464 +++ b/test/confs/0464 @@ -7,6 +7,7 @@ spool_directory = DIR/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 771b67af1..877e04487 100644 --- a/test/confs/0465 +++ b/test/confs/0465 @@ -9,6 +9,7 @@ spool_directory = DIR/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 1f9986f5f..8cd7d6036 100644 --- a/test/confs/0466 +++ b/test/confs/0466 @@ -7,6 +7,7 @@ spool_directory = DIR/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 14a69f7c6..3d031a65d 100644 --- a/test/confs/0467 +++ b/test/confs/0467 @@ -9,6 +9,7 @@ spool_directory = DIR/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 2ef647dc9..0baf45ba6 100644 --- a/test/confs/0468 +++ b/test/confs/0468 @@ -9,6 +9,7 @@ spool_directory = DIR/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 19a345ecc..51f5bdfcb 100644 --- a/test/confs/0469 +++ b/test/confs/0469 @@ -9,6 +9,7 @@ spool_directory = DIR/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 723041fee..aff710724 100644 --- a/test/confs/0470 +++ b/test/confs/0470 @@ -9,6 +9,7 @@ spool_directory = DIR/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 5fee8d5ff..bc6fd509f 100644 --- a/test/confs/0471 +++ b/test/confs/0471 @@ -7,6 +7,7 @@ spool_directory = DIR/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 872feb781..b27bc6d8f 100644 --- a/test/confs/0472 +++ b/test/confs/0472 @@ -9,6 +9,7 @@ spool_directory = DIR/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 ed48ce60c..e9ea69db6 100644 --- a/test/confs/0473 +++ b/test/confs/0473 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0474 b/test/confs/0474 index 05aec0f69..5a6ddc528 100644 --- a/test/confs/0474 +++ b/test/confs/0474 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0475 b/test/confs/0475 index 9ca486541..048c69118 100644 --- a/test/confs/0475 +++ b/test/confs/0475 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0476 b/test/confs/0476 index c8f76b8c8..084184aad 100644 --- a/test/confs/0476 +++ b/test/confs/0476 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0477 b/test/confs/0477 index ca40ec6be..650552bb3 100644 --- a/test/confs/0477 +++ b/test/confs/0477 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0478 b/test/confs/0478 index 4938573d7..f3e11de23 100644 --- a/test/confs/0478 +++ b/test/confs/0478 @@ -8,6 +8,7 @@ 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/0479 b/test/confs/0479 index 619496b1b..048edebd8 100644 --- a/test/confs/0479 +++ b/test/confs/0479 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0480 b/test/confs/0480 index b3a585fbb..0c0f2ca11 100644 --- a/test/confs/0480 +++ b/test/confs/0480 @@ -12,6 +12,7 @@ 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/0481 b/test/confs/0481 index b55af8604..de976c5b5 100644 --- a/test/confs/0481 +++ b/test/confs/0481 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -24,6 +25,7 @@ r2: driver = redirect headers_remove = Remove-Me-Also: headers_remove = Remove-Me: + headers_remove = <; Remove-Me-Too ; Remove-Me-Too2 data = $local_part@domain r3: diff --git a/test/confs/0482 b/test/confs/0482 index 0a09cec72..20b06d88b 100644 --- a/test/confs/0482 +++ b/test/confs/0482 @@ -7,6 +7,7 @@ spool_directory = DIR/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 2fc6139a5..530253b15 100644 --- a/test/confs/0483 +++ b/test/confs/0483 @@ -7,6 +7,7 @@ spool_directory = DIR/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 2248f9b3d..3837a20ff 100644 --- a/test/confs/0484 +++ b/test/confs/0484 @@ -7,6 +7,7 @@ spool_directory = DIR/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 cec0b6a3b..4b8a0dbb3 100644 --- a/test/confs/0485 +++ b/test/confs/0485 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ac1ec8671..7104bb7f5 100644 --- a/test/confs/0486 +++ b/test/confs/0486 @@ -7,6 +7,7 @@ spool_directory = DIR/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 066de1a97..8776d80f1 100644 --- a/test/confs/0487 +++ b/test/confs/0487 @@ -7,6 +7,7 @@ spool_directory = DIR/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 24815fc39..e687e95e9 100644 --- a/test/confs/0488 +++ b/test/confs/0488 @@ -9,6 +9,7 @@ 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 fe34078bb..7148b9cff 100644 --- a/test/confs/0489 +++ b/test/confs/0489 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a46b32c6e..0252d2dec 100644 --- a/test/confs/0490 +++ b/test/confs/0490 @@ -7,6 +7,7 @@ spool_directory = DIR/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 934379b54..8a0f0e819 100644 --- a/test/confs/0491 +++ b/test/confs/0491 @@ -10,6 +10,7 @@ spool_directory = DIR/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 b2c481178..0271d3b85 100644 --- a/test/confs/0492 +++ b/test/confs/0492 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e96cff519..314fe92a4 100644 --- a/test/confs/0493 +++ b/test/confs/0493 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ff56ff184..98a9c3109 100644 --- a/test/confs/0494 +++ b/test/confs/0494 @@ -7,6 +7,7 @@ spool_directory = DIR/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 6af8a6ac7..bb7c5e332 100644 --- a/test/confs/0495 +++ b/test/confs/0495 @@ -7,6 +7,7 @@ spool_directory = DIR/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 de16b1b5c..c30833d24 100644 --- a/test/confs/0496 +++ b/test/confs/0496 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1238e800f..af8fc81dd 100644 --- a/test/confs/0497 +++ b/test/confs/0497 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c859c64f8..f55a0ab75 100644 --- a/test/confs/0498 +++ b/test/confs/0498 @@ -7,6 +7,7 @@ spool_directory = DIR/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 bd1cbf5d3..ff6d2aaea 100644 --- a/test/confs/0499 +++ b/test/confs/0499 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a7305353b..f07b20893 100644 --- a/test/confs/0500 +++ b/test/confs/0500 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8a85c835d..5e18c7f73 100644 --- a/test/confs/0501 +++ b/test/confs/0501 @@ -7,6 +7,7 @@ spool_directory = DIR/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 aab2adaae..a6ff74c40 100644 --- a/test/confs/0502 +++ b/test/confs/0502 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -33,11 +34,17 @@ check_mail: warn set acl_c1 = ${eval:$acl_c1+1} accept +q_sub: + deny + check_quit: warn logwrite = Messages received: $acl_c1 logwrite = Messages accepted: $acl_c0 logwrite = Recipients: $acl_c2 logwrite = Accepted: $acl_c3 + + require !acl = q_sub + LAST check_rcpt: diff --git a/test/confs/0503 b/test/confs/0503 index c260e6f5d..6dccd559a 100644 --- a/test/confs/0503 +++ b/test/confs/0503 @@ -9,6 +9,7 @@ spool_directory = DIR/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 5030b55ba..86f599d95 100644 --- a/test/confs/0504 +++ b/test/confs/0504 @@ -7,6 +7,7 @@ spool_directory = DIR/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 4ccba335b..27ed59835 100644 --- a/test/confs/0505 +++ b/test/confs/0505 @@ -11,6 +11,7 @@ spool_directory = DIR/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 3ffb75d9e..22fdaa181 100644 --- a/test/confs/0506 +++ b/test/confs/0506 @@ -10,6 +10,7 @@ spool_directory = DIR/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 90e6bde3b..da500daf8 100644 --- a/test/confs/0507 +++ b/test/confs/0507 @@ -9,6 +9,7 @@ spool_directory = DIR/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 8cd546337..c81919e7e 100644 --- a/test/confs/0508 +++ b/test/confs/0508 @@ -7,6 +7,7 @@ spool_directory = DIR/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 b6978dddf..c45f52d68 100644 --- a/test/confs/0509 +++ b/test/confs/0509 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a519b9563..2a7ee7d6e 100644 --- a/test/confs/0510 +++ b/test/confs/0510 @@ -7,6 +7,7 @@ spool_directory = DIR/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 10018f62d..685b1955b 100644 --- a/test/confs/0511 +++ b/test/confs/0511 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a9d049c6b..202acb29f 100644 --- a/test/confs/0512 +++ b/test/confs/0512 @@ -9,6 +9,7 @@ spool_directory = DIR/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 11434516e..ea76f3447 100644 --- a/test/confs/0513 +++ b/test/confs/0513 @@ -9,6 +9,7 @@ spool_directory = DIR/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 50bbdea02..d52a76950 100644 --- a/test/confs/0514 +++ b/test/confs/0514 @@ -7,6 +7,7 @@ spool_directory = DIR/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 eb54ff335..ad262e774 100644 --- a/test/confs/0515 +++ b/test/confs/0515 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0c0a6ed30..2d5ea226a 100644 --- a/test/confs/0516 +++ b/test/confs/0516 @@ -7,6 +7,7 @@ spool_directory = DIR/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 5d1fed5aa..52663742a 100644 --- a/test/confs/0517 +++ b/test/confs/0517 @@ -9,6 +9,7 @@ spool_directory = DIR/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 5738eebd4..979f99adf 100644 --- a/test/confs/0518 +++ b/test/confs/0518 @@ -7,6 +7,7 @@ spool_directory = DIR/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 510c698bd..943c91818 100644 --- a/test/confs/0519 +++ b/test/confs/0519 @@ -7,6 +7,7 @@ spool_directory = DIR/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 2d8bb8f62..f850c7c2f 100644 --- a/test/confs/0520 +++ b/test/confs/0520 @@ -7,6 +7,7 @@ spool_directory = DIR/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 15555d8b1..fb47004fd 100644 --- a/test/confs/0521 +++ b/test/confs/0521 @@ -7,6 +7,7 @@ spool_directory = DIR/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 65fcdbfe2..77f60c86a 100644 --- a/test/confs/0522 +++ b/test/confs/0522 @@ -9,6 +9,7 @@ spool_directory = DIR/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 77a507867..c3d9e6dc5 100644 --- a/test/confs/0523 +++ b/test/confs/0523 @@ -7,6 +7,7 @@ spool_directory = DIR/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 76f0f0ad6..0d73654b2 100644 --- a/test/confs/0524 +++ b/test/confs/0524 @@ -7,6 +7,7 @@ spool_directory = DIR/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 bab0c6620..04a0211f4 100644 --- a/test/confs/0525 +++ b/test/confs/0525 @@ -7,6 +7,7 @@ spool_directory = DIR/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 58f2f1a18..e4fabf60c 100644 --- a/test/confs/0526 +++ b/test/confs/0526 @@ -7,6 +7,7 @@ spool_directory = DIR/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 11c98b9e8..57d51952e 100644 --- a/test/confs/0527 +++ b/test/confs/0527 @@ -7,6 +7,7 @@ spool_directory = DIR/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 32176400a..a8de7aec8 100644 --- a/test/confs/0528 +++ b/test/confs/0528 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e87c8afd4..282047f9f 100644 --- a/test/confs/0529 +++ b/test/confs/0529 @@ -7,6 +7,7 @@ spool_directory = DIR/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 fa2a2fdf9..c919cb658 100644 --- a/test/confs/0530 +++ b/test/confs/0530 @@ -7,6 +7,7 @@ spool_directory = DIR/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 192e3edaf..a66723188 100644 --- a/test/confs/0531 +++ b/test/confs/0531 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a00bb6b4c..4d45c2fd3 100644 --- a/test/confs/0532 +++ b/test/confs/0532 @@ -9,6 +9,7 @@ spool_directory = DIR/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 78e343505..b0a3347b6 100644 --- a/test/confs/0533 +++ b/test/confs/0533 @@ -7,6 +7,7 @@ spool_directory = DIR/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 259e005da..d2bc84a76 100644 --- a/test/confs/0534 +++ b/test/confs/0534 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1e8f63d85..58cb1c425 100644 --- a/test/confs/0535 +++ b/test/confs/0535 @@ -7,6 +7,7 @@ spool_directory = DIR/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 9d4a8ae72..0582f6fb1 100644 --- a/test/confs/0536 +++ b/test/confs/0536 @@ -9,6 +9,7 @@ spool_directory = DIR/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 8609b1e26..7a2ac9276 100644 --- a/test/confs/0537 +++ b/test/confs/0537 @@ -10,6 +10,7 @@ log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME log_selector = +smtp_mailauth +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0538 b/test/confs/0538 index 65ec0fc32..6fbeeb23a 100644 --- a/test/confs/0538 +++ b/test/confs/0538 @@ -7,6 +7,7 @@ spool_directory = DIR/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 6df895759..e70a452f1 100644 --- a/test/confs/0539 +++ b/test/confs/0539 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ce469a96c..b5e183638 100644 --- a/test/confs/0540 +++ b/test/confs/0540 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e5885f41c..d1b8f601b 100644 --- a/test/confs/0541 +++ b/test/confs/0541 @@ -7,6 +7,7 @@ spool_directory = DIR/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 f9f2f10f8..1f22fe0d5 100644 --- a/test/confs/0542 +++ b/test/confs/0542 @@ -7,6 +7,7 @@ spool_directory = DIR/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 25387f89e..dcfcd303a 100644 --- a/test/confs/0543 +++ b/test/confs/0543 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0544 b/test/confs/0544 index 23a5f36b2..b5c9d73cf 100644 --- a/test/confs/0544 +++ b/test/confs/0544 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0545 b/test/confs/0545 index 8cbbf8b45..86501e32c 100644 --- a/test/confs/0545 +++ b/test/confs/0545 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0546 b/test/confs/0546 index 7d09866c2..7de92304c 100644 --- a/test/confs/0546 +++ b/test/confs/0546 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0547 b/test/confs/0547 index 70519e667..e8e8eedd4 100644 --- a/test/confs/0547 +++ b/test/confs/0547 @@ -9,6 +9,7 @@ spool_directory = DIR/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 4cd36d918..faa1ffad3 100644 --- a/test/confs/0548 +++ b/test/confs/0548 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -54,7 +55,7 @@ smtp: begin retry -thishost.test.ex * F,15s,1s +thishost.test.ex * F,20s,2s * * F,1s,1s; F,1s,5s # End diff --git a/test/confs/0549 b/test/confs/0549 index 29df1260c..fd07a54ed 100644 --- a/test/confs/0549 +++ b/test/confs/0549 @@ -7,6 +7,7 @@ spool_directory = DIR/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 088bb1535..f35ca9f67 100644 --- a/test/confs/0550 +++ b/test/confs/0550 @@ -7,6 +7,7 @@ spool_directory = DIR/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 d47bf4d17..102f4ceeb 100644 --- a/test/confs/0551 +++ b/test/confs/0551 @@ -9,6 +9,7 @@ spool_directory = DIR/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 bc8b5ae45..9653e807e 100644 --- a/test/confs/0552 +++ b/test/confs/0552 @@ -10,6 +10,7 @@ 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 f7345484a..36c5c8748 100644 --- a/test/confs/0553 +++ b/test/confs/0553 @@ -10,6 +10,7 @@ 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 2edb0ff6c..fc7c986a6 100644 --- a/test/confs/0554 +++ b/test/confs/0554 @@ -7,6 +7,7 @@ spool_directory = DIR/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 64e169dea..2dbfa9da1 100644 --- a/test/confs/0555 +++ b/test/confs/0555 @@ -9,6 +9,7 @@ spool_directory = DIR/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 2708b01fd..81fc19593 100644 --- a/test/confs/0556 +++ b/test/confs/0556 @@ -12,6 +12,7 @@ spool_directory = DIR/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 6bfb069d3..3c5d55197 100644 --- a/test/confs/0557 +++ b/test/confs/0557 @@ -12,6 +12,7 @@ spool_directory = DIR/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 3cdb17fc7..13159ad37 100644 --- a/test/confs/0558 +++ b/test/confs/0558 @@ -7,6 +7,7 @@ spool_directory = DIR/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 db1d8b212..e97c8bb41 100644 --- a/test/confs/0559 +++ b/test/confs/0559 @@ -7,6 +7,7 @@ spool_directory = DIR/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 68bf16b64..edea9c30b 100644 --- a/test/confs/0560 +++ b/test/confs/0560 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c8ca8a72f..c36031cf8 100644 --- a/test/confs/0561 +++ b/test/confs/0561 @@ -9,6 +9,7 @@ spool_directory = DIR/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 ed0ae2b48..3b478c1c9 100644 --- a/test/confs/0562 +++ b/test/confs/0562 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0563 b/test/confs/0563 index 320fb8b98..62249b8ca 100644 --- a/test/confs/0563 +++ b/test/confs/0563 @@ -1,5 +1,6 @@ # Exim test configuration 0563 +tls_advertise_hosts = qualify_domain = testexim.test.ex localpartlist aliases = joe:sam:tom diff --git a/test/confs/0564 b/test/confs/0564 index 443d28500..d9530e69a 100644 --- a/test/confs/0564 +++ b/test/confs/0564 @@ -6,6 +6,7 @@ spool_directory = DIR/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 979cfc787..397536342 100644 --- a/test/confs/0565 +++ b/test/confs/0565 @@ -7,6 +7,7 @@ spool_directory = DIR/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 98df1bf7f..e4433f8f8 100644 --- a/test/confs/0566 +++ b/test/confs/0566 @@ -8,6 +8,7 @@ log_file_path = DIR/spool/log/%slog log_selector = +8bitmime gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0567 b/test/confs/0567 index 5eae157f8..e6850b8bd 100644 --- a/test/confs/0567 +++ b/test/confs/0567 @@ -9,6 +9,7 @@ spool_directory = DIR/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 517c38535..e6ab3f692 100644 --- a/test/confs/0569 +++ b/test/confs/0569 @@ -7,6 +7,7 @@ spool_directory = DIR/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 6cf080737..eb7218138 100644 --- a/test/confs/0570 +++ b/test/confs/0570 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0571 b/test/confs/0571 new file mode 100644 index 000000000..64383cdd8 --- /dev/null +++ b/test/confs/0571 @@ -0,0 +1,78 @@ +# Exim test configuration 0571 + +LOG_SELECTOR= + +exim_path = EXIM_PATH +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 ----- + +disable_ipv6 = true + +addresslist ok_senders = ok@ok.ok + +domainlist local_domains = test.ex : *.test.ex + +qualify_domain = test.ex +trusted_users = CALLER + +# Use first three components of from_domain to select ACL +acl_not_smtp = ${if def:sender_address \ + {acl_${sg{${tr{$sender_address_domain}{.}{_}}}{^(.*)_.*\$}{\$1}}} \ + {accept control=queue_only}} + +# ----- ACLs ----- + +begin acl + +acl_29_29_29: + deny dnslists = test.ex/$sender_address_domain + accept + +acl_29_29_0: + deny dnslists = test.ex + accept + +# ----- Transports ----- + +begin transports + +t1: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER + +t2: + driver = appendfile + file = DIR/test-mail/okbatch + user = CALLER + batch_max = 100 + envelope_to_add + +# ----- Routers ----- + +begin routers + +r0: + driver = accept + local_parts = ^ok + transport = t2 + +r1: + driver = accept + local_parts = ^userx : ^cond- + transport = t1 + +r2: + driver = redirect + local_parts = fail + allow_fail + data = :fail: here is a fail message + +# End diff --git a/test/confs/0572 b/test/confs/0572 new file mode 120000 index 000000000..4af051ca9 --- /dev/null +++ b/test/confs/0572 @@ -0,0 +1 @@ +4020
\ No newline at end of file diff --git a/test/confs/0600 b/test/confs/0600 index d8ff26a6f..671925956 100644 --- a/test/confs/0600 +++ b/test/confs/0600 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0601 b/test/confs/0601 index c55ac4a1b..abcaf1c58 100644 --- a/test/confs/0601 +++ b/test/confs/0601 @@ -4,6 +4,7 @@ exim_path = EXIM_PATH spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog +tls_advertise_hosts = queue_only # ----- Main settings ----- diff --git a/test/confs/0602 b/test/confs/0602 index 048175d5e..92ab4669c 100644 --- a/test/confs/0602 +++ b/test/confs/0602 @@ -5,6 +5,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/0603 b/test/confs/0603 new file mode 100644 index 000000000..76bd41c55 --- /dev/null +++ b/test/confs/0603 @@ -0,0 +1,61 @@ +# Exim test configuration 0603 +# Add several messages going to the same location +# And change smtp output based on senders domain + +hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff +untrusted_set_sender = * + +SERVER = + +exim_path = EXIM_PATH +host_lookup_order = bydns +#primary_hostname = myhost.test.ex +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 ----- + +acl_smtp_rcpt = accept + +queue_only +queue_run_in_order + +# ----- Routers ----- + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + transport = send_to_server + +server: + driver = accept + transport = send_to_server + + +# ----- Transports ----- + +begin transports + +send_to_server: + driver = smtp + connection_max_messages = 0 + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{127.0.0.2}} + +# ----- Retry ----- + +begin retry + +* * F,5d,10s + +# End + diff --git a/test/confs/0604 b/test/confs/0604 new file mode 100644 index 000000000..6dcfba358 --- /dev/null +++ b/test/confs/0604 @@ -0,0 +1,60 @@ +# Exim test configuration 0604 +# Send many messages in hopes of tripping continuation records code + +hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff +untrusted_set_sender = * + +SERVER = + +exim_path = EXIM_PATH +host_lookup_order = bydns +#primary_hostname = myhost.test.ex +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 ----- + +acl_smtp_rcpt = accept + +queue_only +queue_run_in_order + +# ----- Routers ----- + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + transport = send_to_server + +server: + driver = accept + transport = send_to_server + + +# ----- Transports ----- + +begin transports + +send_to_server: + driver = smtp + connection_max_messages = 0 + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{127.0.0.2}} + +# ----- Retry ----- + +begin retry + +* * F,5d,10s + +# End + diff --git a/test/confs/0605 b/test/confs/0605 new file mode 100644 index 000000000..44ccb63c7 --- /dev/null +++ b/test/confs/0605 @@ -0,0 +1,20 @@ +# Exim test configuration 0605 + +exim_path = EXIM_PATH +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 = + +# ----- Main settings ----- + +disable_ipv6 = true + +acl_smtp_rcpt = accept hosts = test.again.dns + +queue_only + +# End + diff --git a/test/confs/0606 b/test/confs/0606 new file mode 100644 index 000000000..bb94edb29 --- /dev/null +++ b/test/confs/0606 @@ -0,0 +1,25 @@ +# Exim test configuration 0606 + +exim_path = EXIM_PATH +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 = + +slow_lookup_log = 1000 + +acl_smtp_rcpt = accept verify = recipient + +queue_only + +begin routers + +all: + driver = dnslookup + verify_only + self = send + +# End + diff --git a/test/confs/0607 b/test/confs/0607 new file mode 100644 index 000000000..932ae4c67 --- /dev/null +++ b/test/confs/0607 @@ -0,0 +1,42 @@ +# Exim test configuration 0607 + +SERVER = + +exim_path = EXIM_PATH +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 = + +log_selector = +received_recipients +sender_on_delivery + +acl_smtp_rcpt = accept +queue_only +queue_run_in_order + +#--------------- + +begin routers + +dump: + driver = redirect + condition = ${if eq {SERVER}{server}{yes}{no}} + data = :blackhole: + +all: + driver = dnslookup + self = send + transport = out + +#--------------- + +begin transports + +out: + driver = smtp + port = PORT_D + +# End + diff --git a/test/confs/0608 b/test/confs/0608 new file mode 100644 index 000000000..b88f32e12 --- /dev/null +++ b/test/confs/0608 @@ -0,0 +1,25 @@ +# Exim test configuration 0608 + +exim_path = EXIM_PATH +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 ----- + +acl_smtp_helo = check_helo + + +# ----- ACLs ----- + +begin acl + +check_helo: + require verify = helo + accept logwrite = helo $sender_helo_name dnssec <$sender_helo_dnssec> + +# End diff --git a/test/confs/0609 b/test/confs/0609 new file mode 100644 index 000000000..2b2f25d2b --- /dev/null +++ b/test/confs/0609 @@ -0,0 +1,48 @@ +# Exim test configuration 0609 +# Long ACL delays + +SERVER= + +exim_path = EXIM_PATH +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 +tls_advertise_hosts = + +# ----- Main settings ----- + +disable_ipv6 = true + +acl_smtp_rcpt = delay4_accept +log_selector = +smtp_connection +#hosts_connection_nolog = : 127.0.0.1 + + +# ----- ACLs ----- + +begin acl + +delay4_accept: + accept delay = 4s + +# ----- Routers ----- + +begin routers + +accept: + driver = accept + transport = appendfile + +# ----- Transports ----- + +begin transports + +appendfile: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER + +# End diff --git a/test/confs/0610 b/test/confs/0610 new file mode 100644 index 000000000..a68b4ebee --- /dev/null +++ b/test/confs/0610 @@ -0,0 +1,66 @@ +# Exim test configuration 0610 + +SERVER = + +exim_path = EXIM_PATH +host_lookup_order = bydns +#primary_hostname = myhost.test.ex +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 ----- + +acl_smtp_connect = conn_chk +acl_smtp_rcpt = accept + +untrusted_set_sender = * +queue_only +queue_run_in_order + +# ----- ACL ----- + +begin acl + +conn_chk: + defer condition = ${if eq {SERVER}{server}} + accept + +# ----- Routers ----- + +begin routers + +client: + driver = accept + transport = $sender_address_local_part + +# ----- Transports ----- + +begin transports + +t1: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + interface = 127.0.0.1 + +t2: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + interface = 127.0.0.2 + +# ----- Retry ----- + +begin retry + +* * F,5d,10s + +# End + diff --git a/test/confs/0611 b/test/confs/0611 new file mode 100644 index 000000000..b52639198 --- /dev/null +++ b/test/confs/0611 @@ -0,0 +1,70 @@ +# Exim test configuration 0611 +# max_parallel on transport + +SERVER= + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +spool_directory = DIR/spool +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = + +# ----- Main settings ----- + +log_file_path = DIR/spool/log/${if eq {SERVER}{server} {server_}{}}%slog + +qualify_domain = test.ex +queue_run_in_order +log_selector = +received_recipients + +acl_smtp_rcpt = accept ${if eq {SERVER}{server} {delay = 2s}} + +# ----- Routers ----- + +begin routers + +server: + condition = ${if eq {SERVER}{server} {yes}{no}} + driver = redirect + data = :blackhole: + +rmt_client: + local_parts = a:b:c + driver = manualroute + route_list = * 127.0.0.1 + self = send + transport = smtp + +lcl_client: + local_parts = x:y:z + driver = accept + transport = pipe + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + port = PORT_D + max_rcpt = 1 + connection_max_messages = 1 + max_parallel = 2 + +pipe: + driver = pipe + command = "sleep 2; cat > /dev/null" + use_shell = true + max_parallel = 1 + +# ----- Retry ----- + + +begin retry + +* * F,1h,10m + + +# End diff --git a/test/confs/0612 b/test/confs/0612 new file mode 100644 index 000000000..3439ecb84 --- /dev/null +++ b/test/confs/0612 @@ -0,0 +1,45 @@ +# Exim test configuration 0612 +# log_defer_output on pipe transport + +exim_path = EXIM_PATH +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 ----- + +log_selector = +received_recipients + +#acl_smtp_rcpt = accept + +# ----- Routers ----- + +begin routers + +client: + driver = accept + transport = pipe + +# ----- Transports ----- + +begin transports + +pipe: + driver = pipe + temp_errors = * + command = perl -e "print 'Hi from pipe'; exit 5;" + log_defer_output = true + +# ----- Retry ----- + + +begin retry + +* * F,1h,10m + + +# End diff --git a/test/confs/0613 b/test/confs/0613 new file mode 100644 index 000000000..a5ec4f856 --- /dev/null +++ b/test/confs/0613 @@ -0,0 +1,36 @@ +# Exim test configuration 0613 +# manualroute, hosts_randomize and multiple recipients + +exim_path = EXIM_PATH +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 ----- + +mua_wrapper = true +log_selector = +received_recipients + +# ----- Routers ----- + +begin routers + +smarthost: + driver = manualroute + hosts_randomize = true + route_list = * "</ ten-2.test.ex:15600 / ten-3.test.ex:15600" + transport = remote_smtp + no_more + +# ----- Transports ----- + +begin transports + +remote_smtp: + driver = smtp + +# End diff --git a/test/confs/0614 b/test/confs/0614 new file mode 100644 index 000000000..2b2361747 --- /dev/null +++ b/test/confs/0614 @@ -0,0 +1,20 @@ +# Exim test configuration 0614 +# hosts_connection_nolog versus sender_host lists caching + +exim_path = EXIM_PATH +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 ----- + +log_selector = +smtp_connection +hostlist nolog = 127.0.0.1 +hosts_connection_nolog = +nolog +queue_only + +# End diff --git a/test/confs/1000 b/test/confs/1000 index 9e7b57ba6..b05acde77 100644 --- a/test/confs/1000 +++ b/test/confs/1000 @@ -9,6 +9,7 @@ spool_directory = DIR/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 aa53c717b..49d367d7b 100644 --- a/test/confs/1001 +++ b/test/confs/1001 @@ -9,6 +9,7 @@ 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 99a5866d9..8210a10f3 100644 --- a/test/confs/1002 +++ b/test/confs/1002 @@ -7,6 +7,7 @@ spool_directory = DIR/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 9597b3f26..386ebb30c 100644 --- a/test/confs/1003 +++ b/test/confs/1003 @@ -9,6 +9,7 @@ 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 001cd83e1..d19571b82 100644 --- a/test/confs/1005 +++ b/test/confs/1005 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/1006 b/test/confs/1006 index c45c3b308..e053d1b09 100644 --- a/test/confs/1006 +++ b/test/confs/1006 @@ -10,6 +10,7 @@ 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 bd4f6e950..2bcd150a9 100644 --- a/test/confs/1007 +++ b/test/confs/1007 @@ -11,6 +11,7 @@ spool_directory = DIR/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 11fd0be57..cc76315ef 100644 --- a/test/confs/1008 +++ b/test/confs/1008 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/1009 b/test/confs/1009 index 1bbbdd355..99b78d9c1 100644 --- a/test/confs/1009 +++ b/test/confs/1009 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/1010 b/test/confs/1010 index ed19a0e21..fde1f7539 100644 --- a/test/confs/1010 +++ b/test/confs/1010 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/2002 b/test/confs/2002 index b154c82d3..7299122e8 100644 --- a/test/confs/2002 +++ b/test/confs/2002 @@ -40,7 +40,8 @@ check_recipient: DES-CBC3-SHA : \ DHE_RSA_AES_256_CBC_SHA1 : \ DHE_RSA_3DES_EDE_CBC_SHA : \ - RSA_AES_256_CBC_SHA1 + RSA_AES_256_CBC_SHA1 : \ + ECDHE_RSA_AES_256_GCM_SHA384 warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} diff --git a/test/confs/2010 b/test/confs/2010 index 8aede594a..34383c25a 100644 --- a/test/confs/2010 +++ b/test/confs/2010 @@ -14,6 +14,8 @@ gecos_name = CALLER_NAME # ----- Main settings ----- +log_selector = +outgoing_port + acl_smtp_rcpt = accept queue_only diff --git a/test/confs/2016 b/test/confs/2016 index f58c9af58..ef6e14463 100644 --- a/test/confs/2016 +++ b/test/confs/2016 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/2019 b/test/confs/2019 index f3ddd4591..798eb73d7 100644 --- a/test/confs/2019 +++ b/test/confs/2019 @@ -39,7 +39,8 @@ check_recipient: DES-CBC3-SHA:\ DHE_RSA_AES_256_CBC_SHA1:\ DHE_RSA_3DES_EDE_CBC_SHA:\ - RSA_AES_256_CBC_SHA1 + RSA_AES_256_CBC_SHA1 :\ + ECDHE_RSA_AES_256_GCM_SHA384 accept diff --git a/test/confs/2021 b/test/confs/2021 index a441e34a3..97b98d6ad 100644 --- a/test/confs/2021 +++ b/test/confs/2021 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/2023 b/test/confs/2023 index 2b5efb5d6..849840404 100644 --- a/test/confs/2023 +++ b/test/confs/2023 @@ -14,6 +14,7 @@ acl_smtp_starttls = starttls qualify_domain = test.ex tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 trusted_users = CALLER diff --git a/test/confs/5440 b/test/confs/2033 index 479038ad6..9ed671172 100644 --- a/test/confs/5440 +++ b/test/confs/2033 @@ -1,4 +1,4 @@ -# Exim test configuration 5440 +# Exim test configuration 2033 # TLS client: verify certificate from server - name-fails SERVER= @@ -23,6 +23,8 @@ KEY2 = FX/cert2 # ----- Main settings ----- +disable_ipv6 = true + acl_smtp_rcpt = accept log_selector = +tls_peerdn+tls_certificate_verified diff --git a/test/confs/2102 b/test/confs/2102 index 38441e9d6..804a846bf 100644 --- a/test/confs/2102 +++ b/test/confs/2102 @@ -42,7 +42,9 @@ check_recipient: DHE-RSA-AES256-SHA : \ DHE-RSA-AES256-GCM-SHA384 : \ DHE_RSA_AES_256_CBC_SHA1 : \ - DHE_RSA_3DES_EDE_CBC_SHA + DHE_RSA_3DES_EDE_CBC_SHA : \ + ECDHE-RSA-AES256-GCM-SHA384 : \ + ECDHE-RSA-AES128-GCM-SHA256 warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} diff --git a/test/confs/2110 b/test/confs/2110 index 2bd3ed656..db6864863 100644 --- a/test/confs/2110 +++ b/test/confs/2110 @@ -13,6 +13,8 @@ gecos_name = CALLER_NAME # ----- Main settings ----- +log_selector = +outgoing_port + acl_smtp_rcpt = accept queue_only diff --git a/test/confs/2112 b/test/confs/2112 index cbd0babc6..18b2fd780 100644 --- a/test/confs/2112 +++ b/test/confs/2112 @@ -25,7 +25,7 @@ KEY2 = FX/cert2 acl_smtp_rcpt = accept -log_selector = +tls_peerdn+tls_certificate_verified +log_selector = +tls_peerdn+tls_certificate_verified +received_recipients queue_only queue_run_in_order @@ -148,8 +148,8 @@ send_to_server_req_fail: tls_verify_hosts = * tls_verify_cert_hostnames = - # this will fail to verify the cert name and fallback to unencrypted - send_to_server_req_failname: +# this will fail to verify the cert name and fallback to unencrypted +send_to_server_req_failname: driver = smtp allow_localhost hosts = HOSTIPV4 @@ -161,8 +161,8 @@ send_to_server_req_fail: tls_verify_cert_hostnames = server1.example.net : server1.example.org tls_verify_hosts = * - # this will pass the cert verify including name check - send_to_server_req_passname: +# this will pass the cert verify including name check +send_to_server_req_passname: driver = smtp allow_localhost hosts = HOSTIPV4 diff --git a/test/confs/2114 b/test/confs/2114 index d652c0633..a2b1c526f 100644 --- a/test/confs/2114 +++ b/test/confs/2114 @@ -35,7 +35,7 @@ tls_crl = CRL begin acl check_recipient: - deny message = certificate not verified: peerdn=$tls_peerdn + deny message = certificate not verified: peerdn=$tls_in_peerdn ! verify = certificate accept @@ -57,7 +57,7 @@ begin transports local_delivery: driver = appendfile file = DIR/test-mail/$local_part - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn user = CALLER # End diff --git a/test/confs/2116 b/test/confs/2116 index f5a9509e2..fbfb6dc56 100644 --- a/test/confs/2116 +++ b/test/confs/2116 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/2119 b/test/confs/2119 index de1cd2e22..7d382d9ac 100644 --- a/test/confs/2119 +++ b/test/confs/2119 @@ -41,7 +41,9 @@ check_recipient: DHE-RSA-AES256-SHA:\ DHE-RSA-AES256-GCM-SHA384:\ DHE_RSA_AES_256_CBC_SHA1:\ - DHE_RSA_3DES_EDE_CBC_SHA + DHE_RSA_3DES_EDE_CBC_SHA:\ + ECDHE-RSA-AES256-GCM-SHA384:\ + ECDHE-RSA-AES128-GCM-SHA256 accept diff --git a/test/confs/2121 b/test/confs/2121 index a80e8efbb..c9a28c987 100644 --- a/test/confs/2121 +++ b/test/confs/2121 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/2123 b/test/confs/2123 index 507159c68..6170caaa8 100644 --- a/test/confs/2123 +++ b/test/confs/2123 @@ -14,6 +14,7 @@ acl_smtp_starttls = starttls qualify_domain = test.ex tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 trusted_users = CALLER diff --git a/test/confs/2131 b/test/confs/2131 index 0e82319fb..3d83099d1 100644 --- a/test/confs/2131 +++ b/test/confs/2131 @@ -17,7 +17,7 @@ gecos_name = CALLER_NAME domainlist local_domains = test.ex : *.test.ex acl_smtp_rcpt = acl_log_sni -log_selector = +tls_peerdn +tls_sni +log_selector = +tls_peerdn +tls_sni +received_recipients remote_max_parallel = 1 tls_advertise_hosts = * diff --git a/test/confs/2132 b/test/confs/2132 index 2b06d6c4a..11dc3ce21 100644 --- a/test/confs/2132 +++ b/test/confs/2132 @@ -41,7 +41,9 @@ check_recipient: DHE-RSA-AES256-SHA : \ DHE-RSA-AES256-GCM-SHA384 : \ DHE_RSA_AES_256_CBC_SHA1 : \ - DHE_RSA_3DES_EDE_CBC_SHA + DHE_RSA_3DES_EDE_CBC_SHA : \ + ECDHE-RSA-AES256-GCM-SHA384 : \ + ECDHE-RSA-AES128-GCM-SHA256 warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} diff --git a/test/confs/5450 b/test/confs/2133 index 145bdc84e..064a97acf 100644 --- a/test/confs/5450 +++ b/test/confs/2133 @@ -1,4 +1,4 @@ -# Exim test configuration 5450 +# Exim test configuration 2133 # TLS client: verify certificate from server - name-fails SERVER= @@ -23,6 +23,8 @@ KEY2 = FX/cert2 # ----- Main settings ----- +disable_ipv6 = true + acl_smtp_rcpt = accept log_selector = +tls_peerdn+tls_certificate_verified diff --git a/test/confs/2200 b/test/confs/2200 index 3bef13363..c57c8c796 100644 --- a/test/confs/2200 +++ b/test/confs/2200 @@ -1,4 +1,5 @@ # Exim test configuration 2200 +# Check for dnsdb cache TTL handling exim_path = EXIM_PATH host_lookup_order = bydns @@ -7,5 +8,22 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = + +# ----- Main settings ----- + +acl_not_smtp = check_rcpt +queue_only + +begin acl + +check_rcpt: + warn + set acl_m1 = ${map {<,$recipients} \ + {${lookup dnsdb{a=${domain:$item}}{$value}fail}}} + delay = 4s + set acl_m1 = ${map {<,$recipients} \ + {${lookup dnsdb{a=${domain:$item}}{$value}fail}}} + accept # End diff --git a/test/confs/2201 b/test/confs/2201 index ae17b7cb4..b60439e29 100644 --- a/test/confs/2201 +++ b/test/confs/2201 @@ -7,16 +7,50 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- trusted_users = CALLER +disable_ipv6 + +acl_smtp_rcpt = check_rcpt +acl_not_smtp = check_sndr +queue_only + +# - ACL -- +begin acl + +check_rcpt: + # Do not care about result, looking at debug output + # expect an original lookup, a cached lookup avoidance + # then a TTL-required repeat lookup + warn dnslists = rbl.test.ex/V4NET.11.12.14 + dnslists = rbl.test.ex/V4NET.11.12.14 + delay = 4s + dnslists = rbl.test.ex/V4NET.11.12.14 + accept + +check_sndr: + # Do not care about result, looking at debug output + # expect an original lookup, a cached lookup avoidance + # then a TTL-required repeat lookup + warn sender_domains = dnsdb;a=$sender_address_domain + sender_domains = dnsdb;a=$sender_address_domain + delay = 4s + sender_domains = dnsdb;a=$sender_address_domain + accept # ----- Routers ----- begin routers +r0: + driver = accept + senders = a@shorthost.test.ex + transport = remote_delivery + r1: driver = accept domains = dnsdb;$domain @@ -41,6 +75,11 @@ local_delivery: file = DIR/test-mail/$local_part user = CALLER +remote_delivery: + driver = smtp + hosts = 127.0.0.1 + allow_localhost + port = PORT_D # ----- Retry ----- diff --git a/test/confs/2202 b/test/confs/2202 index 7380fb012..e2cf9d421 100644 --- a/test/confs/2202 +++ b/test/confs/2202 @@ -9,6 +9,7 @@ spool_directory = DIR/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 8edb4ae88..96513bd23 100644 --- a/test/confs/2250 +++ b/test/confs/2250 @@ -7,5 +7,6 @@ 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 dbfcc40ee..d8bc1b26f 100644 --- a/test/confs/2300 +++ b/test/confs/2300 @@ -7,6 +7,7 @@ spool_directory = DIR/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 649688ff7..69ef73c6b 100644 --- a/test/confs/2400 +++ b/test/confs/2400 @@ -7,6 +7,7 @@ spool_directory = DIR/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 73f82edd2..1eabf09e4 100644 --- a/test/confs/2500 +++ b/test/confs/2500 @@ -7,6 +7,7 @@ spool_directory = DIR/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 11fc6acc7..655a3712d 100644 --- a/test/confs/2501 +++ b/test/confs/2501 @@ -7,6 +7,7 @@ spool_directory = DIR/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 11567569a..c84d54fec 100644 --- a/test/confs/2600 +++ b/test/confs/2600 @@ -7,6 +7,7 @@ spool_directory = DIR/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 new file mode 100644 index 000000000..bb001681d --- /dev/null +++ b/test/confs/2700 @@ -0,0 +1,16 @@ +# Exim test configuration 2700 + +exim_path = EXIM_PATH +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 +tls_advertise_hosts = + +# ----- Main settings ----- + +redis_servers = 127.0.0.1// + +# End diff --git a/test/confs/3000 b/test/confs/3000 index 42e19cbe5..80c6019a1 100644 --- a/test/confs/3000 +++ b/test/confs/3000 @@ -8,6 +8,7 @@ spool_directory = DIR/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 4b319e091..3eb114882 100644 --- a/test/confs/3100 +++ b/test/confs/3100 @@ -8,6 +8,7 @@ spool_directory = DIR/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 e86c6f90e..105676976 100644 --- a/test/confs/3200 +++ b/test/confs/3200 @@ -7,6 +7,7 @@ spool_directory = DIR/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 53b274b90..478102c38 100644 --- a/test/confs/3201 +++ b/test/confs/3201 @@ -7,6 +7,7 @@ spool_directory = DIR/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 ef4967e5e..b24085c8c 100644 --- a/test/confs/3202 +++ b/test/confs/3202 @@ -7,6 +7,7 @@ spool_directory = DIR/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 79ace9ea3..affd4078d 100644 --- a/test/confs/3203 +++ b/test/confs/3203 @@ -7,6 +7,7 @@ spool_directory = DIR/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 58ca672ca..c1574aeb4 100644 --- a/test/confs/3204 +++ b/test/confs/3204 @@ -7,6 +7,7 @@ spool_directory = DIR/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 d2f7ae5c9..c53bca0fd 100644 --- a/test/confs/3205 +++ b/test/confs/3205 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a0b4793db..670777b4a 100644 --- a/test/confs/3206 +++ b/test/confs/3206 @@ -8,6 +8,7 @@ spool_directory = DIR/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 5229e514f..ba7446d28 100644 --- a/test/confs/3207 +++ b/test/confs/3207 @@ -8,6 +8,7 @@ spool_directory = DIR/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 6bba1ed12..015215d8e 100644 --- a/test/confs/3208 +++ b/test/confs/3208 @@ -8,6 +8,7 @@ spool_directory = DIR/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 77db04192..d78fcf3c8 100644 --- a/test/confs/3209 +++ b/test/confs/3209 @@ -8,6 +8,7 @@ spool_directory = DIR/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 ba9f3aa07..ffd6a1fbb 100644 --- a/test/confs/3210 +++ b/test/confs/3210 @@ -7,6 +7,7 @@ spool_directory = DIR/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 161e869e7..063cebc45 100644 --- a/test/confs/3211 +++ b/test/confs/3211 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e9d0bd60c..35bf4d38b 100644 --- a/test/confs/3212 +++ b/test/confs/3212 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1237d295f..5d658e71e 100644 --- a/test/confs/3213 +++ b/test/confs/3213 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8b1764650..2dbf0b67f 100644 --- a/test/confs/3300 +++ b/test/confs/3300 @@ -7,6 +7,7 @@ spool_directory = DIR/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 7ec7fc3be..cf896819f 100644 --- a/test/confs/3400 +++ b/test/confs/3400 @@ -7,6 +7,7 @@ spool_directory = DIR/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 09b09edba..058e3f554 100644 --- a/test/confs/3401 +++ b/test/confs/3401 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = log_selector = +smtp_mailauth # ----- Main settings ----- diff --git a/test/confs/3402 b/test/confs/3402 index 299603537..0f35779f0 100644 --- a/test/confs/3402 +++ b/test/confs/3402 @@ -7,6 +7,7 @@ spool_directory = DIR/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 2f12a56f3..47827809f 100644 --- a/test/confs/3403 +++ b/test/confs/3403 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c804d9386..2a235ed95 100644 --- a/test/confs/3404 +++ b/test/confs/3404 @@ -7,6 +7,7 @@ spool_directory = DIR/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 6b9718054..90576fc5e 100644 --- a/test/confs/3405 +++ b/test/confs/3405 @@ -7,6 +7,7 @@ spool_directory = DIR/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 115133123..b2515ee56 100644 --- a/test/confs/3406 +++ b/test/confs/3406 @@ -7,6 +7,7 @@ spool_directory = DIR/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 443376e6a..8d8b50b89 100644 --- a/test/confs/3407 +++ b/test/confs/3407 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/3408 b/test/confs/3408 index c8b094073..7a28404c4 100644 --- a/test/confs/3408 +++ b/test/confs/3408 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/3409 b/test/confs/3409 index 11355fcec..dd3b8d2ed 100644 --- a/test/confs/3409 +++ b/test/confs/3409 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/3410 b/test/confs/3410 index a102d40b6..8beadb7f2 100644 --- a/test/confs/3410 +++ b/test/confs/3410 @@ -7,6 +7,7 @@ spool_directory = DIR/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 84a24166c..3f721d797 100644 --- a/test/confs/3411 +++ b/test/confs/3411 @@ -7,6 +7,7 @@ spool_directory = DIR/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 09832d895..1bdb9d8e2 100644 --- a/test/confs/3412 +++ b/test/confs/3412 @@ -7,6 +7,7 @@ spool_directory = DIR/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 a6b76d16d..c0eae2022 100644 --- a/test/confs/3413 +++ b/test/confs/3413 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/3414 b/test/confs/3414 index 3b410c104..8e0c93c4a 100644 --- a/test/confs/3414 +++ b/test/confs/3414 @@ -10,6 +10,7 @@ spool_directory = DIR/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 12be95e5b..31503df48 100644 --- a/test/confs/3415 +++ b/test/confs/3415 @@ -11,6 +11,7 @@ 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 6785dede0..1888371ac 100644 --- a/test/confs/3416 +++ b/test/confs/3416 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/3500 b/test/confs/3500 index 8853e9440..87e57fc88 100644 --- a/test/confs/3500 +++ b/test/confs/3500 @@ -7,6 +7,7 @@ spool_directory = DIR/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 521bb789f..a596e8f33 100644 --- a/test/confs/3501 +++ b/test/confs/3501 @@ -7,6 +7,7 @@ spool_directory = DIR/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 c37ccf14d..3e491386b 100644 --- a/test/confs/3600 +++ b/test/confs/3600 @@ -9,6 +9,7 @@ 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 new file mode 100644 index 000000000..1565b5f79 --- /dev/null +++ b/test/confs/3700 @@ -0,0 +1,86 @@ +# Exim test configuration 3700 + +SERVER= + +exim_path = EXIM_PATH +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 + +log_selector = +received_recipients +outgoing_port + +# ----- Main settings ----- + +acl_smtp_mail = check_authd +acl_smtp_rcpt = check_authd +queue_only +queue_run_in_order +trusted_users = CALLER + +tls_on_connect_ports = PORT_S +tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 + +tls_verify_hosts = * +tls_verify_certificates = DIR/aux-fixed/cert2 + + +# ----- ACL ----- + +begin acl + +check_authd: + deny message = authentication required + !authenticated = * + accept + + +# ----- Authentication ----- + +begin authenticators + +tls: + driver = tls + server_debug_print = +++TLS \$auth1="$auth1" + server_param1 = ${quote:${certextract {subject,CN,>:} \ + {$tls_in_peercert}}} + server_condition = ${if def:auth1} + server_set_id = $auth1 + + +# ----- Routers ----- + +begin routers + +r1: + driver = accept + transport = ${if eq {$local_part}{smtps} {t2}{t1}} + + +# ----- Transports ----- + +begin transports + +t1: + driver = smtp + hosts = 127.0.0.1 + port = PORT_D + allow_localhost + tls_certificate = DIR/aux-fixed/cert2 + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + +t2: + driver = smtp + hosts = 127.0.0.1 + port = PORT_S + protocol = smtps + allow_localhost + tls_certificate = DIR/aux-fixed/cert2 + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + +# End diff --git a/test/confs/4000 b/test/confs/4000 index 63fa1b9db..f5c2d3961 100644 --- a/test/confs/4000 +++ b/test/confs/4000 @@ -7,6 +7,8 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +log_selector = +subject +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/4001 b/test/confs/4001 index 00406b4ee..61ad4c927 100644 --- a/test/confs/4001 +++ b/test/confs/4001 @@ -8,8 +8,9 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = -av_scanner = f-protd : localhost PORT_S +av_scanner = f-protd : localhost4 PORT_S # ----- Main settings ----- @@ -20,7 +21,7 @@ begin acl c_data: accept !malware = * OPT - deny logwrite = malware_name $malware_name + deny logwrite = $callout_address malware_name $malware_name # ----- Routers ----- diff --git a/test/confs/4002 b/test/confs/4002 index cc0d05ebb..c7d27b811 100644 --- a/test/confs/4002 +++ b/test/confs/4002 @@ -9,6 +9,7 @@ log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME log_selector = +subject +tls_advertise_hosts = av_scanner = aveserver : DIR/eximdir/aveserver_sock diff --git a/test/confs/4003 b/test/confs/4003 index 7fbd61ba0..380e3a474 100644 --- a/test/confs/4003 +++ b/test/confs/4003 @@ -9,6 +9,7 @@ log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME log_selector = +subject +tls_advertise_hosts = av_scanner = fsecure : DIR/eximdir/fsec_sock diff --git a/test/confs/4004 b/test/confs/4004 index 84471acac..be674b502 100644 --- a/test/confs/4004 +++ b/test/confs/4004 @@ -9,6 +9,7 @@ log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME log_selector = +subject +tls_advertise_hosts = av_scanner = sophie : DIR/eximdir/sophie_sock diff --git a/test/confs/4005 b/test/confs/4005 index 8ed28d4a6..cd715d5e6 100644 --- a/test/confs/4005 +++ b/test/confs/4005 @@ -1,6 +1,9 @@ # Exim test configuration 4005 # Content-scan: clamav interface +OPT= +CONTROL= + exim_path = EXIM_PATH host_lookup_order = bydns primary_hostname = myhost.test.ex @@ -8,9 +11,11 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = log_selector = +subject -av_scanner = clamd : DIR/eximdir/clam_sock +#XXX we need an additional test for tcp-connected clamd +av_scanner = clamd : DIR/eximdir/clam_sock CONTROL # ----- Main settings ----- diff --git a/test/confs/4006 b/test/confs/4006 index 8ac65a584..c3d2a3142 100644 --- a/test/confs/4006 +++ b/test/confs/4006 @@ -9,6 +9,7 @@ log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME log_selector = +subject +tls_advertise_hosts = av_scanner = avast : DIR/eximdir/avast_sock : OPTION diff --git a/test/confs/4007 b/test/confs/4007 index 110a590f0..f0792722b 100644 --- a/test/confs/4007 +++ b/test/confs/4007 @@ -9,6 +9,7 @@ log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME log_selector = +subject +tls_advertise_hosts = 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 new file mode 100644 index 000000000..463167503 --- /dev/null +++ b/test/confs/4008 @@ -0,0 +1,38 @@ +# Exim test configuration 4008 +# Content-scan: rspamd interface + +exim_path = EXIM_PATH +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 = +log_selector = +subject + +spamd_address = 127.0.0.1 11333 variant=rspamd + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +acl_smtp_data = c_data + +begin acl + +c_data: + warn + spam = nobody + warn + log_message = $spam_action $spam_report + accept + +# ----- Routers ----- + +begin routers + +r: + driver = redirect + data = :blackhole: + +# End diff --git a/test/confs/4009 b/test/confs/4009 new file mode 100644 index 000000000..8b86f7ed6 --- /dev/null +++ b/test/confs/4009 @@ -0,0 +1,40 @@ +# Exim test configuration 4009 +# Content-scan: spamassassin interface + +OPT= 127.0.0.1 7833 + +exim_path = EXIM_PATH +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 = +log_selector = +subject + +spamd_address = OPT + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +acl_smtp_data = c_data + +begin acl + +c_data: + warn + spam = nobody + warn + log_message = $callout_address $spam_action $spam_report + accept + +# ----- Routers ----- + +begin routers + +r: + driver = redirect + data = :blackhole: + +# End diff --git a/test/confs/4010 b/test/confs/4010 new file mode 100644 index 000000000..94dc25b0f --- /dev/null +++ b/test/confs/4010 @@ -0,0 +1,58 @@ +# Exim test configuration 0568: ACL regex= + +exim_path = EXIM_PATH +host_lookup_order = bydns +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 ----- + +acl_smtp_rcpt = check_rcpt +acl_smtp_data = check_data +acl_not_smtp = check_data + + +# ----- ACL ----- + +begin acl + +check_rcpt: + accept + +check_data: + warn regex = \N(THIS\s((\w+)\s)?REGEX)\N + message = X-Regex: Regex matched <$regex1> <$regex3> + + warn condition = ${if !eq{$h_fakereject:}{}} + control = fakereject + + warn condition = ${if !eq{$h_fakedefer:}{}} + control = fakedefer + + accept + +# ----- Routers ----- + +begin routers + +r1: + driver = accept + transport = t1 + +# ----- Transports ----- + +begin transports + +t1: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER + + +# End diff --git a/test/confs/4015 b/test/confs/4015 new file mode 120000 index 000000000..eb8888460 --- /dev/null +++ b/test/confs/4015 @@ -0,0 +1 @@ +4009
\ No newline at end of file diff --git a/test/confs/4020 b/test/confs/4020 new file mode 100644 index 000000000..acc447718 --- /dev/null +++ b/test/confs/4020 @@ -0,0 +1,47 @@ +# Exim test configuration 4020 + +OPT = + +exim_path = EXIM_PATH +hide 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 ----- + +log_selector = +proxy +outgoing_port + +domainlist local_domains = test.ex : *.test.ex +acl_smtp_rcpt = accept + + +# ----- Routers ----- + +begin routers + +my_main_router: + driver = manualroute + route_list = * 127.0.0.1 + self = send + transport = my_smtp + debug_print = router_name <$router_name> + no_more + + +# ----- Transports ----- + +begin transports + +my_smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + hide socks_proxy = 127.0.0.1 port=PORT_D OPT + debug_print = transport_name <$transport_name> + + +# End diff --git a/test/confs/4028 b/test/confs/4028 new file mode 100644 index 000000000..3174e7543 --- /dev/null +++ b/test/confs/4028 @@ -0,0 +1,63 @@ +# Exim test configuration 4028 +# starttls over socks + +OPT = +SERVER= + +exim_path = EXIM_PATH +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 + +# ----- Main settings ----- + +log_selector = +tls_peerdn +domainlist local_domains = test.ex : *.test.ex +acl_smtp_rcpt = accept + +tls_advertise_hosts = * + +# Set certificate only if server + +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} + +tls_verify_hosts = * +tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail} + +# ----- Routers ----- + +begin routers + +client: + driver = manualroute + condition = ${if eq {SERVER}{server}{no}{yes}} + route_list = * 127.0.0.1 + self = send + transport = my_smtp + no_more + +server: + driver = redirect + data = :blackhole: + + +# ----- Transports ----- + +begin transports + +my_smtp: + driver = smtp + port = PORT_D + socks_proxy = 127.0.0.1 port=1080 OPT + tls_certificate = DIR/aux-fixed/cert2 + tls_privatekey = DIR/aux-fixed/cert2 + tls_verify_certificates = DIR/aux-fixed/cert2 + tls_try_verify_hosts = * + + + +# End diff --git a/test/confs/4029 b/test/confs/4029 new file mode 100644 index 000000000..ae4e71850 --- /dev/null +++ b/test/confs/4029 @@ -0,0 +1,64 @@ +# Exim test configuration 4029 +# starttls over socks + +OPT = +SERVER= + +exim_path = EXIM_PATH +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 + +# ----- Main settings ----- + +log_selector = +tls_peerdn +domainlist local_domains = test.ex : *.test.ex +acl_smtp_rcpt = accept + +tls_advertise_hosts = * + +# Set certificate only if server + +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} + +tls_verify_hosts = * +tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail} + +# ----- Routers ----- + +begin routers + +client: + driver = manualroute + condition = ${if eq {SERVER}{server}{no}{yes}} + route_list = * 127.0.0.1 + self = send + transport = my_smtp + no_more + +server: + driver = redirect + data = :blackhole: + + +# ----- Transports ----- + +begin transports + +my_smtp: + driver = smtp + port = PORT_D + socks_proxy = 127.0.0.1 port=1080 OPT + tls_certificate = DIR/aux-fixed/cert2 + tls_privatekey = DIR/aux-fixed/cert2 + tls_verify_certificates = DIR/aux-fixed/cert2 + tls_try_verify_hosts = * + + + +# End + diff --git a/test/confs/4100 b/test/confs/4100 index 180c6f4d3..b5d938321 100644 --- a/test/confs/4100 +++ b/test/confs/4100 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/4200 b/test/confs/4200 new file mode 100644 index 000000000..2237b5c99 --- /dev/null +++ b/test/confs/4200 @@ -0,0 +1,15 @@ +# Exim test configuration 4200 + +exim_path = EXIM_PATH +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_name = CALLER_NAME +tls_advertise_hosts = + +# ----- Main settings ----- + +headers_charset = UTF8 + +# ----- ACL ----- + +# End diff --git a/test/confs/4201 b/test/confs/4201 new file mode 100644 index 000000000..980f1d8fa --- /dev/null +++ b/test/confs/4201 @@ -0,0 +1,128 @@ +# Exim test configuration 4201 +# SMTPUTF8 handling + +OPTION = * +CONTROL = +INSERT = +SUB = + +exim_path = EXIM_PATH +host_lookup_order = bydns +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = + +# ----- Main settings ----- + +domainlist local_domains = test.ex : cname + +acl_smtp_rcpt = check_recipient +acl_not_smtp = non_smtp + +trusted_users = CALLER +log_selector = +received_recipients +sender_on_delivery + +.ifdef SERVER +queue_only +queue_run_in_order +.endif + +smtputf8_advertise_hosts = OPTION + +SUB + + +# ----- ACL ----- + +begin acl + + +.ifdef SERVER + +check_recipient: + accept hosts = : + accept domains = +local_domains + local_parts = ^(xn--)?user.*\$ + deny message = relay not permitted + +.else + +sub: +.ifdef INSERT + require INSERT +.endif +.ifdef CONTROL + require CONTROL +.endif + accept + +check_recipient: + accept domains = * + acl = sub + +non_smtp: + accept senders = : + control = queue_only + accept + +.endif + +# ----- Routers ----- + +begin routers + +.ifdef SERVER + +fail_remote_domains: + driver = redirect + domains = ! +local_domains + data = :fail: unrouteable mail domain "$domain" + +bounces: + driver = redirect + condition = ${if eq {} {$sender_address}} + data = DIR/test-mail/$local_part + file_transport = local_delivery + +localuser: + driver = redirect + data = :blackhole: + +.else + +bounces: + driver = redirect + domains = *.local + data = DIR/test-mail/$local_part + file_transport = local_delivery + +rmt: + driver = manualroute + domains = +local_domains + route_data = <;[127.0.0.1]:PORT_D + transport = rmt_smtp + self = send + +.endif + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + user = CALLER + delivery_date_add + envelope_to_add + file = DIR/test-mail/$local_part + headers_add = "X-body-linecount: $body_linecount\n\ + X-message-linecount: $message_linecount\n\ + X-received-count: $received_count" + return_path_add + +rmt_smtp: + driver = smtp + +# End diff --git a/test/confs/4202 b/test/confs/4202 new file mode 120000 index 000000000..73a348fee --- /dev/null +++ b/test/confs/4202 @@ -0,0 +1 @@ +4201
\ No newline at end of file diff --git a/test/confs/4203 b/test/confs/4203 new file mode 120000 index 000000000..73a348fee --- /dev/null +++ b/test/confs/4203 @@ -0,0 +1 @@ +4201
\ No newline at end of file diff --git a/test/confs/4204 b/test/confs/4204 new file mode 120000 index 000000000..73a348fee --- /dev/null +++ b/test/confs/4204 @@ -0,0 +1 @@ +4201
\ No newline at end of file diff --git a/test/confs/4205 b/test/confs/4205 new file mode 120000 index 000000000..73a348fee --- /dev/null +++ b/test/confs/4205 @@ -0,0 +1 @@ +4201
\ No newline at end of file diff --git a/test/confs/4206 b/test/confs/4206 new file mode 120000 index 000000000..73a348fee --- /dev/null +++ b/test/confs/4206 @@ -0,0 +1 @@ +4201
\ No newline at end of file diff --git a/test/confs/4207 b/test/confs/4207 new file mode 120000 index 000000000..73a348fee --- /dev/null +++ b/test/confs/4207 @@ -0,0 +1 @@ +4201
\ No newline at end of file diff --git a/test/confs/4208 b/test/confs/4208 new file mode 120000 index 000000000..73a348fee --- /dev/null +++ b/test/confs/4208 @@ -0,0 +1 @@ +4201
\ No newline at end of file diff --git a/test/confs/4209 b/test/confs/4209 new file mode 120000 index 000000000..73a348fee --- /dev/null +++ b/test/confs/4209 @@ -0,0 +1 @@ +4201
\ No newline at end of file diff --git a/test/confs/4211 b/test/confs/4211 new file mode 100644 index 000000000..085fecc72 --- /dev/null +++ b/test/confs/4211 @@ -0,0 +1,126 @@ +# Exim test configuration 4201 +# SMTPUTF8 handling + +OPTION = * +CONTROL = + +exim_path = EXIM_PATH +host_lookup_order = bydns +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +domainlist local_domains = test.ex : cname + +acl_smtp_rcpt = check_recipient +acl_not_smtp = non_smtp + +trusted_users = CALLER +log_selector = +received_recipients +sender_on_delivery + +.ifdef SERVER +queue_only +queue_run_in_order +.endif + +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_advertise_hosts = * + +smtputf8_advertise_hosts = OPTION + + +# ----- ACL ----- + +begin acl + + +.ifdef SERVER + +check_recipient: + accept hosts = : + accept domains = +local_domains + local_parts = ^user.*\$ + deny message = relay not permitted + +.else + +sub: +.ifdef CONTROL + require CONTROL +.endif + accept + +check_recipient: + accept domains = * + acl = sub + +non_smtp: + accept senders = : + control = queue_only + accept + +.endif + +# ----- Routers ----- + +begin routers + +.ifdef SERVER + +fail_remote_domains: + driver = redirect + domains = ! +local_domains + data = :fail: unrouteable mail domain "$domain" + +bounces: + driver = redirect + condition = ${if eq {} {$sender_address}} + data = DIR/test-mail/$local_part + file_transport = local_delivery + +localuser: + driver = redirect + data = :blackhole: + +.else + +bounces: + driver = redirect + domains = *.local + data = DIR/test-mail/$local_part + file_transport = local_delivery + +rmt: + driver = manualroute + domains = +local_domains + route_data = <;[127.0.0.1]:PORT_D + transport = rmt_smtp + self = send + +.endif + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + user = CALLER + delivery_date_add + envelope_to_add + file = DIR/test-mail/$local_part + headers_add = "X-body-linecount: $body_linecount\n\ + X-message-linecount: $message_linecount\n\ + X-received-count: $received_count" + return_path_add + +rmt_smtp: + driver = smtp + hosts_require_tls = * + tls_try_verify_hosts = : + +# End diff --git a/test/confs/4213 b/test/confs/4213 new file mode 120000 index 000000000..7b5094115 --- /dev/null +++ b/test/confs/4213 @@ -0,0 +1 @@ +4211
\ No newline at end of file diff --git a/test/confs/4214 b/test/confs/4214 new file mode 120000 index 000000000..7b5094115 --- /dev/null +++ b/test/confs/4214 @@ -0,0 +1 @@ +4211
\ No newline at end of file diff --git a/test/confs/4215 b/test/confs/4215 new file mode 120000 index 000000000..7b5094115 --- /dev/null +++ b/test/confs/4215 @@ -0,0 +1 @@ +4211
\ No newline at end of file diff --git a/test/confs/4216 b/test/confs/4216 new file mode 120000 index 000000000..7b5094115 --- /dev/null +++ b/test/confs/4216 @@ -0,0 +1 @@ +4211
\ No newline at end of file diff --git a/test/confs/4221 b/test/confs/4221 new file mode 100644 index 000000000..085fecc72 --- /dev/null +++ b/test/confs/4221 @@ -0,0 +1,126 @@ +# Exim test configuration 4201 +# SMTPUTF8 handling + +OPTION = * +CONTROL = + +exim_path = EXIM_PATH +host_lookup_order = bydns +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +domainlist local_domains = test.ex : cname + +acl_smtp_rcpt = check_recipient +acl_not_smtp = non_smtp + +trusted_users = CALLER +log_selector = +received_recipients +sender_on_delivery + +.ifdef SERVER +queue_only +queue_run_in_order +.endif + +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_advertise_hosts = * + +smtputf8_advertise_hosts = OPTION + + +# ----- ACL ----- + +begin acl + + +.ifdef SERVER + +check_recipient: + accept hosts = : + accept domains = +local_domains + local_parts = ^user.*\$ + deny message = relay not permitted + +.else + +sub: +.ifdef CONTROL + require CONTROL +.endif + accept + +check_recipient: + accept domains = * + acl = sub + +non_smtp: + accept senders = : + control = queue_only + accept + +.endif + +# ----- Routers ----- + +begin routers + +.ifdef SERVER + +fail_remote_domains: + driver = redirect + domains = ! +local_domains + data = :fail: unrouteable mail domain "$domain" + +bounces: + driver = redirect + condition = ${if eq {} {$sender_address}} + data = DIR/test-mail/$local_part + file_transport = local_delivery + +localuser: + driver = redirect + data = :blackhole: + +.else + +bounces: + driver = redirect + domains = *.local + data = DIR/test-mail/$local_part + file_transport = local_delivery + +rmt: + driver = manualroute + domains = +local_domains + route_data = <;[127.0.0.1]:PORT_D + transport = rmt_smtp + self = send + +.endif + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + user = CALLER + delivery_date_add + envelope_to_add + file = DIR/test-mail/$local_part + headers_add = "X-body-linecount: $body_linecount\n\ + X-message-linecount: $message_linecount\n\ + X-received-count: $received_count" + return_path_add + +rmt_smtp: + driver = smtp + hosts_require_tls = * + tls_try_verify_hosts = : + +# End diff --git a/test/confs/4223 b/test/confs/4223 new file mode 120000 index 000000000..ba509063c --- /dev/null +++ b/test/confs/4223 @@ -0,0 +1 @@ +4221
\ No newline at end of file diff --git a/test/confs/4224 b/test/confs/4224 new file mode 120000 index 000000000..ba509063c --- /dev/null +++ b/test/confs/4224 @@ -0,0 +1 @@ +4221
\ No newline at end of file diff --git a/test/confs/4225 b/test/confs/4225 new file mode 120000 index 000000000..ba509063c --- /dev/null +++ b/test/confs/4225 @@ -0,0 +1 @@ +4221
\ No newline at end of file diff --git a/test/confs/4226 b/test/confs/4226 new file mode 120000 index 000000000..ba509063c --- /dev/null +++ b/test/confs/4226 @@ -0,0 +1 @@ +4221
\ No newline at end of file diff --git a/test/confs/4500 b/test/confs/4500 new file mode 100644 index 000000000..cb98407cc --- /dev/null +++ b/test/confs/4500 @@ -0,0 +1,22 @@ +# Exim test configuration 4500 + +SERVER= + +exim_path = EXIM_PATH +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 +tls_advertise_hosts = + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length + +queue_only +queue_run_in_order + +# End diff --git a/test/confs/4501 b/test/confs/4501 new file mode 120000 index 000000000..c4f73bacd --- /dev/null +++ b/test/confs/4501 @@ -0,0 +1 @@ +4500
\ No newline at end of file diff --git a/test/confs/4502 b/test/confs/4502 new file mode 120000 index 000000000..c4f73bacd --- /dev/null +++ b/test/confs/4502 @@ -0,0 +1 @@ +4500
\ No newline at end of file diff --git a/test/confs/4700 b/test/confs/4700 new file mode 100644 index 000000000..6a532b6a0 --- /dev/null +++ b/test/confs/4700 @@ -0,0 +1,72 @@ +# Exim test configuration 0211 + +exim_path = EXIM_PATH +host_lookup_order = bydns +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = + +# ----- Main settings ----- + +domainlist local_domains = test.ex + +acl_smtp_rcpt = check_recipient + +log_selector = +sender_on_delivery +qualify_domain = test.ex + + +# ----- ACLs ----- + +begin acl + +check_recipient: + accept hosts = : + accept domains = +local_domains + deny message = relay not permitted + + +# ----- Routers ----- + +begin routers + +others: + driver = manualroute + domains = ! +local_domains + route_list = * localhost4.test.ex byname + self = send + transport = smtp + no_more + +all: + driver = accept + retry_use_local_part + transport = local_delivery + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + port = PORT_S + +local_delivery: + driver = appendfile + file = DIR/test-mail/$local_part + return_path_add + user = CALLER + + +# ----- Retry ----- + + +begin retry + +* * F,5d,8h + + +# End diff --git a/test/confs/4800 b/test/confs/4800 new file mode 100644 index 000000000..0fff2b87c --- /dev/null +++ b/test/confs/4800 @@ -0,0 +1,11 @@ +tls_advertise_hosts = + +begin routers + dnslookup: + driver = dnslookup + dnssec_request_domains = * + transport = smtp + +begin transports + smtp: + driver = smtp diff --git a/test/confs/4801 b/test/confs/4801 new file mode 100644 index 000000000..26ac21982 --- /dev/null +++ b/test/confs/4801 @@ -0,0 +1,11 @@ +tls_advertise_hosts = + +begin routers + dnslookup: + driver = dnslookup + dnssec_require_domains = * + transport = smtp + +begin transports + smtp: + driver = smtp diff --git a/test/confs/4802 b/test/confs/4802 new file mode 100644 index 000000000..0fff2b87c --- /dev/null +++ b/test/confs/4802 @@ -0,0 +1,11 @@ +tls_advertise_hosts = + +begin routers + dnslookup: + driver = dnslookup + dnssec_request_domains = * + transport = smtp + +begin transports + smtp: + driver = smtp diff --git a/test/confs/4803 b/test/confs/4803 new file mode 100644 index 000000000..c23d89b6e --- /dev/null +++ b/test/confs/4803 @@ -0,0 +1,12 @@ +tls_advertise_hosts = +dns_trust_aa = * + +begin routers + dnslookup: + driver = dnslookup + dnssec_require_domains = * + transport = smtp + +begin transports + smtp: + driver = smtp diff --git a/test/confs/4950 b/test/confs/4950 index 373aafe2b..752b66aad 100644 --- a/test/confs/4950 +++ b/test/confs/4950 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5000 b/test/confs/5000 index f46ba25a7..2ceeb06a8 100644 --- a/test/confs/5000 +++ b/test/confs/5000 @@ -7,6 +7,7 @@ spool_directory = DIR/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 9e497261d..a5475fd85 100644 --- a/test/confs/5001 +++ b/test/confs/5001 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5002 b/test/confs/5002 index a21bd7a82..021166431 100644 --- a/test/confs/5002 +++ b/test/confs/5002 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1c0d7639d..cdfaec5da 100644 --- a/test/confs/5003 +++ b/test/confs/5003 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5004 b/test/confs/5004 index eb1a874d9..3596fabaf 100644 --- a/test/confs/5004 +++ b/test/confs/5004 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5005 b/test/confs/5005 index d38387a9e..6fa97f152 100644 --- a/test/confs/5005 +++ b/test/confs/5005 @@ -9,6 +9,7 @@ spool_directory = DIR/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 24f0361ea..107d025dd 100644 --- a/test/confs/5006 +++ b/test/confs/5006 @@ -7,6 +7,7 @@ spool_directory = DIR/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 59df86783..eab0c2013 100644 --- a/test/confs/5007 +++ b/test/confs/5007 @@ -9,6 +9,7 @@ spool_directory = DIR/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 a9e7a7246..adfbecde3 100644 --- a/test/confs/5008 +++ b/test/confs/5008 @@ -9,6 +9,7 @@ spool_directory = DIR/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 8da6c6e1b..f5983a1cb 100644 --- a/test/confs/5009 +++ b/test/confs/5009 @@ -9,6 +9,7 @@ spool_directory = DIR/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 acda86a55..6bff7fe14 100644 --- a/test/confs/5050 +++ b/test/confs/5050 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5100 b/test/confs/5100 index 4f4df39de..908a021a9 100644 --- a/test/confs/5100 +++ b/test/confs/5100 @@ -9,6 +9,7 @@ spool_directory = DIR/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 a3bd84f91..5de00516c 100644 --- a/test/confs/5101 +++ b/test/confs/5101 @@ -7,6 +7,7 @@ spool_directory = DIR/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 8d69e3b20..bc33185c7 100644 --- a/test/confs/5102 +++ b/test/confs/5102 @@ -7,6 +7,7 @@ spool_directory = DIR/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 e195052e0..d9ed330fa 100644 --- a/test/confs/5103 +++ b/test/confs/5103 @@ -7,6 +7,7 @@ spool_directory = DIR/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 aa9997b7f..a6f70518e 100644 --- a/test/confs/5200 +++ b/test/confs/5200 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5201 b/test/confs/5201 index 58af62e6c..4fa69d0ce 100644 --- a/test/confs/5201 +++ b/test/confs/5201 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5202 b/test/confs/5202 index 87bc9d0af..6f5f7e679 100644 --- a/test/confs/5202 +++ b/test/confs/5202 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5203 b/test/confs/5203 index 0a11110b3..99864f5fa 100644 --- a/test/confs/5203 +++ b/test/confs/5203 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5204 b/test/confs/5204 index 5cf753aeb..2393a5778 100644 --- a/test/confs/5204 +++ b/test/confs/5204 @@ -9,6 +9,7 @@ spool_directory = DIR/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 5048b1d59..fc32d2bdb 100644 --- a/test/confs/5205 +++ b/test/confs/5205 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5206 b/test/confs/5206 index 7d1c56253..4f9606596 100644 --- a/test/confs/5206 +++ b/test/confs/5206 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5207 b/test/confs/5207 index 4fb4f767e..018f1fc7d 100644 --- a/test/confs/5207 +++ b/test/confs/5207 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1cd500ff7..5a6276e46 100644 --- a/test/confs/5208 +++ b/test/confs/5208 @@ -10,6 +10,7 @@ spool_directory = DIR/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 21e27390d..334313bb0 100644 --- a/test/confs/5209 +++ b/test/confs/5209 @@ -7,6 +7,7 @@ spool_directory = DIR/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 70de5631c..e68f9aaff 100644 --- a/test/confs/5300 +++ b/test/confs/5300 @@ -9,6 +9,7 @@ spool_directory = DIR/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 0c130a04f..0579db202 100644 --- a/test/confs/5301 +++ b/test/confs/5301 @@ -9,6 +9,7 @@ spool_directory = DIR/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 09a0aafcf..2a2d45860 100644 --- a/test/confs/5400 +++ b/test/confs/5400 @@ -7,6 +7,9 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = + +log_selector = +received_recipients # ----- Main settings ----- @@ -27,12 +30,18 @@ ar: begin routers +dns: + driver = dnslookup + domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex + self = send + transport = smtp + all: driver = manualroute domains = ! +local_domains - route_list = * 127.0.0.1 + route_list = special.com HOSTIPV4 ; * 127.0.0.1 self = send - transport = smtp + transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}} headers_remove = X-hdr-rtr headers_add = X-hdr-rtr-new: $h_X-hdr-rtr:+++ no_more @@ -48,5 +57,10 @@ smtp: port = PORT_S headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}} +smtp2: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + # End diff --git a/test/confs/5401 b/test/confs/5401 index 5978b7fa0..3ee414c85 100644 --- a/test/confs/5401 +++ b/test/confs/5401 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5500 b/test/confs/5500 index 6b9e328ba..f1a088d42 100644 --- a/test/confs/5500 +++ b/test/confs/5500 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -22,6 +23,7 @@ trusted_users = CALLER prdr_enable = true +acl_smtp_mail = mail_acl acl_smtp_rcpt = accept acl_smtp_data_prdr = prdr_acl acl_smtp_data = data_acl @@ -30,6 +32,9 @@ acl_smtp_data = data_acl begin acl +mail_acl: + accept logwrite = prdr_requested: <$prdr_requested> + prdr_acl: defer local_parts = usery deny local_parts = userz @@ -56,10 +61,4 @@ r0: driver = accept transport = t1 -# ----- Retry ----- - -begin retry - -* * F,5d,5m - # End diff --git a/test/confs/5510 b/test/confs/5510 index 083394ee5..b3bddcd1a 100644 --- a/test/confs/5510 +++ b/test/confs/5510 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5700 b/test/confs/5700 index 4d0abea55..db1aa2a6e 100644 --- a/test/confs/5700 +++ b/test/confs/5700 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- @@ -45,6 +46,18 @@ ev_msg_fail: domain <$domain> \ reason <$event_data> +ev_msg_log: + accept logwrite = . \ + $acl_arg1 \ + ip <$host_address> \ + port <$host_port> \ + fqdn <$host> \ + local_part <$local_part> \ + domain <$domain> \ + $acl_arg2 \ + router <$router_name> \ + transport <$transport_name> + ev_msg: accept condition = ${if eq {fail} {${listextract{2}{$event_name}}}} acl = ev_msg_fail @@ -56,29 +69,21 @@ ev_msg: logwrite = $this_expansion_will_fail accept condition = ${if eq {$event_name}{msg:delivery}} - logwrite = . \ - delivery \ - ip <$host_address> \ - port <$host_port> \ - fqdn <$host> \ - local_part <$local_part> \ - domain <$domain> \ - confirmation <$event_data> \ - router <$router_name> \ - transport <$transport_name> + acl = ev_msg_log delivery "confirmation <$event_data>" accept condition = ${if eq {$event_name}{msg:host:defer}} - logwrite = . \ - deferral \ - ip <$host_address> \ - port <$host_port> \ - fqdn <$host> \ - local_part <$local_part> \ - domain <$domain> \ - errno <$event_defer_errno> \ - errstr <$event_data> \ - router <$router_name> \ - transport <$transport_name> + acl = ev_msg_log "host deferral" \ + "errno <$event_defer_errno> errstr <$event_data>" + + accept condition = ${if eq {$event_name}{msg:rcpt:defer}} + set acl_m_ev_lkup = ${eval:$event_defer_errno & 0xff} + set acl_m_ev_lkup = ${if = {$acl_m_ev_lkup}{65} {A} \ + { ${if = {$acl_m_ev_lkup}{77} {MX} \ + {$acl_m_ev_lkup}}}} + set acl_m_ev_code = 4${eval:$event_defer_errno >>8} + acl = ev_msg_log "rcpt deferral" \ + "err <$event_defer_errno>:<$acl_m_ev_lkup:$acl_m_ev_code> \ + errstr <$event_data>" logger: warn logwrite = event $event_name @@ -104,6 +109,7 @@ others: route_list = * 127.0.0.1 byname self = send transport = smtp + errors_to = "" no_more diff --git a/test/confs/5750 b/test/confs/5710 index debad84d4..354d3935b 100644 --- a/test/confs/5750 +++ b/test/confs/5710 @@ -1,4 +1,4 @@ -# Exim test configuration 5750 (dup of 5760) +# Exim test configuration 5710 (dup of 5720) # $tls_out_peercert - GnuTLS SERVER= @@ -57,6 +57,8 @@ ev_msg: accept logwrite = Peer cert: logwrite = ver <${certextract {version} {$tls_out_peercert}}> logwrite = SN <${certextract {subject} {$tls_out_peercert}}> + logwrite = SN; <${certextract {subject,>;} {$tls_out_peercert}}> + logwrite = SNCN<${certextract {subject,CN} {$tls_out_peercert}}> logwrite = IN <${certextract {issuer} {$tls_out_peercert}}> logwrite = NB <${certextract {notbefore} {$tls_out_peercert}}> logwrite = NA <${certextract {notafter} {$tls_out_peercert}}> diff --git a/test/confs/5760 b/test/confs/5720 index 8e6d2bb6f..e2ef60bdd 100644 --- a/test/confs/5760 +++ b/test/confs/5720 @@ -1,4 +1,4 @@ -# Exim test configuration 5760 (dup of 5750) +# Exim test configuration 5720 (dup of 5710) # $tls_out_peercert - OpenSSL SERVER= @@ -57,6 +57,8 @@ ev_msg: accept logwrite = Peer cert: logwrite = ver <${certextract {version} {$tls_out_peercert}}> logwrite = SN <${certextract {subject} {$tls_out_peercert}}> + logwrite = SN; <${certextract {subject,>;} {$tls_out_peercert}}> + logwrite = SNO <${certextract {subject,O} {$tls_out_peercert}}> logwrite = IN <${certextract {issuer} {$tls_out_peercert}}> logwrite = NB <${certextract {notbefore} {$tls_out_peercert}}> logwrite = NA <${certextract {notafter} {$tls_out_peercert}}> diff --git a/test/confs/5658 b/test/confs/5730 index 10938e1f9..7ed8ad4b7 100644 --- a/test/confs/5658 +++ b/test/confs/5730 @@ -1,4 +1,4 @@ -# Exim test configuration 5658 +# Exim test configuration 5730 # OCSP stapling, client, events SERVER = diff --git a/test/confs/5608 b/test/confs/5740 index 311cc1299..e20a8b601 100644 --- a/test/confs/5608 +++ b/test/confs/5740 @@ -1,4 +1,4 @@ -# Exim test configuration 5608 +# Exim test configuration 5740 # OCSP stapling, client, events SERVER = diff --git a/test/confs/5800 b/test/confs/5800 index 66facecb3..6d1b1ac52 100644 --- a/test/confs/5800 +++ b/test/confs/5800 @@ -5,6 +5,7 @@ exim_path = EXIM_PATH host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5840 b/test/confs/5840 index e1c63f435..4f468a384 100644 --- a/test/confs/5840 +++ b/test/confs/5840 @@ -13,11 +13,14 @@ gecos_name = CALLER_NAME # ----- Main settings ----- +.ifndef OPT acl_smtp_rcpt = accept +.else +acl_smtp_rcpt = accept verify = recipient/callout +.endif log_selector = +received_recipients +tls_peerdn +tls_certificate_verified -queue_only queue_run_in_order tls_advertise_hosts = * @@ -27,18 +30,17 @@ CDIR1 = DIR/aux-fixed CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com tls_certificate = ${if eq {SERVER}{server} \ - {${if eq {DETAILS}{ta} \ + {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \ {CDIR2/fullchain.pem}\ {CDIR1/cert1}}}\ fail} tls_privatekey = ${if eq {SERVER}{server} \ - {${if eq {DETAILS}{ta} \ + {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \ {CDIR2/server1.example.com.unlocked.key}\ {CDIR1/cert1}}}\ fail} - # ----- Routers ----- begin routers @@ -64,11 +66,12 @@ send_to_server: allow_localhost port = PORT_D -# hosts_try_dane = * - hosts_require_dane = * - hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \ - {= {0}{$tls_out_tlsa_usage}} } \ - {*}{}} + hosts_try_dane = * + hosts_require_dane = !thishost.test.ex + tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}} + tls_try_verify_hosts = thishost.test.ex + tls_verify_certificates = CDIR2/ca_chain.pem + # ----- Retry ----- diff --git a/test/confs/9000 b/test/confs/9000 index 8f55b92e2..05512bb0d 100644 --- a/test/confs/9000 +++ b/test/confs/9000 @@ -9,6 +9,7 @@ spool_directory = DIR/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 3f0b52362..6817dbeb5 100644 --- a/test/confs/9001 +++ b/test/confs/9001 @@ -7,6 +7,7 @@ spool_directory = DIR/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 0285c801a..e674784ce 100644 --- a/test/confs/9100 +++ b/test/confs/9100 @@ -7,6 +7,7 @@ spool_directory = DIR/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 1aac8b102..ee4e41030 100644 --- a/test/confs/9200 +++ b/test/confs/9200 @@ -9,6 +9,7 @@ spool_directory = DIR/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 05e88414d..de32e9bc7 100644 --- a/test/confs/9300 +++ b/test/confs/9300 @@ -9,6 +9,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/9400 b/test/confs/9400 index 32fe5c90b..855227b31 100644 --- a/test/confs/9400 +++ b/test/confs/9400 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = trusted_users = CALLER # ----- Main settings ----- diff --git a/test/confs/9401 b/test/confs/9401 index cbd030fbe..b69c844de 100644 --- a/test/confs/9401 +++ b/test/confs/9401 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/9402 b/test/confs/9402 index 65f8926c3..7e455d146 100644 --- a/test/confs/9402 +++ b/test/confs/9402 @@ -9,6 +9,7 @@ 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 43fbde00c..4e2464f4c 100644 --- a/test/confs/9450 +++ b/test/confs/9450 @@ -7,6 +7,7 @@ spool_directory = DIR/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 eba2f900c..7537ebd63 100644 --- a/test/confs/9900 +++ b/test/confs/9900 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/9901 b/test/confs/9901 index a49153ba0..f4c569ff1 100644 --- a/test/confs/9901 +++ b/test/confs/9901 @@ -10,6 +10,7 @@ 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 b252c4cbb..cabbfd5ec 100644 --- a/test/confs/9902 +++ b/test/confs/9902 @@ -10,6 +10,7 @@ spool_directory = DIR/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 39db98713..d2f0fcb85 100644 --- a/test/confs/9903 +++ b/test/confs/9903 @@ -6,6 +6,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +tls_advertise_hosts = # ----- Main settings ----- |