diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-12-08 23:36:01 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-12-08 23:36:01 +0000 |
| commit | 1d717e1c110562fd6bf28478c79f180cafeba776 (patch) | |
| tree | cefecf48467c646663f9af1048239b65d727571a /test | |
| parent | a2ce7b0f5da40b6a7a3094f75b156eede00539c0 (diff) | |
| parent | 277b99794bf90e4a64b4adee88c08bed417bc5ee (diff) | |
Merge branch '4.next'
Diffstat (limited to 'test')
327 files changed, 808 insertions, 133 deletions
diff --git a/test/confs/0015 b/test/confs/0015 index c6fccd316..dbbdfd059 100644 --- a/test/confs/0015 +++ b/test/confs/0015 @@ -100,6 +100,7 @@ delivery_s: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost address_reply: diff --git a/test/confs/0032 b/test/confs/0032 index 961cefadd..caf5edb28 100644 --- a/test/confs/0032 +++ b/test/confs/0032 @@ -38,6 +38,7 @@ local_delivery: smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0033 b/test/confs/0033 index ca06da772..c6bf4d32e 100644 --- a/test/confs/0033 +++ b/test/confs/0033 @@ -38,5 +38,6 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0036 b/test/confs/0036 index 48479c787..ded64879f 100644 --- a/test/confs/0036 +++ b/test/confs/0036 @@ -43,5 +43,6 @@ local_delivery: send_to_server: driver = smtp port = PORT_D + hosts_try_fastopen = : # End diff --git a/test/confs/0039 b/test/confs/0039 index 8ca8b1eec..f718997e9 100644 --- a/test/confs/0039 +++ b/test/confs/0039 @@ -37,5 +37,6 @@ begin transports t1: driver = smtp hosts = V4NET.0.0.0 + hosts_try_fastopen = : # End diff --git a/test/confs/0045 b/test/confs/0045 index a59c8e2c1..2a9efb565 100644 --- a/test/confs/0045 +++ b/test/confs/0045 @@ -21,6 +21,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0047 b/test/confs/0047 index 187f855ef..f9d77bdc2 100644 --- a/test/confs/0047 +++ b/test/confs/0047 @@ -25,5 +25,6 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0054 b/test/confs/0054 index 3ad875157..1af7c0d51 100644 --- a/test/confs/0054 +++ b/test/confs/0054 @@ -25,6 +25,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0055 b/test/confs/0055 index 72a2be740..6cc9b7c18 100644 --- a/test/confs/0055 +++ b/test/confs/0055 @@ -52,6 +52,7 @@ local_delivery: smtp: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0078 b/test/confs/0078 index aa1e445f3..fe325bc39 100644 --- a/test/confs/0078 +++ b/test/confs/0078 @@ -44,6 +44,7 @@ begin transports remote_smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0089 b/test/confs/0089 index b8bd142db..4a2a65828 100644 --- a/test/confs/0089 +++ b/test/confs/0089 @@ -68,6 +68,7 @@ begin transports dummy: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0098 b/test/confs/0098 index 719971c9c..cce115f12 100644 --- a/test/confs/0098 +++ b/test/confs/0098 @@ -92,10 +92,12 @@ smtp: driver = smtp connect_timeout = 1s port = PORT_D + hosts_try_fastopen = : smtp_connect_refused: driver = smtp port = PORT_N + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0099 b/test/confs/0099 index 63a918a0f..6a59d5994 100644 --- a/test/confs/0099 +++ b/test/confs/0099 @@ -41,6 +41,7 @@ begin transports smtp: driver = smtp port = PORT_N + hosts_try_fastopen = : RETRY diff --git a/test/confs/0100 b/test/confs/0100 index c404d5a73..143ff4cfe 100644 --- a/test/confs/0100 +++ b/test/confs/0100 @@ -72,10 +72,12 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : filtered_smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat" local_delivery: diff --git a/test/confs/0101 b/test/confs/0101 index 377eae705..cf89fa83a 100644 --- a/test/confs/0101 +++ b/test/confs/0101 @@ -50,6 +50,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : local_delivery: driver = pipe diff --git a/test/confs/0106 b/test/confs/0106 index ef91e8b10..84294a676 100644 --- a/test/confs/0106 +++ b/test/confs/0106 @@ -29,6 +29,7 @@ smtp: command_timeout = 1s final_timeout = 1s port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0108 b/test/confs/0108 index a4ee442e2..bc694ff3e 100644 --- a/test/confs/0108 +++ b/test/confs/0108 @@ -32,6 +32,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0109 b/test/confs/0109 index 59957b96b..ce49c0e08 100644 --- a/test/confs/0109 +++ b/test/confs/0109 @@ -28,6 +28,7 @@ begin transports smtp: driver = smtp port = PORT_N + hosts_try_fastopen = : allow_localhost diff --git a/test/confs/0130 b/test/confs/0130 index 02a095358..fbfd2ec78 100644 --- a/test/confs/0130 +++ b/test/confs/0130 @@ -43,6 +43,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0135 b/test/confs/0135 index 636294461..7fd5bdaa5 100644 --- a/test/confs/0135 +++ b/test/confs/0135 @@ -44,6 +44,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : connect_timeout = 1s local_delivery: diff --git a/test/confs/0143 b/test/confs/0143 index 5a6ee34a9..8f0300aa0 100644 --- a/test/confs/0143 +++ b/test/confs/0143 @@ -31,6 +31,7 @@ my_smtp: driver = smtp interface = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : debug_print = transport_name <$transport_name> diff --git a/test/confs/0144 b/test/confs/0144 index 34b38230f..0b950b854 100644 --- a/test/confs/0144 +++ b/test/confs/0144 @@ -28,6 +28,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0145 b/test/confs/0145 index 16b02a858..c7d8c8612 100644 --- a/test/confs/0145 +++ b/test/confs/0145 @@ -35,6 +35,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0146 b/test/confs/0146 index d8b6067e7..8039ebdfa 100644 --- a/test/confs/0146 +++ b/test/confs/0146 @@ -27,6 +27,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0147 b/test/confs/0147 index 996d064be..fae99a94a 100644 --- a/test/confs/0147 +++ b/test/confs/0147 @@ -60,6 +60,7 @@ begin transports T1: driver = smtp + hosts_try_fastopen = : #----- ACL ----- diff --git a/test/confs/0160 b/test/confs/0160 index f64883729..ea2003a92 100644 --- a/test/confs/0160 +++ b/test/confs/0160 @@ -31,6 +31,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0161 b/test/confs/0161 index 8b91ea053..88845f325 100644 --- a/test/confs/0161 +++ b/test/confs/0161 @@ -62,6 +62,7 @@ begin transports remote_smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0163 b/test/confs/0163 index 7b19d9f16..806c4b9e2 100644 --- a/test/confs/0163 +++ b/test/confs/0163 @@ -28,6 +28,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0175 b/test/confs/0175 index b20e4fe1a..461c265ba 100644 --- a/test/confs/0175 +++ b/test/confs/0175 @@ -58,6 +58,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : appendfile: driver = appendfile diff --git a/test/confs/0177 b/test/confs/0177 index 7921a8b55..0b78d4e0c 100644 --- a/test/confs/0177 +++ b/test/confs/0177 @@ -75,6 +75,7 @@ autoreply: smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0179 b/test/confs/0179 index 381b41caf..f18ab32e5 100644 --- a/test/confs/0179 +++ b/test/confs/0179 @@ -30,6 +30,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0183 b/test/confs/0183 index 8cd4c82d4..d55e5799f 100644 --- a/test/confs/0183 +++ b/test/confs/0183 @@ -57,6 +57,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0185 b/test/confs/0185 index d6e9fe020..d9d20fc93 100644 --- a/test/confs/0185 +++ b/test/confs/0185 @@ -72,6 +72,7 @@ autoreply: smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0186 b/test/confs/0186 index 21b31060c..5dffb3dd7 100644 --- a/test/confs/0186 +++ b/test/confs/0186 @@ -34,6 +34,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0187 b/test/confs/0187 index bca41b5f7..e2cd27ed5 100644 --- a/test/confs/0187 +++ b/test/confs/0187 @@ -45,6 +45,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0190 b/test/confs/0190 index 03ded9ce2..cdddae5f8 100644 --- a/test/confs/0190 +++ b/test/confs/0190 @@ -85,10 +85,12 @@ smtp: max_rcpt = 1 connection_max_messages = 1 port = PORT_S + hosts_try_fastopen = : smtp2: driver = smtp port = PORT_S + hosts_try_fastopen = : smtp3: driver = smtp @@ -96,6 +98,7 @@ smtp3: max_rcpt = 2 connection_max_messages = 1 port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0191 b/test/confs/0191 index 9dba8c35d..13d98bff9 100644 --- a/test/confs/0191 +++ b/test/confs/0191 @@ -28,6 +28,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : transport_filter = \ /bin/sh -c \ "cat >/dev/null; printf Line-without-end || /bin/echo -n Line-without-end" diff --git a/test/confs/0197 b/test/confs/0197 index b3f25c4c0..c2e4a10e8 100644 --- a/test/confs/0197 +++ b/test/confs/0197 @@ -95,6 +95,7 @@ makecopy: pass_on: driver = smtp + hosts_try_fastopen = : connect_timeout = 1s diff --git a/test/confs/0198 b/test/confs/0198 index f754a3187..5de770163 100644 --- a/test/confs/0198 +++ b/test/confs/0198 @@ -55,6 +55,7 @@ begin transports pass_on: driver = smtp + hosts_try_fastopen = : connect_timeout = 1s gethostbyname hosts = NEXTHOST diff --git a/test/confs/0200 b/test/confs/0200 index ab50f36df..03e628828 100644 --- a/test/confs/0200 +++ b/test/confs/0200 @@ -35,6 +35,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0201 b/test/confs/0201 index 5385baa9a..b4ad0d8d8 100644 --- a/test/confs/0201 +++ b/test/confs/0201 @@ -26,6 +26,7 @@ t1: hosts = 127.0.0.1 allow_localhost port = PORT_S + hosts_try_fastopen = : transport_filter = /bin/sh -c 'cat; exit 99' diff --git a/test/confs/0203 b/test/confs/0203 index 38e879010..1c197e720 100644 --- a/test/confs/0203 +++ b/test/confs/0203 @@ -29,6 +29,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0208 b/test/confs/0208 index 5a0b9f153..f1e9fea5d 100644 --- a/test/confs/0208 +++ b/test/confs/0208 @@ -59,6 +59,7 @@ fail: allow_localhost hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0209 b/test/confs/0209 index 82046c7bc..b9d23b058 100644 --- a/test/confs/0209 +++ b/test/confs/0209 @@ -39,6 +39,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0210 b/test/confs/0210 index b1db52218..298ad7279 100644 --- a/test/confs/0210 +++ b/test/confs/0210 @@ -62,6 +62,7 @@ bsmtp_smtp: allow_localhost hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0211 b/test/confs/0211 index 7856481df..b1dae707c 100644 --- a/test/confs/0211 +++ b/test/confs/0211 @@ -52,6 +52,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : command_timeout = 1s local_delivery: diff --git a/test/confs/0213 b/test/confs/0213 index ba0b9e403..388f693cc 100644 --- a/test/confs/0213 +++ b/test/confs/0213 @@ -29,6 +29,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0215 b/test/confs/0215 index ad40d6338..2758b07c9 100644 --- a/test/confs/0215 +++ b/test/confs/0215 @@ -40,6 +40,7 @@ lmtp: allow_localhost hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : protocol = LMTP lmtp_ignore_quota = IGNORE_QUOTA AUTHS diff --git a/test/confs/0216 b/test/confs/0216 index 69af54347..962a64c28 100644 --- a/test/confs/0216 +++ b/test/confs/0216 @@ -36,6 +36,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : max_rcpt = 0 HAP diff --git a/test/confs/0217 b/test/confs/0217 index fa797265a..a225df5fe 100644 --- a/test/confs/0217 +++ b/test/confs/0217 @@ -41,6 +41,7 @@ send_to_server: command_timeout = 1s hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : HAP max_rcpt = 1000 diff --git a/test/confs/0218 b/test/confs/0218 index fa97f9c67..250bc92e6 100644 --- a/test/confs/0218 +++ b/test/confs/0218 @@ -52,6 +52,7 @@ send_to_server: command_timeout = 1s hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : debug_print = T: $transport_name (${acl {expand_check}}) diff --git a/test/confs/0225 b/test/confs/0225 index 3139eea5b..0ed97b4ef 100644 --- a/test/confs/0225 +++ b/test/confs/0225 @@ -40,6 +40,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : local_delivery: driver = appendfile diff --git a/test/confs/0227 b/test/confs/0227 index fea66e16f..36050fa7d 100644 --- a/test/confs/0227 +++ b/test/confs/0227 @@ -81,6 +81,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : lmtp: driver = smtp diff --git a/test/confs/0228 b/test/confs/0228 index 19f6cb7cd..d8fb762af 100644 --- a/test/confs/0228 +++ b/test/confs/0228 @@ -31,6 +31,7 @@ smtp: driver = smtp fallback_hosts = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0229 b/test/confs/0229 index 5389f97bc..c8c048dbc 100644 --- a/test/confs/0229 +++ b/test/confs/0229 @@ -32,6 +32,7 @@ smtp: 127.0.0.1 : 127.0.0.1 : HOSTIPV4 : \ 127.0.0.1 : 127.0.0.1 : HOSTIPV4 port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0230 b/test/confs/0230 index c26b45758..f77f52f69 100644 --- a/test/confs/0230 +++ b/test/confs/0230 @@ -64,6 +64,7 @@ local_delivery: remote: driver = smtp port = PORT_D + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0231 b/test/confs/0231 index d0adf3907..1eabae91a 100644 --- a/test/confs/0231 +++ b/test/confs/0231 @@ -65,6 +65,7 @@ smtp_rewrite: headers_rewrite = *@domain1 $1-rewrite@domain2 f :\ *@domain1 $1-other@domain2 port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0238 b/test/confs/0238 index 15aa22052..4d92cdde7 100644 --- a/test/confs/0238 +++ b/test/confs/0238 @@ -33,6 +33,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0239 b/test/confs/0239 index f4b1a68ba..e7e26517a 100644 --- a/test/confs/0239 +++ b/test/confs/0239 @@ -39,6 +39,7 @@ local: smtp: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0242 b/test/confs/0242 index fc2dd70ba..63265a6dc 100644 --- a/test/confs/0242 +++ b/test/confs/0242 @@ -30,6 +30,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0253 b/test/confs/0253 index cd2c777de..40ede04ea 100644 --- a/test/confs/0253 +++ b/test/confs/0253 @@ -64,6 +64,7 @@ t3: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : max_rcpt = 1 allow_localhost return_path = pqr=$local_part+$domain@verp.domain diff --git a/test/confs/0257 b/test/confs/0257 index f61689380..056b54f04 100644 --- a/test/confs/0257 +++ b/test/confs/0257 @@ -30,6 +30,7 @@ smtp: connect_timeout = 1s fallback_hosts = ten-2.test.ex port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0259 b/test/confs/0259 index 6b9bc29ab..f6ae742d4 100644 --- a/test/confs/0259 +++ b/test/confs/0259 @@ -26,6 +26,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : begin retry diff --git a/test/confs/0261 b/test/confs/0261 index 30ec087fd..7b2b7a1a6 100644 --- a/test/confs/0261 +++ b/test/confs/0261 @@ -16,10 +16,12 @@ begin transports remote_delivery: driver = smtp hosts = V4NET.0.0.1 + hosts_try_fastopen = : bad_return: driver = smtp hosts = V4NET.0.0.0 + hosts_try_fastopen = : return_path = ${if no_hosts: diff --git a/test/confs/0263 b/test/confs/0263 index 53b0064e7..f215cdb32 100644 --- a/test/confs/0263 +++ b/test/confs/0263 @@ -14,6 +14,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # ----- Routers ----- diff --git a/test/confs/0273 b/test/confs/0273 index 0a12a6762..4acc0a935 100644 --- a/test/confs/0273 +++ b/test/confs/0273 @@ -16,6 +16,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # ----- Routers ----- diff --git a/test/confs/0276 b/test/confs/0276 index 257cf4593..94e7a130f 100644 --- a/test/confs/0276 +++ b/test/confs/0276 @@ -16,6 +16,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost # ----- Routers ----- diff --git a/test/confs/0285 b/test/confs/0285 index f0871a565..8b0ada1f1 100644 --- a/test/confs/0285 +++ b/test/confs/0285 @@ -33,6 +33,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : max_rcpt = 2 connection_max_messages = 3 diff --git a/test/confs/0286 b/test/confs/0286 index 8ec70bfbb..c6f5daab3 100644 --- a/test/confs/0286 +++ b/test/confs/0286 @@ -34,6 +34,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : max_rcpt = 2 connection_max_messages = 3 diff --git a/test/confs/0288 b/test/confs/0288 index 12c308baf..ac7369b63 100644 --- a/test/confs/0288 +++ b/test/confs/0288 @@ -30,6 +30,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : max_rcpt = 1 connection_max_messages = 1 serialize_hosts = 127.0.0.1 diff --git a/test/confs/0292 b/test/confs/0292 index 6e70a7925..d3ea4f342 100644 --- a/test/confs/0292 +++ b/test/confs/0292 @@ -38,6 +38,7 @@ t1: t2: driver = smtp + hosts_try_fastopen = : debug_print = \$host=$host \$host_address=$host_address # End diff --git a/test/confs/0299 b/test/confs/0299 index 5d648b85d..d7dc87314 100644 --- a/test/confs/0299 +++ b/test/confs/0299 @@ -38,6 +38,7 @@ t2: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost max_rcpt = 2 diff --git a/test/confs/0315 b/test/confs/0315 index fed3ceca1..ae86fdc2a 100644 --- a/test/confs/0315 +++ b/test/confs/0315 @@ -28,5 +28,6 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0322 b/test/confs/0322 index 396b0c653..f78739673 100644 --- a/test/confs/0322 +++ b/test/confs/0322 @@ -29,6 +29,7 @@ smtp: allow_localhost hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0332 b/test/confs/0332 index 4fe3b3fd4..a309e8e62 100644 --- a/test/confs/0332 +++ b/test/confs/0332 @@ -34,6 +34,7 @@ t1: hosts = 127.0.0.1 hosts_override port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0333 b/test/confs/0333 index 419229285..c14c07165 100644 --- a/test/confs/0333 +++ b/test/confs/0333 @@ -33,6 +33,7 @@ t1: hosts = 127.0.0.1 hosts_override port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0334 b/test/confs/0334 index 553763b0a..dc4e8a07b 100644 --- a/test/confs/0334 +++ b/test/confs/0334 @@ -25,6 +25,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0341 b/test/confs/0341 index 726793390..dcc4dec3a 100644 --- a/test/confs/0341 +++ b/test/confs/0341 @@ -47,6 +47,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : # End diff --git a/test/confs/0342 b/test/confs/0342 index dba9020f4..b6bc47eda 100644 --- a/test/confs/0342 +++ b/test/confs/0342 @@ -35,6 +35,7 @@ begin transports remote_smtp: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0343 b/test/confs/0343 index c613da449..a5741eade 100644 --- a/test/confs/0343 +++ b/test/confs/0343 @@ -25,6 +25,7 @@ remote_smtp: hosts = 127.0.0.1 allow_localhost port = PORT_N + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0344 b/test/confs/0344 index 0b29b0629..794e85eb3 100644 --- a/test/confs/0344 +++ b/test/confs/0344 @@ -32,15 +32,19 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : t2: driver = smtp + hosts_try_fastopen = : t3: driver = smtp + hosts_try_fastopen = : t4: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0350 b/test/confs/0350 index 09bd635db..927bdb7f7 100644 --- a/test/confs/0350 +++ b/test/confs/0350 @@ -25,5 +25,6 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0357 b/test/confs/0357 index 3f11016f5..f6f210235 100644 --- a/test/confs/0357 +++ b/test/confs/0357 @@ -26,6 +26,7 @@ t1: hosts = 127.0.0.1 allow_localhost port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0358 b/test/confs/0358 index 311687026..e451c84b5 100644 --- a/test/confs/0358 +++ b/test/confs/0358 @@ -26,6 +26,7 @@ t1: hosts = 127.0.0.1 allow_localhost port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0360 b/test/confs/0360 index d226449a8..f2f87c26f 100644 --- a/test/confs/0360 +++ b/test/confs/0360 @@ -36,6 +36,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0361 b/test/confs/0361 index f9007ec0c..909d7f397 100644 --- a/test/confs/0361 +++ b/test/confs/0361 @@ -39,6 +39,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : t2: driver = appendfile diff --git a/test/confs/0362 b/test/confs/0362 index 6588f609f..cdfe7d532 100644 --- a/test/confs/0362 +++ b/test/confs/0362 @@ -48,6 +48,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : t2: driver = appendfile diff --git a/test/confs/0363 b/test/confs/0363 index c43040876..872024893 100644 --- a/test/confs/0363 +++ b/test/confs/0363 @@ -26,6 +26,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost diff --git a/test/confs/0364 b/test/confs/0364 index e15bc9127..0ae251b36 100644 --- a/test/confs/0364 +++ b/test/confs/0364 @@ -49,6 +49,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : t2: driver = appendfile diff --git a/test/confs/0365 b/test/confs/0365 index 0bd6cc161..c5d8a0b53 100644 --- a/test/confs/0365 +++ b/test/confs/0365 @@ -81,5 +81,6 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0366 b/test/confs/0366 index 97d2e62a1..12e47cd5b 100644 --- a/test/confs/0366 +++ b/test/confs/0366 @@ -29,6 +29,7 @@ smtp: connect_timeout = 1s hosts_max_try = HOSTS_MAX_TRY port = PORT_N + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0367 b/test/confs/0367 index 2d69a07ab..911c3dd1c 100644 --- a/test/confs/0367 +++ b/test/confs/0367 @@ -28,6 +28,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0368 b/test/confs/0368 index fee202781..41756dff9 100644 --- a/test/confs/0368 +++ b/test/confs/0368 @@ -30,6 +30,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0374 b/test/confs/0374 index 652a5062b..284344276 100644 --- a/test/confs/0374 +++ b/test/confs/0374 @@ -75,6 +75,7 @@ ut3: ut4: driver = smtp hosts = 127.0.0.1 + hosts_try_fastopen = : port = PORT_S allow_localhost max_rcpt = 1 diff --git a/test/confs/0375 b/test/confs/0375 index 06b16f383..164f32788 100644 --- a/test/confs/0375 +++ b/test/confs/0375 @@ -114,6 +114,7 @@ ut4: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost max_rcpt = 1 disable_logging @@ -124,6 +125,7 @@ ut5: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost max_rcpt = 1 disable_logging @@ -135,6 +137,7 @@ ut6: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost max_rcpt = 1 disable_logging diff --git a/test/confs/0376 b/test/confs/0376 index e3a158f7e..7679a649f 100644 --- a/test/confs/0376 +++ b/test/confs/0376 @@ -70,6 +70,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0388 b/test/confs/0388 index 9a7be305d..03a8bd853 100644 --- a/test/confs/0388 +++ b/test/confs/0388 @@ -31,6 +31,7 @@ smtp: driver = smtp hosts_max_try = 1 port = PORT_S + hosts_try_fastopen = : connect_timeout = 2s address_retry_include_sender = false diff --git a/test/confs/0392 b/test/confs/0392 index e76c86772..95feb39bd 100644 --- a/test/confs/0392 +++ b/test/confs/0392 @@ -28,9 +28,11 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : t2: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0398 b/test/confs/0398 index 9fbe1b8da..e71a01c2d 100644 --- a/test/confs/0398 +++ b/test/confs/0398 @@ -60,6 +60,7 @@ t1: t2: driver = smtp port = PORT_S + hosts_try_fastopen = : allow_localhost diff --git a/test/confs/0405 b/test/confs/0405 index edf720c48..7d8a3cea9 100644 --- a/test/confs/0405 +++ b/test/confs/0405 @@ -29,6 +29,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0413 b/test/confs/0413 index 118dbcfe9..44b0da01f 100644 --- a/test/confs/0413 +++ b/test/confs/0413 @@ -51,6 +51,7 @@ t1: hosts = 127.0.0.1 allow_localhost port = PORT_S + hosts_try_fastopen = : t2: driver = smtp @@ -58,6 +59,7 @@ t2: hosts_override allow_localhost port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0417 b/test/confs/0417 index 41c5ed975..2f3ed5df4 100644 --- a/test/confs/0417 +++ b/test/confs/0417 @@ -37,5 +37,6 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0419 b/test/confs/0419 index 39f634c63..a00621430 100644 --- a/test/confs/0419 +++ b/test/confs/0419 @@ -27,6 +27,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0425 b/test/confs/0425 index 6c9383a41..1ade85072 100644 --- a/test/confs/0425 +++ b/test/confs/0425 @@ -38,6 +38,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0426 b/test/confs/0426 index fbac9ecfd..c5b773fae 100644 --- a/test/confs/0426 +++ b/test/confs/0426 @@ -29,6 +29,7 @@ begin transports t1: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0429 b/test/confs/0429 index 49df93001..c70a9386b 100644 --- a/test/confs/0429 +++ b/test/confs/0429 @@ -24,6 +24,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost hosts_avoid_esmtp = 127.0.0.1 diff --git a/test/confs/0430 b/test/confs/0430 index 552b0d010..cca101c48 100644 --- a/test/confs/0430 +++ b/test/confs/0430 @@ -37,5 +37,6 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0431 b/test/confs/0431 index 7590fa9d4..4af033ca9 100644 --- a/test/confs/0431 +++ b/test/confs/0431 @@ -42,6 +42,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost AFFIX diff --git a/test/confs/0432 b/test/confs/0432 index e8e6e3552..aab1de468 100644 --- a/test/confs/0432 +++ b/test/confs/0432 @@ -37,6 +37,7 @@ t1: driver = smtp hosts = <; 127.0.0.1 ; port = PORT_S + hosts_try_fastopen = : allow_localhost # End diff --git a/test/confs/0434 b/test/confs/0434 index 0d77fa095..7b6ec65ad 100644 --- a/test/confs/0434 +++ b/test/confs/0434 @@ -27,6 +27,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : diff --git a/test/confs/0440 b/test/confs/0440 index 2bef8c961..fe2cef997 100644 --- a/test/confs/0440 +++ b/test/confs/0440 @@ -28,6 +28,7 @@ begin transports t1: driver = smtp port = PORT_S + hosts_try_fastopen = : transport_filter = /bin/cat diff --git a/test/confs/0447 b/test/confs/0447 index 57b992d1b..86618fbd3 100644 --- a/test/confs/0447 +++ b/test/confs/0447 @@ -36,6 +36,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost connect_timeout = 999999s diff --git a/test/confs/0450 b/test/confs/0450 index 2dff861a1..7324af64f 100644 --- a/test/confs/0450 +++ b/test/confs/0450 @@ -28,6 +28,7 @@ begin transports t1: driver = smtp hosts = 127.0.0.1 + hosts_try_fastopen = : allow_localhost port = ${if queue_running{PORT_D2}{PORT_D}}EXTRA diff --git a/test/confs/0455 b/test/confs/0455 index 390c28a95..becac26f7 100644 --- a/test/confs/0455 +++ b/test/confs/0455 @@ -39,6 +39,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : connect_timeout = 1s hosts_max_try = HOSTS_MAX_TRY diff --git a/test/confs/0461 b/test/confs/0461 index 30abd50a9..4aca116e5 100644 --- a/test/confs/0461 +++ b/test/confs/0461 @@ -37,6 +37,7 @@ begin transports t1: driver = smtp port = PORT_S + hosts_try_fastopen = : connect_timeout = 1s allow_localhost diff --git a/test/confs/0462 b/test/confs/0462 index 36d18412d..951420f11 100644 --- a/test/confs/0462 +++ b/test/confs/0462 @@ -44,6 +44,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0463 b/test/confs/0463 index 8be1d95c1..686e180e3 100644 --- a/test/confs/0463 +++ b/test/confs/0463 @@ -27,5 +27,6 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0464 b/test/confs/0464 index 21e41cb08..eb538e7ed 100644 --- a/test/confs/0464 +++ b/test/confs/0464 @@ -46,5 +46,6 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0466 b/test/confs/0466 index 880a41e33..58057269e 100644 --- a/test/confs/0466 +++ b/test/confs/0466 @@ -50,5 +50,6 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0467 b/test/confs/0467 index 147aca64e..0104face2 100644 --- a/test/confs/0467 +++ b/test/confs/0467 @@ -27,5 +27,6 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0469 b/test/confs/0469 index a008dde00..378254b5c 100644 --- a/test/confs/0469 +++ b/test/confs/0469 @@ -25,5 +25,6 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0473 b/test/confs/0473 index 6dd6b8898..8e7985302 100644 --- a/test/confs/0473 +++ b/test/confs/0473 @@ -42,5 +42,6 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0474 b/test/confs/0474 index 35b4805e5..bc07dc66c 100644 --- a/test/confs/0474 +++ b/test/confs/0474 @@ -24,6 +24,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0476 b/test/confs/0476 index fd6106b16..1db78e796 100644 --- a/test/confs/0476 +++ b/test/confs/0476 @@ -26,6 +26,7 @@ begin transports t1: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0477 b/test/confs/0477 index 04d836591..6dc192ecc 100644 --- a/test/confs/0477 +++ b/test/confs/0477 @@ -27,6 +27,7 @@ t1: driver = smtp port = PORT_S interface = 99.99.99.99 + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0478 b/test/confs/0478 index cfb9a17b1..786f6c547 100644 --- a/test/confs/0478 +++ b/test/confs/0478 @@ -27,6 +27,7 @@ begin transports t1: driver = smtp port = PORT_D + hosts_try_fastopen = : hosts = ${if !eq {$sender_host_address}{} {V4NET.0.0.2} \ {${if eq {127.0.0.1}{$local_part} {127.0.0.1} \ {${if eq {V4NET.0.0.1}{$local_part} {V4NET.0.0.1}}}}}} diff --git a/test/confs/0479 b/test/confs/0479 index bfb9b8613..d8ea0465b 100644 --- a/test/confs/0479 +++ b/test/confs/0479 @@ -35,6 +35,7 @@ t1: driver = smtp port = PORT_S hosts = 127.0.0.1 + hosts_try_fastopen = : allow_localhost connect_timeout = 1s diff --git a/test/confs/0492 b/test/confs/0492 index a939fe125..855ea31de 100644 --- a/test/confs/0492 +++ b/test/confs/0492 @@ -32,6 +32,7 @@ begin transports t1: driver = smtp hosts = 127.0.0.1 + hosts_try_fastopen = : allow_localhost t2: diff --git a/test/confs/0495 b/test/confs/0495 index 5bfec709f..dc1a394b0 100644 --- a/test/confs/0495 +++ b/test/confs/0495 @@ -64,6 +64,7 @@ t1: driver = smtp hosts = 127.0.0.1 : HOSTIPV4 port = PORT_S + hosts_try_fastopen = : allow_localhost command_timeout = 1s @@ -71,6 +72,7 @@ t2: driver = smtp hosts = V4NET.9.8.7 port = PORT_S + hosts_try_fastopen = : t3: driver = appendfile @@ -81,5 +83,6 @@ t4: driver = smtp hosts = V4NET.10.10.10 port = nonexistent + hosts_try_fastopen = : # End diff --git a/test/confs/0497 b/test/confs/0497 index 2154c3c2c..c1c866e27 100644 --- a/test/confs/0497 +++ b/test/confs/0497 @@ -30,6 +30,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost diff --git a/test/confs/0498 b/test/confs/0498 index c26f43a8a..8b84a4d05 100644 --- a/test/confs/0498 +++ b/test/confs/0498 @@ -30,6 +30,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost final_timeout = 1s diff --git a/test/confs/0499 b/test/confs/0499 index b7a0b7980..32975f45f 100644 --- a/test/confs/0499 +++ b/test/confs/0499 @@ -27,6 +27,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0504 b/test/confs/0504 index c7b0131c0..981ed16c3 100644 --- a/test/confs/0504 +++ b/test/confs/0504 @@ -35,6 +35,7 @@ t3: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost transport_filter = /non/existent/file diff --git a/test/confs/0511 b/test/confs/0511 index 1ecc19998..230971cd5 100644 --- a/test/confs/0511 +++ b/test/confs/0511 @@ -24,6 +24,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost # End diff --git a/test/confs/0512 b/test/confs/0512 index 15e424a51..7f31b9765 100644 --- a/test/confs/0512 +++ b/test/confs/0512 @@ -31,6 +31,7 @@ t1: driver = smtp hosts = 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost hosts_max_try = 1 HARDLIMIT diff --git a/test/confs/0518 b/test/confs/0518 index c413faa95..1e6dd2277 100644 --- a/test/confs/0518 +++ b/test/confs/0518 @@ -40,6 +40,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost rcpt_include_affixes @@ -47,6 +48,7 @@ t2: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost # End diff --git a/test/confs/0519 b/test/confs/0519 index e6dbb0090..98d55a2b3 100644 --- a/test/confs/0519 +++ b/test/confs/0519 @@ -25,6 +25,7 @@ t1: driver = smtp hosts = 127.0.0.1 : non-exist.test.ex port = PORT_S + hosts_try_fastopen = : allow_localhost # End diff --git a/test/confs/0525 b/test/confs/0525 index a6e429172..f4c35adc5 100644 --- a/test/confs/0525 +++ b/test/confs/0525 @@ -32,6 +32,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost data_timeout = 1s diff --git a/test/confs/0528 b/test/confs/0528 index e7313a5ca..1e9bafa27 100644 --- a/test/confs/0528 +++ b/test/confs/0528 @@ -32,6 +32,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : hosts_max_try = 20 allow_localhost diff --git a/test/confs/0531 b/test/confs/0531 index 2f72810cf..0af86b968 100644 --- a/test/confs/0531 +++ b/test/confs/0531 @@ -39,6 +39,7 @@ lmtp: allow_localhost hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : protocol = LMTP diff --git a/test/confs/0538 b/test/confs/0538 index 9081aa572..d6342bf4a 100644 --- a/test/confs/0538 +++ b/test/confs/0538 @@ -40,6 +40,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0540 b/test/confs/0540 index 7ebbdd2b4..05329af89 100644 --- a/test/confs/0540 +++ b/test/confs/0540 @@ -36,6 +36,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost helo_data = ${if eq{$domain}{yes1}{localhost}{aname}} diff --git a/test/confs/0543 b/test/confs/0543 index 88e74e58f..108119c6e 100644 --- a/test/confs/0543 +++ b/test/confs/0543 @@ -28,6 +28,7 @@ smtp: hosts_max_try = 1 allow_localhost port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0544 b/test/confs/0544 index 09949a3fa..bccfad9db 100644 --- a/test/confs/0544 +++ b/test/confs/0544 @@ -52,6 +52,7 @@ smtp: hosts = 127.0.0.1 allow_localhost port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0545 b/test/confs/0545 index a78236a4a..a78361bc4 100644 --- a/test/confs/0545 +++ b/test/confs/0545 @@ -23,6 +23,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0548 b/test/confs/0548 index a450f45c3..112952e9a 100644 --- a/test/confs/0548 +++ b/test/confs/0548 @@ -44,6 +44,7 @@ smtp: hosts = HOSTIPV4 : thishost.test.ex allow_localhost port = PORT_D + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0550 b/test/confs/0550 index caf3ceda7..16699b3ac 100644 --- a/test/confs/0550 +++ b/test/confs/0550 @@ -24,6 +24,7 @@ t1: driver = smtp hosts = 127.0.0.1 : HOSTIPV4 port = PORT_S + hosts_try_fastopen = : allow_localhost helo_data = \ ${if eq{$sending_ip_address}{127.0.0.1}{Tweedledum}{Tweedledee}} \ diff --git a/test/confs/0552 b/test/confs/0552 index c4c2f5e98..153185561 100644 --- a/test/confs/0552 +++ b/test/confs/0552 @@ -46,6 +46,7 @@ begin transports t1: driver = smtp port = PORT_D + hosts_try_fastopen = : hosts = 127.0.0.1 allow_localhost command_timeout = 2s diff --git a/test/confs/0553 b/test/confs/0553 index c9ceaa59e..92fcc0a6f 100644 --- a/test/confs/0553 +++ b/test/confs/0553 @@ -45,6 +45,7 @@ begin transports smtp: driver = smtp port = PORT_D + hosts_try_fastopen = : command_timeout = 2s diff --git a/test/confs/0554 b/test/confs/0554 index c4f240c39..e519d076d 100644 --- a/test/confs/0554 +++ b/test/confs/0554 @@ -25,6 +25,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0557 b/test/confs/0557 index 9b7dec2e6..41a614f10 100644 --- a/test/confs/0557 +++ b/test/confs/0557 @@ -36,6 +36,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : t2: driver = appendfile diff --git a/test/confs/0561 b/test/confs/0561 index 5ccf4dcc3..7095eb2e6 100644 --- a/test/confs/0561 +++ b/test/confs/0561 @@ -33,5 +33,6 @@ begin transports t1: driver = smtp port = PORT_D + hosts_try_fastopen = : # End diff --git a/test/confs/0565 b/test/confs/0565 index 0d053a080..f7accd8d0 100644 --- a/test/confs/0565 +++ b/test/confs/0565 @@ -34,11 +34,13 @@ begin transports remote_smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : allow_localhost remote_smtp_hdrs: driver = smtp port = PORT_S + hosts_try_fastopen = : allow_localhost headers_only diff --git a/test/confs/0570 b/test/confs/0570 index 962e76bb0..efaf3bccb 100644 --- a/test/confs/0570 +++ b/test/confs/0570 @@ -35,6 +35,7 @@ begin transports smtp: driver = smtp port = PORT_D + hosts_try_fastopen = : OPTION max_parallel = 1 diff --git a/test/confs/0572 b/test/confs/0572 index 23da35a09..ce621bb31 100644 --- a/test/confs/0572 +++ b/test/confs/0572 @@ -35,6 +35,7 @@ my_smtp: driver = smtp interface = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : debug_print = transport_name <$transport_name> diff --git a/test/confs/0580 b/test/confs/0580 index 54ef7ae70..6dbc06d64 100644 --- a/test/confs/0580 +++ b/test/confs/0580 @@ -37,6 +37,7 @@ begin transports t1: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0603 b/test/confs/0603 index baa3ea08c..eaf6a6b90 100644 --- a/test/confs/0603 +++ b/test/confs/0603 @@ -43,6 +43,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : # assumes that HOSTIPV4 can send to 127.0.0.1 interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}} diff --git a/test/confs/0604 b/test/confs/0604 index ec5195511..46fc8cf9c 100644 --- a/test/confs/0604 +++ b/test/confs/0604 @@ -42,6 +42,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : # assumes that HOSTIPV4 can sent to 127.0.0.1 interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}} diff --git a/test/confs/0607 b/test/confs/0607 index 03c052316..c074ce4e8 100644 --- a/test/confs/0607 +++ b/test/confs/0607 @@ -31,6 +31,7 @@ begin transports out: driver = smtp port = PORT_D + hosts_try_fastopen = : # End diff --git a/test/confs/0610 b/test/confs/0610 index 49778352f..5ce2723ae 100644 --- a/test/confs/0610 +++ b/test/confs/0610 @@ -48,6 +48,7 @@ t1: hosts = 127.0.0.1 port = PORT_D interface = 127.0.0.1 + hosts_try_fastopen = : t2: driver = smtp @@ -55,6 +56,7 @@ t2: hosts = 127.0.0.1 port = PORT_D interface = HOSTIPV4 + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/0611 b/test/confs/0611 index d3e0a47b2..84be24f05 100644 --- a/test/confs/0611 +++ b/test/confs/0611 @@ -55,6 +55,7 @@ begin transports smtp: driver = smtp port = PORT_D + hosts_try_fastopen = : max_rcpt = 1 connection_max_messages = 1 max_parallel = 2 diff --git a/test/confs/0613 b/test/confs/0613 index 5094759eb..617c65663 100644 --- a/test/confs/0613 +++ b/test/confs/0613 @@ -27,5 +27,6 @@ begin transports remote_smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/0616 b/test/confs/0616 index e710a4bc5..6fb08b395 100644 --- a/test/confs/0616 +++ b/test/confs/0616 @@ -36,5 +36,6 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0617 b/test/confs/0617 index cf5251774..625c7e372 100644 --- a/test/confs/0617 +++ b/test/confs/0617 @@ -36,5 +36,6 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/0618 b/test/confs/0618 index a461065e5..b92353397 100644 --- a/test/confs/0618 +++ b/test/confs/0618 @@ -75,6 +75,7 @@ begin transports smtp: driver = smtp event_action = ${acl {ev_log}} + hosts_try_fastopen = : bad_tpt: driver = smtp diff --git a/test/confs/0900 b/test/confs/0900 index ce6f2c379..4c824c4b4 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -106,6 +106,7 @@ remote_smtp: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost command_timeout = 2s final_timeout = 2s @@ -114,6 +115,7 @@ remote_smtp_dkim: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost command_timeout = 2s final_timeout = 2s diff --git a/test/confs/0901 b/test/confs/0901 index 67b73cd19..2e299c7dd 100644 --- a/test/confs/0901 +++ b/test/confs/0901 @@ -97,6 +97,7 @@ remote_smtp: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost command_timeout = 2s final_timeout = 2s @@ -105,6 +106,7 @@ remote_smtp_dkim: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost command_timeout = 2s final_timeout = 2s diff --git a/test/confs/0906 b/test/confs/0906 index 6df517e53..c320b2569 100644 --- a/test/confs/0906 +++ b/test/confs/0906 @@ -85,12 +85,14 @@ remote_smtp: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : allow_localhost remote_smtp_dkim: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : allow_localhost .ifdef OPT diff --git a/test/confs/1003 b/test/confs/1003 index d15a892fb..df1e48891 100644 --- a/test/confs/1003 +++ b/test/confs/1003 @@ -46,6 +46,7 @@ send_to_server1: allow_localhost hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}} port = PORT_D + hosts_try_fastopen = : interface = <; ::1 ; HOSTIPV4 send_to_server2: @@ -53,6 +54,7 @@ send_to_server2: allow_localhost hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}} port = PORT_D + hosts_try_fastopen = : interface = <; HOSTIPV6 ; HOSTIPV4 send_to_server3: @@ -60,6 +62,7 @@ send_to_server3: allow_localhost hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}} port = PORT_D + hosts_try_fastopen = : interface = <; ${if eq{0}{1}{HOSTIPV6}fail} send_to_server4: @@ -67,6 +70,7 @@ send_to_server4: allow_localhost hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}} port = PORT_D + hosts_try_fastopen = : interface = <; ${if eq{0}{1}{HOSTIPV6}{ }} send_to_server5: @@ -74,6 +78,7 @@ send_to_server5: allow_localhost hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}} port = PORT_D + hosts_try_fastopen = : interface = <; ${if send_to_server: @@ -81,6 +86,7 @@ send_to_server: allow_localhost hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}} port = PORT_D + hosts_try_fastopen = : interface = ${expand:$h_interface:} diff --git a/test/confs/1005 b/test/confs/1005 index 35767932d..1b01dc468 100644 --- a/test/confs/1005 +++ b/test/confs/1005 @@ -25,6 +25,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/1006 b/test/confs/1006 index f46fba932..5f5dfd5f3 100644 --- a/test/confs/1006 +++ b/test/confs/1006 @@ -37,6 +37,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/1008 b/test/confs/1008 index e3307044f..44c7153ff 100644 --- a/test/confs/1008 +++ b/test/confs/1008 @@ -26,6 +26,7 @@ begin transports t1: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/1009 b/test/confs/1009 index fbfa7f0c1..c8184a64e 100644 --- a/test/confs/1009 +++ b/test/confs/1009 @@ -38,6 +38,7 @@ begin transports t1: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/2000 b/test/confs/2000 index 9ca325f2a..11104b09d 100644 --- a/test/confs/2000 +++ b/test/confs/2000 @@ -48,6 +48,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : tls_certificate = DIR/aux-fixed/cert2 tls_privatekey = DIR/aux-fixed/cert2 tls_verify_certificates = DIR/aux-fixed/cert2 diff --git a/test/confs/2001 b/test/confs/2001 index 715da4bf6..d6525cae5 100644 --- a/test/confs/2001 +++ b/test/confs/2001 @@ -49,6 +49,7 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 + hosts_try_fastopen = : OPTION port = PORT_D tls_certificate = DIR/aux-fixed/cert2 diff --git a/test/confs/2007 b/test/confs/2007 index a16b9a57e..d666f6ac2 100644 --- a/test/confs/2007 +++ b/test/confs/2007 @@ -55,11 +55,13 @@ send_to_server1: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : send_to_server2: driver = smtp allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : # End diff --git a/test/confs/2008 b/test/confs/2008 index 83b30502a..1f12493c5 100644 --- a/test/confs/2008 +++ b/test/confs/2008 @@ -64,6 +64,7 @@ send_to_server1: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed send_to_server2: @@ -71,6 +72,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/2009 b/test/confs/2009 index 59139f27e..21f9f2673 100644 --- a/test/confs/2009 +++ b/test/confs/2009 @@ -54,7 +54,8 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 - hosts_avoid_tls = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : + hosts_avoid_tls = 127.0.0.1 # End diff --git a/test/confs/2010 b/test/confs/2010 index 2cedb89cf..dae45a08c 100644 --- a/test/confs/2010 +++ b/test/confs/2010 @@ -44,8 +44,9 @@ send_to_server: driver = smtp allow_localhost hosts = HOSTS - hosts_require_tls = * port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = * # ----- Retry ----- diff --git a/test/confs/2012 b/test/confs/2012 index 8fbc55595..f59b91a0c 100644 --- a/test/confs/2012 +++ b/test/confs/2012 @@ -93,8 +93,9 @@ send_to_server_failcert: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -107,8 +108,9 @@ send_to_server_retry: driver = smtp allow_localhost hosts = HOSTIPV4 : 127.0.0.1 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -122,8 +124,9 @@ send_to_server_crypt: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -137,6 +140,7 @@ send_to_server_req_fail: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -150,6 +154,7 @@ send_to_server_req_fail: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -163,6 +168,7 @@ send_to_server_req_fail: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 diff --git a/test/confs/2013 b/test/confs/2013 index 4c9fcd3e8..1a23887b3 100644 --- a/test/confs/2013 +++ b/test/confs/2013 @@ -66,8 +66,9 @@ send_to_server: allow_localhost hosts_override hosts = 127.0.0.1 - hosts_noproxy_tls = PEX port = PORT_D + hosts_try_fastopen = : + hosts_noproxy_tls = PEX tls_try_verify_hosts = : # End diff --git a/test/confs/2016 b/test/confs/2016 index b14e1f300..ead3a903b 100644 --- a/test/confs/2016 +++ b/test/confs/2016 @@ -29,6 +29,7 @@ smtp: command_timeout = 1s hosts_require_tls = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/2017 b/test/confs/2017 index a699f2d78..98fdc07ca 100644 --- a/test/confs/2017 +++ b/test/confs/2017 @@ -53,8 +53,9 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 - hosts_nopass_tls = * port = PORT_D + hosts_try_fastopen = : + hosts_nopass_tls = * # ----- Retry ----- diff --git a/test/confs/2021 b/test/confs/2021 index ccd201719..a7e89f8da 100644 --- a/test/confs/2021 +++ b/test/confs/2021 @@ -28,6 +28,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : REQUIRE TRYCLEAR diff --git a/test/confs/2025 b/test/confs/2025 index fdf1e0405..8c08abebe 100644 --- a/test/confs/2025 +++ b/test/confs/2025 @@ -45,6 +45,7 @@ send_to_server: allow_localhost hosts = HOSTIPV4 : 127.0.0.1 port = PORT_D + hosts_try_fastopen = : hosts_require_tls = HOSTIPV4 tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA\ ${if eq{$host}{HOSTIPV4} {384} {256} } diff --git a/test/confs/2026 b/test/confs/2026 index c678219db..270a0682c 100644 --- a/test/confs/2026 +++ b/test/confs/2026 @@ -63,6 +63,7 @@ t1: driver = smtp hosts = 127.0.0.1 : HOSTIPV4 port = PORT_D + hosts_try_fastopen = : allow_localhost t2: diff --git a/test/confs/2030 b/test/confs/2030 index e2ee0e223..490b35f60 100644 --- a/test/confs/2030 +++ b/test/confs/2030 @@ -53,6 +53,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_sni = fred send_to_server2: @@ -60,6 +61,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/2031 b/test/confs/2031 index 0d9bba640..af27b2ffd 100644 --- a/test/confs/2031 +++ b/test/confs/2031 @@ -65,6 +65,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_sni = fred send_to_server2: @@ -72,6 +73,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_sni = bill diff --git a/test/confs/2033 b/test/confs/2033 index 73dcde61e..15e632a57 100644 --- a/test/confs/2033 +++ b/test/confs/2033 @@ -100,8 +100,9 @@ send_to_server_failcert: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -112,8 +113,9 @@ send_to_server_retry: driver = smtp allow_localhost hosts = HOSTIPV4 : 127.0.0.1 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -125,8 +127,9 @@ send_to_server_crypt: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -140,6 +143,7 @@ send_to_server_req_fail: allow_localhost hosts = HOSTNAME port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -153,6 +157,7 @@ send_to_server_req_failname: allow_localhost hosts = HOSTNAME port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -167,6 +172,7 @@ send_to_server_req_passname: allow_localhost hosts = server1.example.com port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -181,6 +187,7 @@ send_to_server_req_failcarryon: allow_localhost hosts = HOSTNAME port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 diff --git a/test/confs/2100 b/test/confs/2100 index bce339b19..827d93811 100644 --- a/test/confs/2100 +++ b/test/confs/2100 @@ -49,6 +49,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : tls_certificate = DIR/aux-fixed/cert2 tls_privatekey = DIR/aux-fixed/cert2 tls_verify_certificates = DIR/aux-fixed/cert2 diff --git a/test/confs/2101 b/test/confs/2101 index a0e1fe46f..32c309677 100644 --- a/test/confs/2101 +++ b/test/confs/2101 @@ -46,6 +46,7 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 + hosts_try_fastopen = : OPTION port = PORT_D tls_certificate = DIR/aux-fixed/cert2 diff --git a/test/confs/2107 b/test/confs/2107 index 9487445cc..5cf1dc373 100644 --- a/test/confs/2107 +++ b/test/confs/2107 @@ -54,11 +54,13 @@ send_to_server1: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : send_to_server2: driver = smtp allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : # End diff --git a/test/confs/2108 b/test/confs/2108 index 9b926bf6e..5db771d13 100644 --- a/test/confs/2108 +++ b/test/confs/2108 @@ -62,6 +62,7 @@ send_to_server1: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed send_to_server2: @@ -69,6 +70,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/2109 b/test/confs/2109 index 8703d1967..3f1465fa2 100644 --- a/test/confs/2109 +++ b/test/confs/2109 @@ -54,7 +54,8 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 - hosts_avoid_tls = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : + hosts_avoid_tls = 127.0.0.1 # End diff --git a/test/confs/2110 b/test/confs/2110 index 72754a6d9..cc4a7f032 100644 --- a/test/confs/2110 +++ b/test/confs/2110 @@ -43,8 +43,9 @@ send_to_server: driver = smtp allow_localhost hosts = HOSTS - hosts_require_tls = * port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = * # ----- Retry ----- diff --git a/test/confs/2111 b/test/confs/2111 index b54c9490d..42458efba 100644 --- a/test/confs/2111 +++ b/test/confs/2111 @@ -46,8 +46,9 @@ send_to_server: driver = smtp allow_localhost hosts = HOSTIPV4 : 127.0.0.1 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = DIR/aux-fixed/cert2 tls_privatekey = DIR/aux-fixed/cert2 tls_require_ciphers = IDEA-CBC-MD5:\ diff --git a/test/confs/2112 b/test/confs/2112 index 005925e11..2b3f33ed3 100644 --- a/test/confs/2112 +++ b/test/confs/2112 @@ -93,8 +93,9 @@ send_to_server_failcert: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -107,8 +108,9 @@ send_to_server_retry: driver = smtp allow_localhost hosts = HOSTIPV4 : 127.0.0.1 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -122,8 +124,9 @@ send_to_server_crypt: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -137,6 +140,7 @@ send_to_server_req_fail: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -150,6 +154,7 @@ send_to_server_req_failname: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -163,6 +168,7 @@ send_to_server_req_passname: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 diff --git a/test/confs/2113 b/test/confs/2113 index f48e618d3..eb9d2b487 100644 --- a/test/confs/2113 +++ b/test/confs/2113 @@ -66,8 +66,9 @@ send_to_server: allow_localhost hosts_override hosts = 127.0.0.1 - hosts_noproxy_tls = PEX port = PORT_D + hosts_try_fastopen = : + hosts_noproxy_tls = PEX tls_try_verify_hosts = : # End diff --git a/test/confs/2116 b/test/confs/2116 index d57d3a112..77a671261 100644 --- a/test/confs/2116 +++ b/test/confs/2116 @@ -27,8 +27,9 @@ begin transports smtp: driver = smtp command_timeout = 1s - hosts_require_tls = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : + hosts_require_tls = 127.0.0.1 # ----- Retry ----- diff --git a/test/confs/2117 b/test/confs/2117 index b6a557667..cdec8306b 100644 --- a/test/confs/2117 +++ b/test/confs/2117 @@ -53,9 +53,10 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 - hosts_nopass_tls = * port = PORT_D + hosts_try_fastopen = : tls_try_verify_hosts = : + hosts_nopass_tls = * # ----- Retry ----- diff --git a/test/confs/2120 b/test/confs/2120 index 1288d7f12..9469cb738 100644 --- a/test/confs/2120 +++ b/test/confs/2120 @@ -36,6 +36,7 @@ t1: hosts = thishost.test.ex allow_localhost port = PORT_D + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/2121 b/test/confs/2121 index 573ea379a..6dcaa0577 100644 --- a/test/confs/2121 +++ b/test/confs/2121 @@ -28,6 +28,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : REQUIRE TRYCLEAR diff --git a/test/confs/2125 b/test/confs/2125 index 589879133..3591c8653 100644 --- a/test/confs/2125 +++ b/test/confs/2125 @@ -48,9 +48,10 @@ send_to_server: driver = smtp allow_localhost hosts = HOSTIPV4 : 127.0.0.1 + port = PORT_D hosts_require_tls = HOSTIPV4 tls_require_ciphers = AES128-SHA - port = PORT_D + hosts_try_fastopen = : tls_try_verify_hosts = : diff --git a/test/confs/2126 b/test/confs/2126 index 9f0af7cf6..cb448134f 100644 --- a/test/confs/2126 +++ b/test/confs/2126 @@ -51,6 +51,7 @@ t1: driver = smtp hosts = 127.0.0.1 : HOSTIPV4 port = PORT_D + hosts_try_fastopen = : allow_localhost tls_try_verify_hosts = : diff --git a/test/confs/2127 b/test/confs/2127 index 9807ccf11..65e1901f6 100644 --- a/test/confs/2127 +++ b/test/confs/2127 @@ -55,6 +55,7 @@ send_to_server: allow_localhost hosts = ${if eq{$local_part}{userx}{127.0.0.1}{HOSTIPV4}} port = PORT_D + hosts_try_fastopen = : tls_try_verify_hosts = : # End diff --git a/test/confs/2130 b/test/confs/2130 index 379d2c98a..4afded1cf 100644 --- a/test/confs/2130 +++ b/test/confs/2130 @@ -53,6 +53,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_sni = fred tls_try_verify_hosts = : @@ -61,6 +62,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_try_verify_hosts = : diff --git a/test/confs/2131 b/test/confs/2131 index 43db2ac1c..243fc092c 100644 --- a/test/confs/2131 +++ b/test/confs/2131 @@ -65,6 +65,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_sni = fred hosts_require_tls = * tls_try_verify_hosts = : @@ -74,6 +75,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_sni = bill hosts_require_tls = * tls_try_verify_hosts = : diff --git a/test/confs/2133 b/test/confs/2133 index e58a0c65c..463e614ca 100644 --- a/test/confs/2133 +++ b/test/confs/2133 @@ -101,8 +101,9 @@ send_to_server_failcert: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -113,8 +114,9 @@ send_to_server_retry: driver = smtp allow_localhost hosts = HOSTIPV4 : 127.0.0.1 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -126,8 +128,9 @@ send_to_server_crypt: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_certificate = CERT2 tls_privatekey = CERT2 @@ -141,6 +144,7 @@ send_to_server_req_fail: allow_localhost hosts = HOSTNAME port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -154,6 +158,7 @@ send_to_server_req_failname: allow_localhost hosts = HOSTNAME port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -168,6 +173,7 @@ send_to_server_req_passname: allow_localhost hosts = server1.example.com port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 @@ -180,6 +186,7 @@ send_to_server_req_failcarryon: allow_localhost hosts = HOSTNAME port = PORT_D + hosts_try_fastopen = : tls_certificate = CERT2 tls_privatekey = CERT2 diff --git a/test/confs/2135 b/test/confs/2135 index f7f225746..4625f759d 100644 --- a/test/confs/2135 +++ b/test/confs/2135 @@ -67,6 +67,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = : diff --git a/test/confs/2138 b/test/confs/2138 index 7fec82541..d5dba1b3f 100644 --- a/test/confs/2138 +++ b/test/confs/2138 @@ -57,8 +57,9 @@ local_delivery: send_to_server: driver = smtp allow_localhost - hosts_noproxy_tls = : port = PORT_D + hosts_try_fastopen = : + hosts_noproxy_tls = : tls_try_verify_hosts = : max_rcpt = 1 diff --git a/test/confs/2149 b/test/confs/2149 index 072e8e438..ee48a51b3 100644 --- a/test/confs/2149 +++ b/test/confs/2149 @@ -50,6 +50,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : tls_try_verify_hosts = : # End diff --git a/test/confs/2151 b/test/confs/2151 index f64cdd50e..1e40a83ae 100644 --- a/test/confs/2151 +++ b/test/confs/2151 @@ -39,5 +39,6 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/2152 b/test/confs/2152 index f783192bd..a5acff047 100644 --- a/test/confs/2152 +++ b/test/confs/2152 @@ -53,6 +53,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/cert1 tls_verify_cert_hostnames = : @@ -61,6 +62,7 @@ send_to_server_v: allow_localhost hosts = 127.0.0.1 port = PORT_D2 + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/cert1 tls_verify_cert_hostnames = : diff --git a/test/confs/2201 b/test/confs/2201 index dce78ed7a..4ce79253d 100644 --- a/test/confs/2201 +++ b/test/confs/2201 @@ -75,6 +75,7 @@ remote_delivery: hosts = 127.0.0.1 allow_localhost port = PORT_D + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/3207 b/test/confs/3207 index 6880dcf90..bf8d1d4c5 100644 --- a/test/confs/3207 +++ b/test/confs/3207 @@ -82,6 +82,7 @@ local_delivery: smtp: driver = smtp + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/3209 b/test/confs/3209 index d5a442ddb..fff1f374f 100644 --- a/test/confs/3209 +++ b/test/confs/3209 @@ -28,6 +28,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : connect_timeout = 1s diff --git a/test/confs/3401 b/test/confs/3401 index afcd48251..401d5cfa5 100644 --- a/test/confs/3401 +++ b/test/confs/3401 @@ -55,14 +55,16 @@ begin transports smtp_try: driver = smtp - hosts_try_auth = * port = PORT_S + hosts_try_fastopen = : + hosts_try_auth = * authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail} smtp_force: driver = smtp - hosts_require_auth = * port = PORT_S + hosts_try_fastopen = : + hosts_require_auth = * # ----- Retry ----- diff --git a/test/confs/3404 b/test/confs/3404 index a76581de2..73cb524b0 100644 --- a/test/confs/3404 +++ b/test/confs/3404 @@ -43,8 +43,9 @@ begin transports smtp: driver = smtp - hosts_try_auth = * port = PORT_S + hosts_try_fastopen = : + hosts_try_auth = * # ----- Retry ----- diff --git a/test/confs/3405 b/test/confs/3405 index e9c7b7ea3..9f37f016b 100644 --- a/test/confs/3405 +++ b/test/confs/3405 @@ -37,8 +37,9 @@ begin transports smtp: driver = smtp + port = PORT_S + hosts_try_fastopen = : headers_add = X-TAID: >$authenticated_id< hosts_try_auth = * - port = PORT_S # End diff --git a/test/confs/3412 b/test/confs/3412 index c0a1c5509..528494356 100644 --- a/test/confs/3412 +++ b/test/confs/3412 @@ -44,6 +44,7 @@ smtp: allow_localhost hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : hosts_try_auth = * # End diff --git a/test/confs/3416 b/test/confs/3416 index 930a2240f..eebb132f3 100644 --- a/test/confs/3416 +++ b/test/confs/3416 @@ -51,6 +51,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost hosts_try_auth = * @@ -58,6 +59,7 @@ t2: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost hosts_try_auth = * authenticated_sender= brian diff --git a/test/confs/3451 b/test/confs/3451 index c3f07b948..160f9e086 100644 --- a/test/confs/3451 +++ b/test/confs/3451 @@ -69,8 +69,9 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : hosts_try_auth = * hosts_noproxy_tls = PEX - port = PORT_D # End diff --git a/test/confs/3452 b/test/confs/3452 index 5971c0804..108d93edc 100644 --- a/test/confs/3452 +++ b/test/confs/3452 @@ -67,8 +67,9 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 - hosts_try_auth = * port = PORT_D + hosts_try_fastopen = : + hosts_try_auth = * # ----- Retry ----- diff --git a/test/confs/3455 b/test/confs/3455 index bfa30b445..591d5de37 100644 --- a/test/confs/3455 +++ b/test/confs/3455 @@ -61,6 +61,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : hosts_avoid_tls = HOSTS_AVOID_TLS hosts_require_auth = * allow_localhost diff --git a/test/confs/3461 b/test/confs/3461 index a01a8b20e..35c2a17b2 100644 --- a/test/confs/3461 +++ b/test/confs/3461 @@ -69,9 +69,10 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : hosts_try_auth = * hosts_noproxy_tls = PEX - port = PORT_D tls_try_verify_hosts = : # End diff --git a/test/confs/3462 b/test/confs/3462 index 33fabbc04..3f8c401de 100644 --- a/test/confs/3462 +++ b/test/confs/3462 @@ -67,8 +67,9 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 - hosts_try_auth = * port = PORT_D + hosts_try_fastopen = : + hosts_try_auth = * tls_try_verify_hosts = : diff --git a/test/confs/3465 b/test/confs/3465 index dfe6b9921..0d97a3a7f 100644 --- a/test/confs/3465 +++ b/test/confs/3465 @@ -61,6 +61,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : hosts_avoid_tls = HOSTS_AVOID_TLS tls_try_verify_hosts = : hosts_require_auth = * diff --git a/test/confs/3501 b/test/confs/3501 index c63e76739..b283a2d0d 100644 --- a/test/confs/3501 +++ b/test/confs/3501 @@ -43,14 +43,16 @@ begin transports smtp_try: driver = smtp - hosts_try_auth = * port = PORT_S + hosts_try_fastopen = : + hosts_try_auth = * authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail} smtp_force: driver = smtp - hosts_require_auth = * port = PORT_S + hosts_try_fastopen = : + hosts_require_auth = * # ----- Retry ----- diff --git a/test/confs/3600 b/test/confs/3600 index f6d4f8605..e95567637 100644 --- a/test/confs/3600 +++ b/test/confs/3600 @@ -63,6 +63,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : allow_localhost hosts_require_auth = * diff --git a/test/confs/3700 b/test/confs/3700 index 6578ecb2d..39e3bcece 100644 --- a/test/confs/3700 +++ b/test/confs/3700 @@ -76,6 +76,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : allow_localhost tls_certificate = DIR/aux-fixed/cert2 tls_verify_certificates = DIR/aux-fixed/cert1 @@ -85,6 +86,7 @@ t2: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : protocol = smtps allow_localhost tls_certificate = DIR/aux-fixed/cert2 diff --git a/test/confs/3720 b/test/confs/3720 index 6d8c46730..53a68d31e 100644 --- a/test/confs/3720 +++ b/test/confs/3720 @@ -79,6 +79,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : allow_localhost tls_certificate = DIR/aux-fixed/cert2 tls_verify_certificates = DIR/aux-fixed/cert1 diff --git a/test/confs/4028 b/test/confs/4028 index 4a1f682a9..16f464cd5 100644 --- a/test/confs/4028 +++ b/test/confs/4028 @@ -48,6 +48,7 @@ begin transports my_smtp: driver = smtp port = PORT_D + hosts_try_fastopen = : socks_proxy = 127.0.0.1 port=1080 OPT tls_certificate = DIR/aux-fixed/cert2 tls_privatekey = DIR/aux-fixed/cert2 diff --git a/test/confs/4029 b/test/confs/4029 index 467d74d8d..119f8ce55 100644 --- a/test/confs/4029 +++ b/test/confs/4029 @@ -48,6 +48,7 @@ begin transports my_smtp: driver = smtp port = PORT_D + hosts_try_fastopen = : socks_proxy = 127.0.0.1 port=1080 OPT tls_certificate = DIR/aux-fixed/cert2 tls_privatekey = DIR/aux-fixed/cert2 diff --git a/test/confs/4201 b/test/confs/4201 index 17afe9f78..8ded6c27c 100644 --- a/test/confs/4201 +++ b/test/confs/4201 @@ -124,6 +124,7 @@ local_delivery: rmt_smtp: driver = smtp + hosts_try_fastopen = : .ifdef STRICT utf8_downconvert = STRICT .endif diff --git a/test/confs/4211 b/test/confs/4211 index bcd5a4fd1..e68111eb7 100644 --- a/test/confs/4211 +++ b/test/confs/4211 @@ -115,6 +115,7 @@ local_delivery: rmt_smtp: driver = smtp + hosts_try_fastopen = : hosts_require_tls = * tls_try_verify_hosts = : diff --git a/test/confs/4221 b/test/confs/4221 index bcd5a4fd1..e68111eb7 100644 --- a/test/confs/4221 +++ b/test/confs/4221 @@ -115,6 +115,7 @@ local_delivery: rmt_smtp: driver = smtp + hosts_try_fastopen = : hosts_require_tls = * tls_try_verify_hosts = : diff --git a/test/confs/4500 b/test/confs/4500 index 502de4a19..c7335327e 100644 --- a/test/confs/4500 +++ b/test/confs/4500 @@ -13,6 +13,7 @@ acl_smtp_dkim = check_dkim acl_smtp_data = check_data log_selector = +dkim_verbose +dkim_verify_hashes = sha256 : sha512 : sha1 queue_only queue_run_in_order diff --git a/test/confs/4520 b/test/confs/4520 index 1f3162342..3f49ca996 100644 --- a/test/confs/4520 +++ b/test/confs/4520 @@ -45,6 +45,7 @@ send_to_server: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : dkim_domain = test.ex .ifdef SELECTOR diff --git a/test/confs/4525 b/test/confs/4525 index f6a0258a7..e11456cd2 100644 --- a/test/confs/4525 +++ b/test/confs/4525 @@ -68,6 +68,7 @@ send_to_server: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : .ifdef FILTER transport_filter = /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter diff --git a/test/confs/4550 b/test/confs/4550 index 15178f363..4b596f300 100644 --- a/test/confs/4550 +++ b/test/confs/4550 @@ -49,6 +49,7 @@ send_to_server: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : dkim_domain = ${if def:sender_address_local_part {test.ex}} dkim_selector = sel diff --git a/test/confs/4620 b/test/confs/4620 new file mode 100644 index 000000000..5b1175a53 --- /dev/null +++ b/test/confs/4620 @@ -0,0 +1,87 @@ +# Exim test configuration 4620 + +.include DIR/aux-var/std_conf_prefix + +SRS_SECRET = mysecret + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +domainlist local_domains = test.ex +domainlist remotesite_domains = remote.ex + +log_selector = +all_parents +received_recipients +queue_only + +# ----- Routers ----- + +begin routers + +remote_bouncer: + driver = redirect + condition = ${if eq {$sender_host_address}{127.0.0.1}} + data = :fail: account disabled + allow_fail + +external: + driver = manualroute + domains = !+local_domains + route_list = remote.ex 127.0.0.1::PORT_S + self = send + transport = ${if eq {$local_part@$domain} {$original_local_part@$original_domain} \ + {to_external} {forwarded_external}} + +inbound_srs: + driver = redirect + senders = : + domains = +local_domains + # detect inbound bounces which are SRS'd, and decode them + condition = ${if inbound_srs {$local_part} {SRS_SECRET}} + data = $srs_recipient + +inbound_srs_failure: + driver = redirect + senders = : + domains = +local_domains + # detect inbound bounces which look SRS'd but are invalid + condition = ${if inbound_srs {$local_part} {}} + allow_fail + data = :fail: Invalid SRS recipient address + + +local_redirect: + driver = redirect + local_parts = redirect + data = remote_user@remote.ex + +local: + driver = accept + transport = appendfile + + +# ----- Transports ----- + +begin transports + +to_external: + driver = smtp + +forwarded_external: + driver = smtp + max_rcpt = 1 + return_path = ${srs_encode {SRS_SECRET} {$return_path} {$original_domain}} + + +appendfile: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER + +# ----- Retry ----- + +begin retry + +* * F,5d,1d + +# End diff --git a/test/confs/4700 b/test/confs/4700 index 96f3beac1..86d8b6d8d 100644 --- a/test/confs/4700 +++ b/test/confs/4700 @@ -48,6 +48,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : local_delivery: driver = appendfile diff --git a/test/confs/4800 b/test/confs/4800 index 876e81d94..f342f2822 100644 --- a/test/confs/4800 +++ b/test/confs/4800 @@ -12,3 +12,4 @@ begin routers begin transports smtp: driver = smtp + hosts_try_fastopen = : diff --git a/test/confs/4801 b/test/confs/4801 index 9a09b0289..5241ad3fa 100644 --- a/test/confs/4801 +++ b/test/confs/4801 @@ -12,3 +12,4 @@ begin routers begin transports smtp: driver = smtp + hosts_try_fastopen = : diff --git a/test/confs/4802 b/test/confs/4802 index b37eba738..47e2e6e5e 100644 --- a/test/confs/4802 +++ b/test/confs/4802 @@ -12,3 +12,4 @@ begin routers begin transports smtp: driver = smtp + hosts_try_fastopen = : diff --git a/test/confs/4803 b/test/confs/4803 index bb2afffad..41381a47f 100644 --- a/test/confs/4803 +++ b/test/confs/4803 @@ -13,3 +13,4 @@ begin routers begin transports smtp: driver = smtp + hosts_try_fastopen = : diff --git a/test/confs/4804 b/test/confs/4804 index a891d14dc..1513d4688 100644 --- a/test/confs/4804 +++ b/test/confs/4804 @@ -40,5 +40,6 @@ begin transports send_to_server: driver = smtp port = PORT_D + hosts_try_fastopen = : # End diff --git a/test/confs/4950 b/test/confs/4950 index 6ddee035e..c4395b514 100644 --- a/test/confs/4950 +++ b/test/confs/4950 @@ -32,6 +32,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/5204 b/test/confs/5204 index 5f379b8f1..e81c58e98 100644 --- a/test/confs/5204 +++ b/test/confs/5204 @@ -51,9 +51,11 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = : other_smtp: driver = smtp + hosts_try_fastopen = : null: driver = appendfile diff --git a/test/confs/5205 b/test/confs/5205 index efa2de121..4eeee7000 100644 --- a/test/confs/5205 +++ b/test/confs/5205 @@ -27,5 +27,6 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/5206 b/test/confs/5206 index 37e89e65f..27aff6eba 100644 --- a/test/confs/5206 +++ b/test/confs/5206 @@ -29,6 +29,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/5208 b/test/confs/5208 index e32dcfc94..988183b36 100644 --- a/test/confs/5208 +++ b/test/confs/5208 @@ -28,5 +28,6 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # End diff --git a/test/confs/5300 b/test/confs/5300 index 1ba89388b..165e0ea08 100644 --- a/test/confs/5300 +++ b/test/confs/5300 @@ -19,6 +19,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # ----- Routers ----- diff --git a/test/confs/5301 b/test/confs/5301 index f727ebca0..7bc161d61 100644 --- a/test/confs/5301 +++ b/test/confs/5301 @@ -20,6 +20,7 @@ begin transports t1: driver = smtp + hosts_try_fastopen = : # ----- Routers ----- diff --git a/test/confs/5400 b/test/confs/5400 index 980e02a48..9693818b1 100644 --- a/test/confs/5400 +++ b/test/confs/5400 @@ -65,12 +65,14 @@ smtp: driver = smtp interface = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}} smtp2: driver = smtp interface = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/5401 b/test/confs/5401 index 0d93fe5bc..2b1a4c43e 100644 --- a/test/confs/5401 +++ b/test/confs/5401 @@ -40,6 +40,7 @@ smtp: driver = smtp interface = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/5402 b/test/confs/5402 index 0984e0cc9..92c563230 100644 --- a/test/confs/5402 +++ b/test/confs/5402 @@ -42,6 +42,7 @@ smtp: driver = smtp interface = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/5403 b/test/confs/5403 index a4576a5aa..a95334bc5 100644 --- a/test/confs/5403 +++ b/test/confs/5403 @@ -53,12 +53,14 @@ smtp: driver = smtp interface = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}} smtp2: driver = smtp interface = HOSTIPV4 port = PORT_S + hosts_try_fastopen = : # End diff --git a/test/confs/5410 b/test/confs/5410 index 96ec87496..e00234363 100644 --- a/test/confs/5410 +++ b/test/confs/5410 @@ -47,6 +47,7 @@ smtp: driver = smtp interface = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : hosts_avoid_tls = ${if eq {$address_data}{usery}{*}{:}} hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}} tls_try_verify_hosts = : diff --git a/test/confs/5420 b/test/confs/5420 index 44a1fdee4..488000e7a 100644 --- a/test/confs/5420 +++ b/test/confs/5420 @@ -47,6 +47,7 @@ smtp: driver = smtp interface = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : hosts_avoid_tls = ${if eq {$address_data}{usery}{*}{:}} hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}} diff --git a/test/confs/5510 b/test/confs/5510 index ab42b242e..9c01e63a7 100644 --- a/test/confs/5510 +++ b/test/confs/5510 @@ -37,6 +37,7 @@ t1: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost hosts_try_prdr = * diff --git a/test/confs/5601 b/test/confs/5601 index 9b33101b3..fdd3d80df 100644 --- a/test/confs/5601 +++ b/test/confs/5601 @@ -94,6 +94,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -107,6 +108,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -120,6 +122,7 @@ send_to_server3: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = @@ -134,6 +137,7 @@ send_to_server4: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = diff --git a/test/confs/5611 b/test/confs/5611 index 0b2be46a1..9ba6350cc 100644 --- a/test/confs/5611 +++ b/test/confs/5611 @@ -94,6 +94,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -107,6 +108,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -120,6 +122,7 @@ send_to_server3: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = @@ -134,6 +137,7 @@ send_to_server4: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = diff --git a/test/confs/5651 b/test/confs/5651 index 01fa45524..1e3ed5a1e 100644 --- a/test/confs/5651 +++ b/test/confs/5651 @@ -92,6 +92,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -105,6 +106,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -118,6 +120,7 @@ send_to_server3: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem @@ -134,6 +137,7 @@ send_to_server4: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem diff --git a/test/confs/5665 b/test/confs/5665 index da6e5197a..673ec6656 100644 --- a/test/confs/5665 +++ b/test/confs/5665 @@ -74,6 +74,7 @@ begin transports remote_delivery: driver = smtp port = PORT_D + hosts_try_fastopen = : hosts_require_tls = * .ifdef _HAVE_GNUTLS tls_require_ciphers = NONE:\ diff --git a/test/confs/5700 b/test/confs/5700 index 774e76605..758d7d16a 100644 --- a/test/confs/5700 +++ b/test/confs/5700 @@ -43,6 +43,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : command_timeout = 1s final_timeout = 1s event_action = ${acl {logger}} diff --git a/test/confs/5702 b/test/confs/5702 index dfc063fa7..e796406c8 100644 --- a/test/confs/5702 +++ b/test/confs/5702 @@ -38,6 +38,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : event_action = ${acl {logger}} # End diff --git a/test/confs/5703 b/test/confs/5703 index 267f5fc8d..becd0050c 100644 --- a/test/confs/5703 +++ b/test/confs/5703 @@ -38,6 +38,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : event_action = ${acl {logger}} # End diff --git a/test/confs/5710 b/test/confs/5710 index 85293a566..f6b97945f 100644 --- a/test/confs/5710 +++ b/test/confs/5710 @@ -95,6 +95,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : tls_certificate = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key diff --git a/test/confs/5720 b/test/confs/5720 index 906266290..2c0e327ce 100644 --- a/test/confs/5720 +++ b/test/confs/5720 @@ -95,6 +95,7 @@ send_to_server: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : tls_certificate = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key diff --git a/test/confs/5730 b/test/confs/5730 index 2b32008d4..c7d07bf3c 100644 --- a/test/confs/5730 +++ b/test/confs/5730 @@ -100,6 +100,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -114,6 +115,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -128,6 +130,7 @@ send_to_server3: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem @@ -145,6 +148,7 @@ send_to_server4: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem diff --git a/test/confs/5740 b/test/confs/5740 index 53302c507..60c175b53 100644 --- a/test/confs/5740 +++ b/test/confs/5740 @@ -102,6 +102,7 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -115,6 +116,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = hosts_require_tls = * @@ -128,6 +130,7 @@ send_to_server3: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = @@ -142,6 +145,7 @@ send_to_server4: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem tls_verify_cert_hostnames = diff --git a/test/confs/5820 b/test/confs/5820 index b038558de..76dc75efe 100644 --- a/test/confs/5820 +++ b/test/confs/5820 @@ -66,6 +66,7 @@ send_to_server: driver = smtp allow_localhost port = PORT_D + hosts_try_fastopen = : hosts_try_dane = CONTROL hosts_require_dane = HOSTIPV4 diff --git a/test/confs/5840 b/test/confs/5840 index bda328a97..5852ef2c0 100644 --- a/test/confs/5840 +++ b/test/confs/5840 @@ -71,6 +71,7 @@ send_to_server: driver = smtp allow_localhost port = PORT_D + hosts_try_fastopen = : hosts_try_dane = CONTROL hosts_require_dane = HOSTIPV4 diff --git a/test/confs/5860 b/test/confs/5860 index df9115129..bef70dd18 100644 --- a/test/confs/5860 +++ b/test/confs/5860 @@ -61,6 +61,7 @@ send_to_server: driver = smtp allow_localhost port = PORT_D + hosts_try_fastopen = : # hosts_try_dane = * hosts_require_dane = * diff --git a/test/confs/5861 b/test/confs/5861 index 93e2bb715..68c790ef6 100644 --- a/test/confs/5861 +++ b/test/confs/5861 @@ -75,6 +75,7 @@ send_to_server: driver = smtp allow_localhost port = PORT_D + hosts_try_fastopen = : hosts_try_dane = * hosts_require_dane = HOSTIPV4 diff --git a/test/confs/5880 b/test/confs/5880 index 4becdd423..ef7c59445 100644 --- a/test/confs/5880 +++ b/test/confs/5880 @@ -61,6 +61,7 @@ send_to_server: driver = smtp allow_localhost port = PORT_D + hosts_try_fastopen = : # hosts_try_dane = * hosts_require_dane = * diff --git a/test/confs/5890 b/test/confs/5890 index f1aa9a2ae..5b154e5db 100644 --- a/test/confs/5890 +++ b/test/confs/5890 @@ -100,6 +100,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = CDIR/CA/CA.pem tls_verify_cert_hostnames = : event_action = ${acl {log_resumption}} diff --git a/test/confs/5891 b/test/confs/5891 index 190ce2537..e0f824357 100644 --- a/test/confs/5891 +++ b/test/confs/5891 @@ -100,6 +100,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = CDIR/CA/CA.pem tls_verify_cert_hostnames = : event_action = ${acl {log_resumption}} diff --git a/test/confs/9900 b/test/confs/9900 index c042cd39a..0f25f2918 100644 --- a/test/confs/9900 +++ b/test/confs/9900 @@ -26,6 +26,7 @@ begin transports smtp: driver = smtp port = PORT_S + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/confs/9901 b/test/confs/9901 index 23ea43fef..a33223b05 100644 --- a/test/confs/9901 +++ b/test/confs/9901 @@ -47,6 +47,7 @@ t1: hosts = 127.0.0.1 hosts_override port = PORT_D + hosts_try_fastopen = : t2: driver = appendfile diff --git a/test/confs/9903 b/test/confs/9903 index 7ef2c620a..6f79e360e 100644 --- a/test/confs/9903 +++ b/test/confs/9903 @@ -26,6 +26,7 @@ smtp: port = PORT_S hosts = 127.0.0.1 allow_localhost + hosts_try_fastopen = : # ----- Retry ----- diff --git a/test/log/0076 b/test/log/0076 index 309897cc4..7167206fc 100644 --- a/test/log/0076 +++ b/test/log/0076 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=localuser T=local_delivery defer (2): No such file or directory: creating lock file hitching post TESTSUITE/test-mail/subdir/userx.lock.test.ex.dddddddd.pppppppp (euid=CALLER_UID egid=CALLER_GID) +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=localuser T=local_delivery defer (EEE): No such file or directory: creating lock file hitching post TESTSUITE/test-mail/subdir/userx.lock.test.ex.dddddddd.pppppppp (euid=CALLER_UID egid=CALLER_GID) diff --git a/test/log/0107 b/test/log/0107 index 6ff8b61e4..8e9b58607 100644 --- a/test/log/0107 +++ b/test/log/0107 @@ -3,5 +3,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@test.ex R=mboxuser T=appendfile defer (-34): mailbox TESTSUITE/test-mail/../test-empty/usery does not exist, but creation outside the home directory is not permitted 1999-03-02 09:44:33 10HmaX-0005vi-00 => userz <userz@test.ex> R=mboxuser T=appendfile 1999-03-02 09:44:33 10HmaX-0005vi-00 => sub1 <sub1@test.ex> R=mboxuser T=appendfile -1999-03-02 09:44:33 10HmaX-0005vi-00 == sub2@test.ex R=mboxuser T=appendfile defer (2): No such file or directory: creating lock file hitching post TESTSUITE/test-empty/s/sub2.lock.test.ex.dddddddd.pppppppp (euid=CALLER_UID egid=CALLER_GID) +1999-03-02 09:44:33 10HmaX-0005vi-00 == sub2@test.ex R=mboxuser T=appendfile defer (EEE): No such file or directory: creating lock file hitching post TESTSUITE/test-empty/s/sub2.lock.test.ex.dddddddd.pppppppp (euid=CALLER_UID egid=CALLER_GID) 1999-03-02 09:44:33 10HmaX-0005vi-00 == sub3@test.ex R=mboxuser T=appendfile defer (-34): mailbox TESTSUITE/test-mail/link/sub3 does not exist, but creation outside the home directory is not permitted diff --git a/test/log/0128 b/test/log/0128 index f4abae8f1..cd115ce45 100644 --- a/test/log/0128 +++ b/test/log/0128 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=reply T=reply defer (0): Failed to open DBM file TESTSUITE/spool when sending message from reply transport: Is a directory +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=reply T=reply defer (EEE): Is a directory: Failed to open DBM file TESTSUITE/spool when sending message from reply transport: Is a directory diff --git a/test/log/0132 b/test/log/0132 index 1b6a61bca..751fdbc52 100644 --- a/test/log/0132 +++ b/test/log/0132 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=local T=appendfile defer (6): Error: while opening named pipe TESTSUITE/test-fifo (could mean no process is reading it) +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=local T=appendfile defer (EEE): Error: while opening named pipe TESTSUITE/test-fifo (could mean no process is reading it) diff --git a/test/log/0158 b/test/log/0158 index def23697d..33cf16a9e 100644 --- a/test/log/0158 +++ b/test/log/0158 @@ -5,6 +5,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@test.ex R=caller T=local_delivery defer (-1) 1999-03-02 09:44:33 10HmaX-0005vi-00 Frozen 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 == EXIMUSER@test.ex R=caller T=local_delivery defer (13): Permission denied: creating lock file hitching post TESTSUITE/test-mail/EXIMUSER.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) +1999-03-02 09:44:33 10HmaY-0005vi-00 == EXIMUSER@test.ex R=caller T=local_delivery defer (EEE): Permission denied: creating lock file hitching post TESTSUITE/test-mail/EXIMUSER.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaZ-0005vi-00 == EXIMUSER@test.ex R=caller T=local_delivery defer (13): Permission denied: creating lock file hitching post TESTSUITE/test-mail/EXIMUSER.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) +1999-03-02 09:44:33 10HmaZ-0005vi-00 == EXIMUSER@test.ex R=caller T=local_delivery defer (EEE): Permission denied: creating lock file hitching post TESTSUITE/test-mail/EXIMUSER.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) diff --git a/test/log/0224 b/test/log/0224 index 515a1f9d5..a03b4cd9b 100644 --- a/test/log/0224 +++ b/test/log/0224 @@ -8,11 +8,11 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 == hdefer@test.ex <useryy@test.ex> R=halias defer (-1): not just yet 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex <userxy@test.ex> R=alias defer (-1): not just yet -1999-03-02 09:44:33 10HmaZ-0005vi-00 == /no/such/file <file@test.ex> R=alias T=address_file defer (13): Permission denied: failed to create directories for /no/such: Permission denied +1999-03-02 09:44:33 10HmaZ-0005vi-00 == /no/such/file <file@test.ex> R=alias T=address_file defer (EEE): Permission denied: failed to create directories for /no/such: Permission denied 1999-03-02 09:44:33 Start queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 == hdefer@test.ex <useryy@test.ex> R=halias defer (-1): not just yet 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex <userxy@test.ex> R=alias defer (-1): not just yet -1999-03-02 09:44:33 10HmaZ-0005vi-00 == /no/such/file <file@test.ex> R=alias T=address_file defer (13): Permission denied: failed to create directories for /no/such: Permission denied +1999-03-02 09:44:33 10HmaZ-0005vi-00 == /no/such/file <file@test.ex> R=alias T=address_file defer (EEE): Permission denied: failed to create directories for /no/such: Permission denied 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed diff --git a/test/log/0228 b/test/log/0228 index 646034c58..7ae197dd5 100644 --- a/test/log/0228 +++ b/test/log/0228 @@ -1,3 +1,3 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused -1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@x.y.z R=all T=smtp defer (0): smtp transport found host ip4.ip4.ip4.ip4 to be local +1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@x.y.z R=all T=smtp defer (-50): smtp transport found host ip4.ip4.ip4.ip4 to be local diff --git a/test/log/0260 b/test/log/0260 index 108b9e2ac..bbde3046d 100644 --- a/test/log/0260 +++ b/test/log/0260 @@ -2,7 +2,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return@test.ex R=bad_return T=bad_return defer (-27): Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return2@test.ex R=bad_return T=bad_return defer (-27): Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" -1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.uid@test.ex R=bad_uid T=bad_uid defer (13): Permission denied: creating lock file hitching post TESTSUITE/test-mail/bad_uid.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) +1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.uid@test.ex R=bad_uid T=bad_uid defer (EEE): Permission denied: creating lock file hitching post TESTSUITE/test-mail/bad_uid.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) 1999-03-02 09:44:33 10HmaX-0005vi-00 home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" 1999-03-02 09:44:33 10HmaX-0005vi-00 == exp.fail@test.ex R=exp_fail T=exp_fail defer (-27): home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=good T=local_delivery @@ -10,7 +10,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return@test.ex R=bad_return T=bad_return defer (-27): Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return2@test.ex R=bad_return T=bad_return defer (-27): Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" -1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.uid@test.ex R=bad_uid T=bad_uid defer (13): Permission denied: creating lock file hitching post TESTSUITE/test-mail/bad_uid.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) +1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.uid@test.ex R=bad_uid T=bad_uid defer (EEE): Permission denied: creating lock file hitching post TESTSUITE/test-mail/bad_uid.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) 1999-03-02 09:44:33 10HmaX-0005vi-00 home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" 1999-03-02 09:44:33 10HmaX-0005vi-00 == exp.fail@test.ex R=exp_fail T=exp_fail defer (-27): home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" 1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/0262 b/test/log/0262 index f918f5b8b..00f4f1894 100644 --- a/test/log/0262 +++ b/test/log/0262 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=good T=pipe defer (0): too many environment settings for pipe transport +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=good T=pipe defer (EEE): Argument list too long: too many environment settings for pipe transport diff --git a/test/log/0318 b/test/log/0318 index e85b9c343..df62c6c9f 100644 --- a/test/log/0318 +++ b/test/log/0318 @@ -2,4 +2,4 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@test.ex R=all T=local_delivery defer (17): File exists: while renaming TESTSUITE/test-mail/temp.pppp.the.local.host.name as TESTSUITE/test-mail/userx +1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@test.ex R=all T=local_delivery defer (EEE): File exists: while renaming TESTSUITE/test-mail/temp.pppp.the.local.host.name as TESTSUITE/test-mail/userx diff --git a/test/log/0438 b/test/log/0438 index 574cf9bef..78796810d 100644 --- a/test/log/0438 +++ b/test/log/0438 @@ -2,3 +2,4 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/2020 b/test/log/2020 index b10c2af18..fbf9039a2 100644 --- a/test/log/2020 +++ b/test/log/2020 @@ -1,8 +1,4 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. - Suggested action: either install a certificate or change tls_advertise_hosts option 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@thishost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. - Suggested action: either install a certificate or change tls_advertise_hosts option 1999-03-02 09:44:33 Start queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=Exim Developers,CN=thishost.test.ex" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/2102 b/test/log/2102 index dfcfc1b67..91761cd68 100644 --- a/test/log/2102 +++ b/test/log/2102 @@ -41,7 +41,11 @@ 1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2Igy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSodF3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xwPCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYGOhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNSgCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59YtxxJC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPDhmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJhJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovdVVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY= 1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac +<<<<<<< HEAD 1999-03-02 09:44:33 ver: TLS1.x +======= +1999-03-02 09:44:33 ver: TLSv1.x +>>>>>>> 4.next 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com> diff --git a/test/log/2120 b/test/log/2120 index 6c4b0cac8..8057655d7 100644 --- a/test/log/2120 +++ b/test/log/2120 @@ -1,8 +1,4 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. - Suggested action: either install a certificate or change tls_advertise_hosts option 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@thishost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. - Suggested action: either install a certificate or change tls_advertise_hosts option 1999-03-02 09:44:33 Start queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=Exim Developers/CN=thishost.test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=Exim Developers/CN=thishost.test.ex" C="250 OK id=10HmaY-0005vi-00" diff --git a/test/log/4520 b/test/log/4520 index ecb7432c7..610738e21 100644 --- a/test/log/4520 +++ b/test/log/4520 @@ -23,7 +23,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: message could not be signed, and dkim_strict is set. Deferring message delivery. 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}": No such file or directory -1999-03-02 09:44:33 10HmaX-0005vi-00 == e0@test.ex R=client T=send_to_server defer (2): No such file or directory H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}" +1999-03-02 09:44:33 10HmaX-0005vi-00 == e0@test.ex R=client T=send_to_server defer (EEE): No such file or directory H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}" 1999-03-02 09:44:33 10HmaX-0005vi-00 ** e0@test.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmaX-0005vi-00 e0@test.ex: error ignored 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/4525 b/test/log/4525 index 9e770e9bf..f4b7496d5 100644 --- a/test/log/4525 +++ b/test/log/4525 @@ -4,9 +4,15 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for c@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 => c@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] K C="250- 7nn byte chunk, total 7nn\\n250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbE-0005vi-00" +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for c@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 => c@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] K C="250- 7nn byte chunk, total 7nn\\n250 OK id=10HmbG-0005vi-00" +1999-03-02 09:44:33 10HmbF-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D @@ -25,6 +31,18 @@ 1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmbC-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From 1999-03-02 09:44:33 10HmbC-0005vi-00 data acl: dkim status pass -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss DKIM=test.ex id=E10HmbB-0005vi-00@myhost.test.ex for b@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 => b <b@test.ex> R=server_store T=file +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp K S=sss DKIM=test.ex id=E10HmbB-0005vi-00@myhost.test.ex for c@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 => c <c@test.ex> R=server_store T=file 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed +1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbE-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbE-0005vi-00 data acl: dkim status pass +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss DKIM=test.ex id=E10HmbD-0005vi-00@myhost.test.ex for b@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 => b <b@test.ex> R=server_store T=file +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbG-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbG-0005vi-00 data acl: dkim status pass +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp K S=sss DKIM=test.ex id=E10HmbF-0005vi-00@myhost.test.ex for c@test.ex +1999-03-02 09:44:33 10HmbG-0005vi-00 => c <c@test.ex> R=server_store T=file +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed diff --git a/test/log/4620 b/test/log/4620 new file mode 100644 index 000000000..5e4413a3e --- /dev/null +++ b/test/log/4620 @@ -0,0 +1,16 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for redirect@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => remote_user@remote.ex <redirect@test.ex> R=external T=forwarded_external H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 ** remote_user@remote.ex R=remote_bouncer: account disabled +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex> R=local T=appendfile +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:PORT_S +1999-03-02 09:44:33 10HmaY-0005vi-00 <= SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for remote_user@remote.ex diff --git a/test/log/5900 b/test/log/5900 index 8b273b8a9..cb074258c 100644 --- a/test/log/5900 +++ b/test/log/5900 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (2): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (EEE): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory diff --git a/test/mail/4525.b b/test/mail/4525.b index a1e2a87d8..6cd2538e0 100644 --- a/test/mail/4525.b +++ b/test/mail/4525.b @@ -28,7 +28,7 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) by myhost.test.ex with esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbC-0005vi-00 + id 10HmbE-0005vi-00 for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL @@ -37,10 +37,10 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; ygZGjs=; Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbD-0005vi-00 for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 From: nobody@example.com -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> Sender: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/4525.c b/test/mail/4525.c new file mode 100644 index 000000000..1032c0d83 --- /dev/null +++ b/test/mail/4525.c @@ -0,0 +1,52 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) + by myhost.test.ex with esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbC-0005vi-00 + for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL + wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM + ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL + ygZGjs=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbB-0005vi-00 + for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Sender: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) + by myhost.test.ex with esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbG-0005vi-00 + for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL + wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM + ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL + ygZGjs=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbF-0005vi-00 + for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> +Sender: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- + diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER new file mode 100644 index 000000000..8daaeed5f --- /dev/null +++ b/test/mail/4620.CALLER @@ -0,0 +1,56 @@ +From MAILER-DAEMON Tue Mar 02 09:44:33 1999 +Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) + id 10HmaZ-0005vi-00 + for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +X-Failed-Recipients: remote_user@remote.ex +Auto-Submitted: auto-replied +From: Mail Delivery System <Mailer-Daemon@the.local.host.name> +To: SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex +References: <E10HmaX-0005vi-00@the.local.host.name> +Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM +MIME-Version: 1.0 +Subject: Mail delivery failed: returning message to sender +Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: text/plain; charset=us-ascii + +This message was created automatically by mail delivery software. + +A message that you sent could not be delivered to one or more of its +recipients. This is a permanent error. The following address(es) failed: + + remote_user@remote.ex + account disabled + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/delivery-status + +Reporting-MTA: dns; the.local.host.name + +Action: failed +Final-Recipient: rfc822;remote_user@remote.ex +Status: 5.0.0 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/rfc822 + +Return-path: <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex> +Received: from localhost ([127.0.0.1] helo=the.local.host.name) + by the.local.host.name with esmtp (Exim x.yz) + (envelope-from <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex>) + id 10HmaY-0005vi-00 + for remote_user@remote.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaX-0005vi-00 + for redirect@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +Message body + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM-- + diff --git a/test/msglog/0076.10HmaX-0005vi-00 b/test/msglog/0076.10HmaX-0005vi-00 index 74759feaf..bb191544e 100644 --- a/test/msglog/0076.10HmaX-0005vi-00 +++ b/test/msglog/0076.10HmaX-0005vi-00 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 Received from CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 userx@test.ex R=localuser T=local_delivery defer (2): No such file or directory: creating lock file hitching post TESTSUITE/test-mail/subdir/userx.lock.test.ex.dddddddd.pppppppp (euid=CALLER_UID egid=CALLER_GID) +1999-03-02 09:44:33 userx@test.ex R=localuser T=local_delivery defer (EEE): No such file or directory: creating lock file hitching post TESTSUITE/test-mail/subdir/userx.lock.test.ex.dddddddd.pppppppp (euid=CALLER_UID egid=CALLER_GID) diff --git a/test/msglog/0107.10HmaX-0005vi-00 b/test/msglog/0107.10HmaX-0005vi-00 index 70d900d58..b9feb505a 100644 --- a/test/msglog/0107.10HmaX-0005vi-00 +++ b/test/msglog/0107.10HmaX-0005vi-00 @@ -3,5 +3,5 @@ 1999-03-02 09:44:33 usery@test.ex R=mboxuser T=appendfile defer (-34): mailbox TESTSUITE/test-mail/../test-empty/usery does not exist, but creation outside the home directory is not permitted 1999-03-02 09:44:33 userz@test.ex: appendfile transport succeeded 1999-03-02 09:44:33 sub1@test.ex: appendfile transport succeeded -1999-03-02 09:44:33 sub2@test.ex R=mboxuser T=appendfile defer (2): No such file or directory: creating lock file hitching post TESTSUITE/test-empty/s/sub2.lock.test.ex.dddddddd.pppppppp (euid=CALLER_UID egid=CALLER_GID) +1999-03-02 09:44:33 sub2@test.ex R=mboxuser T=appendfile defer (EEE): No such file or directory: creating lock file hitching post TESTSUITE/test-empty/s/sub2.lock.test.ex.dddddddd.pppppppp (euid=CALLER_UID egid=CALLER_GID) 1999-03-02 09:44:33 sub3@test.ex R=mboxuser T=appendfile defer (-34): mailbox TESTSUITE/test-mail/link/sub3 does not exist, but creation outside the home directory is not permitted diff --git a/test/msglog/0128.10HmaX-0005vi-00 b/test/msglog/0128.10HmaX-0005vi-00 index 8493cf790..930261ebb 100644 --- a/test/msglog/0128.10HmaX-0005vi-00 +++ b/test/msglog/0128.10HmaX-0005vi-00 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 Received from CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 userx@test.ex R=reply T=reply defer (0): Failed to open DBM file TESTSUITE/spool when sending message from reply transport: Is a directory +1999-03-02 09:44:33 userx@test.ex R=reply T=reply defer (EEE): Is a directory: Failed to open DBM file TESTSUITE/spool when sending message from reply transport: Is a directory diff --git a/test/msglog/0132.10HmaX-0005vi-00 b/test/msglog/0132.10HmaX-0005vi-00 index bd92670e0..da30e099b 100644 --- a/test/msglog/0132.10HmaX-0005vi-00 +++ b/test/msglog/0132.10HmaX-0005vi-00 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 Received from CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 userx@test.ex R=local T=appendfile defer (6): Error: while opening named pipe TESTSUITE/test-fifo (could mean no process is reading it) +1999-03-02 09:44:33 userx@test.ex R=local T=appendfile defer (EEE): Error: while opening named pipe TESTSUITE/test-fifo (could mean no process is reading it) diff --git a/test/paniclog/5900 b/test/paniclog/5900 index 70058d78e..80190a952 100644 --- a/test/paniclog/5900 +++ b/test/paniclog/5900 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (2): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (EEE): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory diff --git a/test/runtest b/test/runtest index 87c78070e..f53b9d72b 100755 --- a/test/runtest +++ b/test/runtest @@ -933,6 +933,11 @@ RESET_AFTER_EXTRA_LINE_READ: last if !defined $_; + # SRS timestamps and signatures vary by hostname and from run to run + + s/SRS0=....=..=[^=]+=[^@]+\@test.ex/SRS0=ZZZZ=YY=the.local.host.name=CALLER\@test.ex/; + + # ======== Output from the "fd" program about open descriptors ======== # The statuses seem to be different on different operating systems, but # at least we'll still be checking the number of open fd's. @@ -1040,6 +1045,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/; s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/; + s/^(?:\s*\d+ )(exec .* -oPX)$/pppp $1/; # IP address lookups use gethostbyname() when IPv6 is not supported, # and gethostbyname2() or getipnodebyname() when it is. @@ -1057,6 +1063,9 @@ RESET_AFTER_EXTRA_LINE_READ: next if /OpenSSL compile-time version: OpenSSL \d+[\.\da-z]+/; next if /OpenSSL runtime version: OpenSSL \d+[\.\da-z]+/; + # this is timing-dependent + next if /^OpenSSL: creating STEK$/; + # drop lookups next if /^Lookups \(built-in\):/; next if /^Loading lookup modules from/; @@ -1254,7 +1263,7 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^DKIM \[[^[]+\] (Header hash|b) computed:/; # Not all platforms support TCP Fast Open, and the compile omits the check - if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|yes \(matched "\*"\))\n$//) + if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$//) { chomp; $_ .= <IN>; @@ -1311,6 +1320,10 @@ RESET_AFTER_EXTRA_LINE_READ: # Platform differences in errno strings s/ SMTP\(Operation timed out\)<</ SMTP(Connection timed out)<</; + # Platform differences for errno values (eg. Hurd) + s/^errno = \d+$/errno = EEE/; + s/^writing error \d+: /writing error EEE: /; + # When Exim is checking the size of directories for maildir, it uses # the check_dir_size() function to scan directories. Of course, the order # of the files that are obtained using readdir() varies from system to @@ -1405,6 +1418,8 @@ RESET_AFTER_EXTRA_LINE_READ: s/(?:\[[^\]]*\]:|port )\K$parm_port_n/PORT_N/; s/I=\[[^\]]*\]:\K\d+/ppppp/; + # Platform differences for errno values (eg. Hurd). Leave 0 and negative numbers alone. + s/R=\w+ T=\w+ defer\K \([1-9]\d*\): / (EEE): /; } # ======== mail ======== @@ -1546,7 +1561,7 @@ if (! -e $sf_current) log_failure($log_failed_filename, $testno, $rf); log_test($log_summary_filename, $testno, 'F') if ($force_continue); } - return 1 if /^c$/i && $rf !~ /paniclog/ && $rsf !~ /paniclog/; + return 1 if /^c$/i && $rf !~ /paniclog/ && (!defined $rsf || $rsf !~ /paniclog/); last if (/^[sc]$/); } @@ -3450,7 +3465,7 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>)) { if (/^(?:[0-9]+: )?([a-z0-9]+): /) { $ifname = $1; } - if (not $parm_ipv4 and /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i) + if (not $parm_ipv4 and /^\s*inet(?:\saddr(?:ess))?:?\s*(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i) { # It would be nice to be able to vary the /16 used for manyhome; we could take # an option to runtest used here - but we'd also have to pass it on to fakens. @@ -3460,7 +3475,7 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>)) } if ( (not $parm_ipv6 or $parm_ipv6 =~ /%/) - and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i) + and /^\s*inet6(?:\saddr(?:ess))?:?\s*([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i) { next if $1 eq '::' or $1 eq '::1' or $1 =~ /^ff00/i or $1 =~ /^fe80::1/i; $parm_ipv6 = $1; diff --git a/test/scripts/0000-Basic/0438 b/test/scripts/0000-Basic/0438 index 099efba0d..a8287cf9f 100644 --- a/test/scripts/0000-Basic/0438 +++ b/test/scripts/0000-Basic/0438 @@ -8,3 +8,16 @@ killdaemon exim -d -DSERVER=server -bd -oX PORT_D -oP DIR/spool/exim-daemon.anotherpid **** killdaemon +# +# Check for a SIGTERM daemon kill removing the pid file +exim -d -DSERVER=server -bd -oX PORT_D -oP DIR/spool/mypidfile +**** +sleep 1 +ls DIR/spool +sudo perl +open(IN, "<", "DIR/spool/mypidfile"); +while (<IN>) { kill "TERM", $_; } +**** +sleep 1 +ls DIR/spool +# diff --git a/test/scripts/1990-TCP-Fast-Open/1990 b/test/scripts/1990-TCP-Fast-Open/1990 index 1fc4682aa..80059e685 100644 --- a/test/scripts/1990-TCP-Fast-Open/1990 +++ b/test/scripts/1990-TCP-Fast-Open/1990 @@ -22,6 +22,11 @@ # which might do the job. But how to manipulate it? # # +# FreeBSD: it looks like you have to compile a custom kernel, with +# 'options TCP_RFC7413' in the config. Also set +# 'net.inet.tcp.fastopen.server_enable=1' in /etc/sysctl.conf +# Seems to always claim TFO used by transport, if tried. +# sudo perl system ("tc qdisc add dev lo root netem delay 50ms"); **** @@ -50,11 +55,6 @@ system ("ip tcp_metrics delete 127.0.0.1"); # # # -# FreeBSD: it looks like you have to compile a custom kernel, with -# 'options TCP_RFC7413' in the config. Also set -# 'net.inet.tcp.fastopen.enabled=1' in /etc/sysctl.conf -# Untested. -# exim -DSERVER=server -bd -oX PORT_D **** # diff --git a/test/scripts/3300-crypteq/3300 b/test/scripts/3300-crypteq/3300 index 2ca0fdd12..fb3a617ab 100644 --- a/test/scripts/3300-crypteq/3300 +++ b/test/scripts/3300-crypteq/3300 @@ -2,6 +2,11 @@ exim -be badCrypt: ${if crypteq{MySecret}{}{yes}{no}} + +# Defined-routine, and default, crypt mehods. These fail on FreeBSD because +# the crypt() call does something different to that on Linux. The output +# is therefore different, and the compare fails. + mySecret: ${if crypteq{MySecret}{azrazPWCQJhyg}{yes}{no}} mySecret: ${if crypteq{MySecret}{aarazPWCQJhyg}{yes}{no}} mySecret: ${if crypteq{MySecret}{\{crypt\}azrazPWCQJhyg}{yes}{no}} @@ -12,19 +17,23 @@ crypt16: ${if crypteq{MySecretRhubarb}{\{crypt\}azrazPWCQJhyg}{yes}{no}} crypt16: ${if crypteq{MySecretRhubarb}{\{crypt16\}azrazPWCQJhyg}{yes}{no}} crypt16: ${if crypteq{MySecretRhubarb}{\{CRYPT16\}azrazPWCQJhygdJWzb77lQMA}{yes}{no}} -test: ${if crypteq{test}{\{md5\}CY9rzUYh03PK3k6DJie09g==}{yes}{no}} -test: ${if crypteq{test}{\{MD5\}CY9rzUYh03PK3k6DJie09g==}{yes}{no}} -test: ${if crypteq{test}{\{md5\}AY9rzUYh03PK3k6DJie09g==}{yes}{no}} -test: ${if crypteq{test}{\{md5\}098f6bcd4621d373cade4e832627b4f6}{yes}{no}} -test: ${if crypteq{test}{\{md5\}198f6bcd4621d373cade4e832627b4f6}{yes}{no}} -test: ${if crypteq{test}{\{md5\}098f6bcd4621d373cade4e832627b4f}{yes}{no}} -abc: ${if crypteq{abc}{\{sha1\}A9993E364706816ABA3E25717850C26C9CD0D89D}{yes}{no}} -abc: ${if crypteq{abc}{\{SHA1\}A9993E364706816ABA3E25717850C26C9CD0D89D}{yes}{no}} -abc: ${if crypteq{abc}{\{sha1\}qZk+NkcGgWq6PiVxeFDCbJzQ2J0=}{yes}{no}} -abd: ${if crypteq{abd}{\{sha1\}A9993E364706816ABA3E25717850C26C9CD0D89D}{yes}{no}} +# Defined-algo methods. + +md5: ${if crypteq{test}{\{md5\}CY9rzUYh03PK3k6DJie09g==}{yes}{no}} +md5: ${if crypteq{test}{\{MD5\}CY9rzUYh03PK3k6DJie09g==}{yes}{no}} +md5: ${if crypteq{test}{\{md5\}AY9rzUYh03PK3k6DJie09g==}{yes}{no}} +md5: ${if crypteq{test}{\{md5\}098f6bcd4621d373cade4e832627b4f6}{yes}{no}} +md5: ${if crypteq{test}{\{md5\}198f6bcd4621d373cade4e832627b4f6}{yes}{no}} +md5: ${if crypteq{test}{\{md5\}098f6bcd4621d373cade4e832627b4f}{yes}{no}} + +sha1: ${if crypteq{abc}{\{sha1\}A9993E364706816ABA3E25717850C26C9CD0D89D}{yes}{no}} +sha1: ${if crypteq{abc}{\{SHA1\}A9993E364706816ABA3E25717850C26C9CD0D89D}{yes}{no}} +sha1: ${if crypteq{abc}{\{sha1\}qZk+NkcGgWq6PiVxeFDCbJzQ2J0=}{yes}{no}} +sha1: ${if crypteq{abd}{\{sha1\}A9993E364706816ABA3E25717850C26C9CD0D89D}{yes}{no}} + -# Combinations +# Combinations. These fail on FreeBSD as above. y: ${if and {{crypteq{MySecret}{azrazPWCQJhyg}}{exists{/etc/passwd}}}{Y}{N}} y: ${if or {{crypteq{MySecret}{azrazQWCQJhyg}}{exists{/etc/passwd}}}{Y}{N}} diff --git a/test/scripts/4500-DKIM/4525 b/test/scripts/4500-DKIM/4525 index ead35d647..dced4ae46 100644 --- a/test/scripts/4500-DKIM/4525 +++ b/test/scripts/4500-DKIM/4525 @@ -19,13 +19,13 @@ From: nobody@example.com content **** millisleep 500 -## with transport_filter and CHUNKING -#exim -DOPT=From -DFILTER=y -DALLOW=y -odf c@test.ex -#From: nobody@example.com -# -#content -#**** -#millisleep 500 +# with transport_filter and CHUNKING +exim -DOPT=From -DFILTER=y -DALLOW=y -odf c@test.ex +From: nobody@example.com + +content +**** +millisleep 500 # # for comparison, mails that should get identical sigs, though not using a transport_filter exim -DOPT=From -odf b@test.ex @@ -38,16 +38,16 @@ This is a generic mailinglist footer, using a traditional .sig-separator line ---- **** millisleep 500 -#exim -DOPT=From -DALLOW=y -odf c@test.ex -#From: nobody@example.com -# -#content -# -#-- -#This is a generic mailinglist footer, using a traditional .sig-separator line -#---- -#**** -#millisleep 500 +exim -DOPT=From -DALLOW=y -odf c@test.ex +From: nobody@example.com + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- +**** +millisleep 500 # # killdaemon diff --git a/test/scripts/4620-SRS/4620 b/test/scripts/4620-SRS/4620 new file mode 100644 index 000000000..4a126b8b9 --- /dev/null +++ b/test/scripts/4620-SRS/4620 @@ -0,0 +1,16 @@ +# SRS native implementation +# +exim -bd -DSERVER=server -oX 127.0.0.1:PORT_S +**** +# Inject a message; will be passed on to remote and queued there +exim -odi redirect@test.ex +Message body +**** +# Run the queue for the remote, will generate bounce which is queued +exim -q +**** +# Run the queue for the remote, will send bounce to origin +exim -q +**** +# +killdaemon diff --git a/test/scripts/4620-SRS/REQUIRES b/test/scripts/4620-SRS/REQUIRES new file mode 100644 index 000000000..7286713d6 --- /dev/null +++ b/test/scripts/4620-SRS/REQUIRES @@ -0,0 +1,2 @@ +support Experimental_SRS +feature _HAVE_NATIVE_SRS diff --git a/test/stderr/0084 b/test/stderr/0084 index 45c7bd0f4..2b2f39621 100644 --- a/test/stderr/0084 +++ b/test/stderr/0084 @@ -53,7 +53,7 @@ checking require_files file check: ! TESTSUITE/aux-fixed/0084.$local_part expanded file: TESTSUITE/aux-fixed/0084.no stat() yielded -1 -errno = 2 +errno = EEE calling smart router smart router called for no@myhost.test.ex domain = myhost.test.ex diff --git a/test/stderr/0370 b/test/stderr/0370 index b2483cf21..ff8ccb065 100644 --- a/test/stderr/0370 +++ b/test/stderr/0370 @@ -24,7 +24,7 @@ direct command: argv[0] = 'TESTSUITE/bin/iefbr14' Writing message to pipe writing data block fd=dddd size=sss timeout=3600 -writing error 32: Broken pipe +writing error EEE: Broken pipe transport error EPIPE ignored t1 transport yielded 0 t1 transport returned OK for |TESTSUITE/bin/iefbr14 diff --git a/test/stderr/0438 b/test/stderr/0438 index f44d7bb76..bac5bc1a6 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -36,3 +36,24 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +Exim version x.yz .... +changed uid/gid: forcing real = effective + uid=uuuu gid=CALLER_GID pid=pppp +configuration file is TESTSUITE/test-config +admin user +dropping to exim gid; retaining priv uid +originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME +daemon_smtp_port overridden by -oX: + <: 1225 +listening on all interfaces (IPv4) port 1225 +pid written to TESTSUITE/spool/mypidfile +changed uid/gid: running as a daemon + uid=EXIM_UID gid=EXIM_GID pid=pppp +LOG: MAIN + exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 +daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID +Listening... +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/mypidfile -oPX +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/4507 b/test/stderr/4507 index 48d4d9fa9..1c45d0955 100644 --- a/test/stderr/4507 +++ b/test/stderr/4507 @@ -9,22 +9,22 @@ >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> xxx in helo_lookup_domains? no (end of list) ->>> processing "accept" (TESTSUITE/test-config 43) +>>> processing "accept" (TESTSUITE/test-config 44) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT >>> host in ignore_fromline_hosts? no (option unset) >>> using ACL "check_dkim" ->>> processing "warn" (TESTSUITE/test-config 34) +>>> processing "warn" (TESTSUITE/test-config 35) >>> check logwrite = signer: $dkim_cur_signer bits: $dkim_key_length >>> = signer: test.ex bits: 1024 LOG: 10HmaX-0005vi-00 signer: test.ex bits: 1024 >>> warn: condition test succeeded in ACL "check_dkim" ->>> processing "accept" (TESTSUITE/test-config 37) +>>> processing "accept" (TESTSUITE/test-config 38) >>> accept: condition test succeeded in ACL "check_dkim" >>> end of ACL "check_dkim": ACCEPT LOG: 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded] >>> using ACL "check_data" ->>> processing "accept" (TESTSUITE/test-config 41) +>>> processing "accept" (TESTSUITE/test-config 42) >>> check logwrite = ${authresults {$primary_hostname}} >>> = Authentication-Results: myhost.test.ex; >>> dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 diff --git a/test/stderr/5204 b/test/stderr/5204 index 1f927a485..f84acadd8 100644 --- a/test/stderr/5204 +++ b/test/stderr/5204 @@ -242,7 +242,7 @@ some.name in helo_lookup_domains? no (end of list) host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") host in chunking_advertise_hosts? no (end of list) -processing "accept" (TESTSUITE/test-config 76) +processing "accept" (TESTSUITE/test-config 78) check verify = recipient >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing "FAIL cannot route this one (FAIL)"@some.host diff --git a/test/stderr/5410 b/test/stderr/5410 index 0461d84ed..b29fee2e7 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -131,7 +131,7 @@ sync_responses expect rcpt SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ -processing "accept" (TESTSUITE/test-config 55) +processing "accept" (TESTSUITE/test-config 56) accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA @@ -373,7 +373,7 @@ sync_responses expect rcpt SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ -processing "accept" (TESTSUITE/test-config 55) +processing "accept" (TESTSUITE/test-config 56) accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA @@ -615,7 +615,7 @@ sync_responses expect rcpt SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ -processing "accept" (TESTSUITE/test-config 55) +processing "accept" (TESTSUITE/test-config 56) accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA diff --git a/test/stderr/5420 b/test/stderr/5420 index b0f1f0a09..b06eb8d33 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -132,7 +132,7 @@ sync_responses expect rcpt SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ -processing "accept" (TESTSUITE/test-config 54) +processing "accept" (TESTSUITE/test-config 55) accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA @@ -374,7 +374,7 @@ sync_responses expect rcpt SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ -processing "accept" (TESTSUITE/test-config 54) +processing "accept" (TESTSUITE/test-config 55) accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA @@ -616,7 +616,7 @@ sync_responses expect rcpt SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ -processing "accept" (TESTSUITE/test-config 54) +processing "accept" (TESTSUITE/test-config 55) accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA diff --git a/test/stderr/5820 b/test/stderr/5820 index 21d5127ff..032f2b9f3 100644 --- a/test/stderr/5820 +++ b/test/stderr/5820 @@ -9,7 +9,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) ->>> processing "accept" (TESTSUITE/test-config 86) +>>> processing "accept" (TESTSUITE/test-config 87) >>> check verify = recipient/callout >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing rcptuser@dane256ee.test.ex diff --git a/test/stderr/5840 b/test/stderr/5840 index bc9b18c84..dbd4d235c 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -9,7 +9,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) ->>> processing "accept" (TESTSUITE/test-config 91) +>>> processing "accept" (TESTSUITE/test-config 92) >>> check verify = recipient/callout >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing rcptuser@dane256ee.test.ex diff --git a/test/stdout/0438 b/test/stdout/0438 new file mode 100644 index 000000000..431c133d8 --- /dev/null +++ b/test/stdout/0438 @@ -0,0 +1,3 @@ +log +mypidfile +log diff --git a/test/stdout/0572 b/test/stdout/0572 index 40c8b3529..4d428078f 100644 --- a/test/stdout/0572 +++ b/test/stdout/0572 @@ -58,7 +58,7 @@ no_hosts_randomize hosts_require_auth = hosts_try_auth = hosts_try_chunking = * -hosts_try_fastopen = * +hosts_try_fastopen = : hosts_try_prdr = * interface = ip4.ip4.ip4.ip4 keepalive @@ -111,6 +111,7 @@ begin transports driver = smtp interface = ip4.ip4.ip4.ip4 port = 1224 + hosts_try_fastopen = : debug_print = transport_name <$transport_name> # Exim Configuration (X) # 1 "TESTSUITE/test-config" @@ -148,4 +149,5 @@ my_smtp: driver = smtp interface = ip4.ip4.ip4.ip4 port = 1224 +hosts_try_fastopen = : debug_print = transport_name <$transport_name> diff --git a/test/stdout/3300 b/test/stdout/3300 index e12e7c319..f05d8cbfb 100644 --- a/test/stdout/3300 +++ b/test/stdout/3300 @@ -1,4 +1,9 @@ > badCrypt: no +> +> # Defined-routine, and default, crypt mehods. These fail on FreeBSD because +> # the crypt() call does something different to that on Linux. The output +> # is therefore different, and the compare fails. +> > mySecret: yes > mySecret: no > mySecret: yes @@ -9,19 +14,23 @@ > crypt16: no > crypt16: yes > -> test: yes -> test: yes -> test: no -> test: yes -> test: no -> test: no > -> abc: yes -> abc: yes -> abc: yes -> abd: no +> # Defined-algo methods. +> +> md5: yes +> md5: yes +> md5: no +> md5: yes +> md5: no +> md5: no +> +> sha1: yes +> sha1: yes +> sha1: yes +> sha1: no +> > -> # Combinations +> # Combinations. These fail on FreeBSD as above. > > y: Y > y: Y |