From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 14 Dec 2014 17:31:44 +0000 (+0000)
Subject: Revert "Testsuite: Use explicit interface for send to localhost"
X-Git-Tag: exim-4_85_RC3~2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7eb59ff94f571a06e5dab25e417979095d569495;p=exim.git

Revert "Testsuite: Use explicit interface for send to localhost"

This reverts commit 30079bc1d20c0473d012ef33654358cfadb0a2ff.
The buildfarm member running FreeBSD 10.0 was not fixed by that commit,
as was hoped.
---

diff --git a/test/confs/0015 b/test/confs/0015
index 2ae63be32..fbfa534df 100644
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -106,7 +106,6 @@ delivery_s:
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
-  interface = 127.0.0.1
 
 address_reply:
   driver = autoreply
diff --git a/test/confs/0033 b/test/confs/0033
index 22230c1ca..6b455fa8a 100644
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -43,6 +43,5 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 # End
diff --git a/test/confs/0100 b/test/confs/0100
index e35671af4..948d807c1 100644
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -77,7 +77,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 filtered_smtp:
   driver = smtp
diff --git a/test/confs/0101 b/test/confs/0101
index c8c2f8604..7d88395b9 100644
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -55,7 +55,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 local_delivery:
   driver = pipe
diff --git a/test/confs/0106 b/test/confs/0106
index f15bea385..d58ddea98 100644
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -34,7 +34,6 @@ smtp:
   command_timeout = 1s
   final_timeout = 1s
   port = PORT_S
-  interface = 127.0.0.1
 
 # ----- Retry -----
 
diff --git a/test/confs/0160 b/test/confs/0160
index 8857c2a86..48d493c76 100644
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -36,7 +36,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0163 b/test/confs/0163
index 8490482a0..16d5292f3 100644
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -33,7 +33,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0177 b/test/confs/0177
index 5caa6f01d..273d0a7c2 100644
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -80,7 +80,6 @@ autoreply:
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0179 b/test/confs/0179
index 1c4e6ab81..0aee0c056 100644
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -34,7 +34,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0185 b/test/confs/0185
index fef5f29f1..08cb1d2c7 100644
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -77,7 +77,6 @@ autoreply:
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0190 b/test/confs/0190
index f8851fc8b..3b34b0cad 100644
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -94,7 +94,6 @@ smtp:
 smtp2:
   driver = smtp
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 smtp3:
   driver = smtp
@@ -102,7 +101,6 @@ smtp3:
   max_rcpt = 2
   connection_max_messages = 1
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 
 # ----- Retry -----
diff --git a/test/confs/0191 b/test/confs/0191
index 36ee85c06..410d2bf09 100644
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -33,7 +33,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
   transport_filter = \
     /bin/sh -c \
     "cat >/dev/null; printf Line-without-end || /bin/echo -n Line-without-end"
diff --git a/test/confs/0201 b/test/confs/0201
index 1858c40e9..284e3848b 100644
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -31,7 +31,6 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
-  interface = 127.0.0.1
   transport_filter = /bin/sh -c 'cat; exit 99'
 
 
diff --git a/test/confs/0203 b/test/confs/0203
index de755ca6b..f1080e060 100644
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -34,7 +34,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0208 b/test/confs/0208
index d55e1db9b..a80fb6de5 100644
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -64,7 +64,6 @@ fail:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0209 b/test/confs/0209
index c4ab4e6bd..b9db7a0cc 100644
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -44,7 +44,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0210 b/test/confs/0210
index c11fc7b7d..486f1ae3d 100644
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -67,7 +67,6 @@ bsmtp_smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0211 b/test/confs/0211
index 860909d1b..389437340 100644
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -53,7 +53,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 local_delivery:
   driver = appendfile
diff --git a/test/confs/0213 b/test/confs/0213
index 1a26a84e3..16a8a33a8 100644
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -34,7 +34,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0215 b/test/confs/0215
index 1266a7e97..102fd0ada 100644
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -45,7 +45,6 @@ lmtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   protocol = LMTP
   lmtp_ignore_quota = IGNORE_QUOTA
   AUTHS
diff --git a/test/confs/0216 b/test/confs/0216
index 846a0894f..04195d153 100644
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -39,7 +39,6 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
-  interface = 127.0.0.1
   max_rcpt = 0
 
 
diff --git a/test/confs/0217 b/test/confs/0217
index da5958ff7..96d97cba4 100644
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -45,7 +45,6 @@ send_to_server:
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   HAP
   max_rcpt = 1000
 
diff --git a/test/confs/0218 b/test/confs/0218
index d185033ea..4458e1846 100644
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -56,7 +56,6 @@ send_to_server:
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   debug_print = T: $transport_name  (${acl {expand_check}})
 
 
diff --git a/test/confs/0227 b/test/confs/0227
index 063ced481..06fae3f56 100644
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -82,7 +82,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 lmtp:
   driver = smtp
diff --git a/test/confs/0231 b/test/confs/0231
index fcae1da18..721b8f7e5 100644
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -70,7 +70,6 @@ smtp_rewrite:
   headers_rewrite = *@domain1 $1-rewrite@domain2 f :\
                     *@domain1 $1-other@domain2
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0242 b/test/confs/0242
index 9eae48d94..0acf78fca 100644
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -35,7 +35,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0253 b/test/confs/0253
index 1e7187243..b72de8cd2 100644
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -69,7 +69,6 @@ t3:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   max_rcpt = 1
   allow_localhost
   return_path = pqr=$local_part+$domain@verp.domain
diff --git a/test/confs/0259 b/test/confs/0259
index 72dc00963..cd5c30362 100644
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -29,7 +29,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 begin retry
diff --git a/test/confs/0276 b/test/confs/0276
index ddd49cb26..96ce20957 100644
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -21,7 +21,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 # ----- Routers -----
diff --git a/test/confs/0285 b/test/confs/0285
index 06ca3f91f..f58324817 100644
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -38,7 +38,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
   max_rcpt = 2
   connection_max_messages = 3
 
diff --git a/test/confs/0286 b/test/confs/0286
index 33fe2b463..b7746b5e7 100644
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -39,7 +39,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
   max_rcpt = 2
   connection_max_messages = 3
 
diff --git a/test/confs/0288 b/test/confs/0288
index 522423c6b..938e08ed5 100644
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -34,7 +34,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
   max_rcpt = 1
   connection_max_messages = 1
   serialize_hosts = 127.0.0.1
diff --git a/test/confs/0299 b/test/confs/0299
index 12361fbf9..f956a1836 100644
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -43,7 +43,6 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   max_rcpt = 2
 
diff --git a/test/confs/0322 b/test/confs/0322
index 5a66e6b39..a33232ee6 100644
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -38,7 +38,6 @@ smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # End
diff --git a/test/confs/0332 b/test/confs/0332
index aabaa42a4..f9ad188d6 100644
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -39,7 +39,6 @@ t1:
   hosts = 127.0.0.1
   hosts_override
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0333 b/test/confs/0333
index 9f853be65..3e97eb804 100644
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -38,7 +38,6 @@ t1:
   hosts = 127.0.0.1
   hosts_override
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0341 b/test/confs/0341
index 81ed9a8ae..1719d5d47 100644
--- a/test/confs/0341
+++ b/test/confs/0341
@@ -52,7 +52,6 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
-  interface = 127.0.0.1
 
 
 # End
diff --git a/test/confs/0357 b/test/confs/0357
index 6b243e860..560676b14 100644
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -31,7 +31,6 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0358 b/test/confs/0358
index fe70fd8fe..e66020b69 100644
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -31,7 +31,6 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0363 b/test/confs/0363
index 1ae169891..5b7185d42 100644
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -31,7 +31,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 
diff --git a/test/confs/0367 b/test/confs/0367
index b826003bd..f9a8d1ca5 100644
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -33,7 +33,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0374 b/test/confs/0374
index 69a031165..3c1381b8c 100644
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -81,7 +81,6 @@ ut4:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   max_rcpt = 1
 
diff --git a/test/confs/0375 b/test/confs/0375
index f5bf7783f..a1322bbed 100644
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -119,7 +119,6 @@ ut4:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -130,7 +129,6 @@ ut5:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -142,7 +140,6 @@ ut6:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   max_rcpt = 1
   disable_logging
diff --git a/test/confs/0376 b/test/confs/0376
index 2d68016ec..d86d1dd55 100644
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -71,7 +71,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0388 b/test/confs/0388
index 4c8f2f88d..0252cbd9e 100644
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -36,7 +36,6 @@ smtp:
   driver = smtp
   hosts_max_try = 1
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
   connect_timeout = 2s
   address_retry_include_sender = false
 
diff --git a/test/confs/0398 b/test/confs/0398
index 565b78177..31c561765 100644
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -65,7 +65,6 @@ t1:
 t2:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 
diff --git a/test/confs/0413 b/test/confs/0413
index bfc1aad94..8ae83dee3 100644
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -56,7 +56,6 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 t2:
   driver = smtp
@@ -64,7 +63,6 @@ t2:
   hosts_override
   allow_localhost
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # End
diff --git a/test/confs/0426 b/test/confs/0426
index 438b28429..b61fead03 100644
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -34,7 +34,6 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 
 # End
diff --git a/test/confs/0429 b/test/confs/0429
index d10dd9dd7..68e7a417a 100644
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -29,7 +29,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   hosts_avoid_esmtp = 127.0.0.1
 
diff --git a/test/confs/0431 b/test/confs/0431
index 8b2fa19eb..0cf942225 100644
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -47,7 +47,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   AFFIX
 
diff --git a/test/confs/0432 b/test/confs/0432
index 96cb76dd8..1f69870de 100644
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -42,7 +42,6 @@ t1:
   driver = smtp
   hosts = <; 127.0.0.1 ;
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 # End
diff --git a/test/confs/0440 b/test/confs/0440
index 477833d61..9c3bb73de 100644
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -33,7 +33,6 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
   transport_filter = /bin/cat
 
 
diff --git a/test/confs/0461 b/test/confs/0461
index f56d6ad57..5b5110104 100644
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -42,7 +42,6 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
   connect_timeout = 1s
   allow_localhost
 
diff --git a/test/confs/0462 b/test/confs/0462
index 42d6c188b..7ff47e6b5 100644
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -49,7 +49,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0467 b/test/confs/0467
index 39c297c0d..56011f4a3 100644
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -32,6 +32,5 @@ begin transports
 
 t1:
   driver = smtp
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 # End
diff --git a/test/confs/0473 b/test/confs/0473
index 37dd43560..acbe1ff8c 100644
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -47,6 +47,5 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 # End
diff --git a/test/confs/0474 b/test/confs/0474
index 7bb526b67..4596e3922 100644
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -29,7 +29,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0476 b/test/confs/0476
index 8894c4f57..baa3f15a5 100644
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -31,7 +31,6 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0478 b/test/confs/0478
index 70314f0f1..bcdd98069 100644
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -31,9 +31,8 @@ begin transports
 
 t1:
   driver = smtp
-  hosts = ${if eq {$sender_host_address}{}{$local_part}{V4NET.0.0.2}}
   port = PORT_D
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
+  hosts = ${if eq {$sender_host_address}{}{$local_part}{V4NET.0.0.2}}
   allow_localhost
   connect_timeout = 1s
 
diff --git a/test/confs/0495 b/test/confs/0495
index b33cbf1ef..8706c790b 100644
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -69,7 +69,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
   allow_localhost
   command_timeout = 1s
 
diff --git a/test/confs/0497 b/test/confs/0497
index 1df7808cf..23748aedf 100644
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -35,7 +35,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 
diff --git a/test/confs/0498 b/test/confs/0498
index 2cc8c706c..b00c634ae 100644
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -35,7 +35,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   final_timeout = 1s
 
diff --git a/test/confs/0504 b/test/confs/0504
index 6e71fef84..f604f5e5d 100644
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -40,7 +40,6 @@ t3:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   transport_filter = /non/existent/file
 
diff --git a/test/confs/0511 b/test/confs/0511
index 15058d703..f76721ac9 100644
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -29,7 +29,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 # End
diff --git a/test/confs/0518 b/test/confs/0518
index 372489467..2c200f07f 100644
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -45,7 +45,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   rcpt_include_affixes
 
@@ -53,7 +52,6 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 # End
diff --git a/test/confs/0525 b/test/confs/0525
index f30696241..d8f24ae54 100644
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -37,7 +37,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   data_timeout = 1s
 
diff --git a/test/confs/0531 b/test/confs/0531
index b0ee60296..56f679ed8 100644
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -44,7 +44,6 @@ lmtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   protocol = LMTP
 
 
diff --git a/test/confs/0538 b/test/confs/0538
index 13564d57c..5865e3110 100644
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -45,7 +45,6 @@ begin transports
 
 t1:
   driver = smtp
-  interface = 127.0.0.1
 
 
 # End
diff --git a/test/confs/0540 b/test/confs/0540
index f9a23f306..641335f6b 100644
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -41,7 +41,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   helo_data = ${if eq{$domain}{yes1}{localhost}{aname}}
 
@@ -49,7 +48,6 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 # End
diff --git a/test/confs/0543 b/test/confs/0543
index bbe942fa4..e68280b0e 100644
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -33,7 +33,6 @@ smtp:
   hosts_max_try = 1
   allow_localhost
   port = PORT_S
-  interface = ${if eq {$host_address}{127.0.0.1} {127.0.0.1}}
 
 
 # ----- Retry -----
diff --git a/test/confs/0548 b/test/confs/0548
index 0f990c31a..6306943de 100644
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -49,7 +49,6 @@ smtp:
   hosts = HOSTIPV4 : thishost.test.ex
   allow_localhost
   port = PORT_D
-  interface = ${if eq {$host_address}{127.0.0.1} {127.0.0.1}}
 
 
 # ----- Retry -----
diff --git a/test/confs/0550 b/test/confs/0550
index 865b97a52..e08750fdd 100644
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -29,7 +29,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
   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 e7ec612ab..3ce775148 100644
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -50,9 +50,8 @@ begin transports
 
 t1:
   driver = smtp
-  hosts = 127.0.0.1
   port = PORT_D
-  interface = 127.0.0.1
+  hosts = 127.0.0.1
   allow_localhost
   command_timeout = 2s
 
diff --git a/test/confs/0553 b/test/confs/0553
index b965bf4aa..bdbc8df48 100644
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -50,7 +50,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_D
-  interface = 127.0.0.1
   command_timeout = 2s
 
 
diff --git a/test/confs/0554 b/test/confs/0554
index cf337b21b..edeb977fa 100644
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -30,7 +30,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
 
 # ----- Retry -----
 
diff --git a/test/confs/0561 b/test/confs/0561
index 801afbd34..ecdbf9504 100644
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -38,6 +38,5 @@ begin transports
 t1:
   driver = smtp
   port = PORT_D
-  interface = 127.0.0.1
 
 # End
diff --git a/test/confs/0565 b/test/confs/0565
index 510f3f573..c51fd6354 100644
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -39,13 +39,11 @@ begin transports
 remote_smtp:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
 
 remote_smtp_hdrs:
   driver = smtp
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   headers_only
 
diff --git a/test/confs/0568 b/test/confs/0568
index 5731085b7..dec5b0dbc 100644
--- a/test/confs/0568
+++ b/test/confs/0568
@@ -56,7 +56,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   hosts_try_auth = *
 
@@ -64,7 +63,6 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   hosts_try_auth = *
   authenticated_sender= brian
diff --git a/test/confs/3401 b/test/confs/3401
index 92c0afc32..60b1a4624 100644
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -62,14 +62,12 @@ smtp_try:
   driver = smtp
   hosts_try_auth = *
   port = PORT_S
-  interface = 127.0.0.1
   authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail}
 
 smtp_force:
   driver = smtp
   hosts_require_auth = *
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/3404 b/test/confs/3404
index e05ee7914..dc556e961 100644
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -50,7 +50,6 @@ smtp:
   driver = smtp
   hosts_try_auth = *
   port = PORT_S
-  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/3405 b/test/confs/3405
index 460c5842e..e3141510b 100644
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -45,6 +45,5 @@ smtp:
   headers_add = X-TAID: >$authenticated_id<
   hosts_try_auth = *
   port = PORT_S
-  interface = 127.0.0.1
 
 # End
diff --git a/test/confs/3412 b/test/confs/3412
index df8cadc87..bd8336e9e 100644
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -49,7 +49,6 @@ smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   hosts_try_auth = *
 
 # End
diff --git a/test/confs/5510 b/test/confs/5510
index c0531034d..48724213b 100644
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -42,7 +42,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   hosts_try_prdr = *
 
diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022
index 5e20032aa..92d955171 100644
--- a/test/scripts/0000-Basic/0022
+++ b/test/scripts/0000-Basic/0022
@@ -91,7 +91,7 @@ exim -bp
 ****
 exim -DSERVER=server -odq -bd -oX PORT_D
 ****
-client -t5 127.0.0.1 PORT_D 127.0.0.1
+client -t5 127.0.0.1 PORT_D
 ??? 220
 mail from:<x@y>
 ??? 250
diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035
index fc0850c90..147c8e7e2 100644
--- a/test/scripts/0000-Basic/0035
+++ b/test/scripts/0000-Basic/0035
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -61,7 +61,7 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/sender_retain -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -86,7 +86,7 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/name=SomeName -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/0000-Basic/0214 b/test/scripts/0000-Basic/0214
index 34d518efd..fa2a5334a 100644
--- a/test/scripts/0000-Basic/0214
+++ b/test/scripts/0000-Basic/0214
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 mail from:<x@y.x>
 ??? 250
diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230
index 8a64308af..1bd97d670 100644
--- a/test/scripts/0000-Basic/0230
+++ b/test/scripts/0000-Basic/0230
@@ -17,7 +17,7 @@ quit
 ??? 221
 +++ 1
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 mail from:<x@y.x>
 ??? 250
diff --git a/test/scripts/0000-Basic/0282 b/test/scripts/0000-Basic/0282
index 829b2c0d3..d19464e12 100644
--- a/test/scripts/0000-Basic/0282
+++ b/test/scripts/0000-Basic/0282
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D3
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -23,7 +23,7 @@ This is a test message.
 quit
 ??? 221
 ****
-client 127.0.0.1 PORT_D2 127.0.0.1
+client 127.0.0.1 PORT_D2
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/0000-Basic/0287 b/test/scripts/0000-Basic/0287
index f18ef8437..9aa9f52e2 100644
--- a/test/scripts/0000-Basic/0287
+++ b/test/scripts/0000-Basic/0287
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 20c2184bc..08996c7ef 100644
--- a/test/scripts/0000-Basic/0301
+++ b/test/scripts/0000-Basic/0301
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo abcd\r\nmail from:<userx@test.ex>
 ??? 250-
@@ -15,7 +15,7 @@ ehlo abcd\r\nmail from:<userx@test.ex>
 quit
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo abcd
 ??? 250-
@@ -39,7 +39,7 @@ quit
 ??? 221
 ****
 # For this one, the check will be dyamically turned on again
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo en.force
 ??? 250-
diff --git a/test/scripts/0000-Basic/0454 b/test/scripts/0000-Basic/0454
index e12f8904a..902e2966e 100644
--- a/test/scripts/0000-Basic/0454
+++ b/test/scripts/0000-Basic/0454
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -bd -DSERVER=server -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 helo rhu.barb
 ??? 250
diff --git a/test/scripts/0000-Basic/0458 b/test/scripts/0000-Basic/0458
index 2944146e1..062dec500 100644
--- a/test/scripts/0000-Basic/0458
+++ b/test/scripts/0000-Basic/0458
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -bd -DSERVER=server -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -22,7 +22,7 @@ DATA
 QUIT
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 helo rhu.barb
 ??? 250
@@ -37,7 +37,7 @@ DATA
 QUIT
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -56,7 +56,7 @@ DATA
 QUIT
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 helo rhu.barb
 ??? 250
@@ -71,7 +71,7 @@ DATA
 QUIT
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -94,7 +94,7 @@ DATA
 QUIT
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 helo rhu.barb
 ??? 250
@@ -113,7 +113,7 @@ DATA
 QUIT
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/0000-Basic/0460 b/test/scripts/0000-Basic/0460
index e3dda1d52..b91be2084 100644
--- a/test/scripts/0000-Basic/0460
+++ b/test/scripts/0000-Basic/0460
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -bd -DSERVER=server -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/0000-Basic/0480 b/test/scripts/0000-Basic/0480
index 45ab61958..cb4712bb1 100644
--- a/test/scripts/0000-Basic/0480
+++ b/test/scripts/0000-Basic/0480
@@ -20,7 +20,7 @@ quit
 ****
 exim -DSERVER=server -DIP1=127.0.0.1 -DIP2=HOSTIPV4 -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 helo foobar
 ??? 250
diff --git a/test/scripts/0000-Basic/0482 b/test/scripts/0000-Basic/0482
index c7c501125..48a53d749 100644
--- a/test/scripts/0000-Basic/0482
+++ b/test/scripts/0000-Basic/0482
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 helo foobar
 ??? 250
diff --git a/test/scripts/0000-Basic/0547 b/test/scripts/0000-Basic/0547
index b628c2278..2595eff48 100644
--- a/test/scripts/0000-Basic/0547
+++ b/test/scripts/0000-Basic/0547
@@ -3,15 +3,15 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 quit
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo x.y.z
 ??? 250
@@ -24,7 +24,7 @@ VRFY a@b.c
 quit
 ??? 221
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo x.y.z
 ??? 250
diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559
index 351df3de0..7ebc64d34 100644
--- a/test/scripts/0000-Basic/0559
+++ b/test/scripts/0000-Basic/0559
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client -t5 127.0.0.1 PORT_D 127.0.0.1
+client -t5 127.0.0.1 PORT_D
 ??? 220
 ehlo abcd
 ??? 250-
diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562
index 2fcaf354d..9355c46fc 100644
--- a/test/scripts/0000-Basic/0562
+++ b/test/scripts/0000-Basic/0562
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo abcd
 ??? 250-
@@ -18,14 +18,14 @@ mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 This is a test message.
 +++ 2
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 +++ 2
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 unknown
 ??? 500
@@ -36,7 +36,7 @@ unknown
 unknown
 ??? 500
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 vrfy
 ??? 252
@@ -49,7 +49,7 @@ vrfy
 vrfy
 ??? 554
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo abcd
 ??? 250-
diff --git a/test/scripts/0000-Basic/0564 b/test/scripts/0000-Basic/0564
index d1f9d1ee0..68fb607ec 100644
--- a/test/scripts/0000-Basic/0564
+++ b/test/scripts/0000-Basic/0564
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=wait:PORT_D -bw
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo abcd
 ??? 250-
diff --git a/test/scripts/3400-plaintext/3415 b/test/scripts/3400-plaintext/3415
index 22005aa07..d5bcc33be 100644
--- a/test/scripts/3400-plaintext/3415
+++ b/test/scripts/3400-plaintext/3415
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -38,7 +38,7 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=another.domain -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -65,7 +65,7 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain= -DAUTH_ID_DOMAIN=@auth.id.domain -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -92,7 +92,7 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain= -DAUTH_ID_DOMAIN=@auth.id.domain -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/5500-PRDR/5500 b/test/scripts/5500-PRDR/5500
index fec0701a2..567b00085 100644
--- a/test/scripts/5500-PRDR/5500
+++ b/test/scripts/5500-PRDR/5500
@@ -6,7 +6,7 @@ no_msglog_check
 #    z rejected, all after data per PRDR spec
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -39,7 +39,7 @@ sleep 1
 #
 #
 # 2: traditional data acl should be called, resulting in an overall reject
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -70,7 +70,7 @@ sleep 1
 #
 # 3: PRDR should be avoided for a single-recipient message
 # even though the client showed support.
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -94,7 +94,7 @@ quit
 sleep 1
 #
 # 4: double temp-reject
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -123,7 +123,7 @@ quit
 sleep 1
 #
 # 5: double reject
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/stderr/0217 b/test/stderr/0217
index 3ae4b8fe5..259df4604 100644
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -1,7 +1,7 @@
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmbL-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -827,7 +827,7 @@ LOG: MAIN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmbP-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
diff --git a/test/stderr/0218 b/test/stderr/0218
index 2ef5ae6c4..4c74ff294 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -15,7 +15,7 @@ queue running combined directories
 delivering 10HmaX-0005vi-00 (queue run pid ppppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -73,7 +73,7 @@ queue running combined directories
 delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -99,7 +99,7 @@ LOG: MAIN
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
@@ -129,7 +129,7 @@ T: send_to_server  (ACL)
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
diff --git a/test/stderr/0227 b/test/stderr/0227
index dc64b4e75..7a75ec015 100644
--- a/test/stderr/0227
+++ b/test/stderr/0227
@@ -1,6 +1,6 @@
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -17,7 +17,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -34,7 +34,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -51,7 +51,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -66,7 +66,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -82,7 +82,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -97,7 +97,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -113,7 +113,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1224 ... failed: Connection refused
 LOG: MAIN REJECT
   H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout
@@ -121,7 +121,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -136,7 +136,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -151,7 +151,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -173,7 +173,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -212,7 +212,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP>> QUIT
 LOG: MAIN REJECT
   H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: response to "initial connection" from 127.0.0.1 [127.0.0.1] was: connection dropped
@@ -222,7 +222,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN REJECT
   H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
 LOG: MAIN REJECT
diff --git a/test/stderr/0276 b/test/stderr/0276
index 29a77659e..2b01713f8 100644
--- a/test/stderr/0276
+++ b/test/stderr/0276
@@ -1,7 +1,7 @@
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-server id
@@ -19,7 +19,7 @@ LOG: MAIN
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 delivering 10HmaY-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
@@ -35,7 +35,7 @@ LOG: MAIN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmaZ-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-server id
@@ -52,7 +52,7 @@ LOG: MAIN
 LOG: MAIN
   <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 delivering 10HmbA-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
diff --git a/test/stderr/0376 b/test/stderr/0376
index 4a604b5bd..857295978 100644
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -11,8 +11,8 @@ Considering ok@localhost
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -57,8 +57,8 @@ Considering ok@localhost
 Attempting full verification using callout
 callout cache: found domain record
 callout cache: address record expired
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN REJECT
   H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
 created log directory TESTSUITE/spool/log
@@ -80,8 +80,8 @@ Considering bad@localhost
 Attempting full verification using callout
 callout cache: found domain record
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -134,8 +134,8 @@ Considering ok@localhost
 Attempting full verification using callout
 callout cache: found domain record
 callout cache: address record expired
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -184,8 +184,8 @@ Considering ok@otherhost
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -244,8 +244,8 @@ Considering ok@otherhost2
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -298,8 +298,8 @@ Considering ok@otherhost3
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -342,8 +342,8 @@ Considering ok@otherhost4
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -386,8 +386,8 @@ Considering ok@otherhost41
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -447,8 +447,8 @@ Considering ok@otherhost21
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -484,8 +484,8 @@ Attempting full verification using callout
 callout cache: found domain record
 callout cache: domain accepts RCPT TO:<postmaster@domain>
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -513,8 +513,8 @@ Considering ok@otherhost31
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -549,8 +549,8 @@ Attempting full verification using callout
 callout cache: found domain record
 callout cache: domain rejects random addresses
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -578,8 +578,8 @@ Considering okokok@otherhost31
 Attempting full verification using callout
 callout cache: domain record expired
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -613,8 +613,8 @@ Considering okok@otherhost51
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -644,8 +644,8 @@ Considering okokok@otherhost52
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -681,8 +681,8 @@ Considering abcd@x.y.z
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -713,8 +713,8 @@ Considering abcd@x.y.z
 Attempting full verification using callout
 callout cache: found domain record
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -742,8 +742,8 @@ Considering ok@otherhost9
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -780,8 +780,8 @@ Considering z@test.ex
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
diff --git a/test/stderr/0388 b/test/stderr/0388
index daad8d113..a7a266418 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -79,7 +79,7 @@ returned from EXIM_DBOPEN
 no retry data available
 127.0.0.1 in serialize_hosts? no (option unset)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (x@y)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
@@ -110,12 +110,12 @@ Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error
 LOG: MAIN
   H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0] for x@y: result DEFER
-added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL: errno=dd more_errno=dd,A flags=2
+added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224: errno=dd more_errno=dd,A flags=2
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess)
 search_tidyup called
 set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
 set_process_info: pppp delivering 10HmaX-0005vi-00
-reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL from subprocess
+reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess
   added retry item
 reading retry information for R:x@y from subprocess
   added retry item
@@ -147,14 +147,14 @@ dbfn_write: key=R:x@y
 address match test: subject=*@V4NET.0.0.0 pattern=*
 V4NET.0.0.0 in "*"? yes (matched "*")
 *@V4NET.0.0.0 in "*"? yes (matched "*")
-retry for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL (y) = * 0 0
-dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL
+retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0
+dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224
 failing_interval=ttt message_age=ttt
 on queue longer than maximum retry
-Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL
+Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224
   first failed=dddd last try=dddd next try=+0 expired=0
   errno=dd more_errno=dd,A Network Error
-dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL
+dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224
 timed out: all retries expired
 LOG: MAIN
   ** x@y: retry timeout exceeded
diff --git a/test/stderr/0398 b/test/stderr/0398
index 82ec32293..5118c1af7 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -123,8 +123,8 @@ dbfn_read: key=remote
 callout cache: found domain record
 dbfn_read: key=qq@remote
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex
diff --git a/test/stderr/0432 b/test/stderr/0432
index 533fc0d3b..a9581e9b4 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -87,8 +87,8 @@ dbfn_read: key=y
 callout cache: no domain record found
 dbfn_read: key=x@y
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
@@ -245,8 +245,8 @@ MUNGED: ::1 will be omitted in what follows
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found
 >>> callout cache: no address record found
->>> interface=127.0.0.1 port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+>>> interface=NULL port=1224
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
@@ -286,8 +286,8 @@ MUNGED: ::1 will be omitted in what follows
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found
 >>> callout cache: no address record found
->>> interface=127.0.0.1 port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+>>> interface=NULL port=1224
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
diff --git a/test/stderr/0462 b/test/stderr/0462
index 255a7696a..f9133d602 100644
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -11,8 +11,8 @@ Considering Ok@localhost
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -60,8 +60,8 @@ Considering NOTok@elsewhere
 Attempting full verification using callout
 callout cache: no domain record found
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -93,8 +93,8 @@ Considering NOTok2@elsewhere
 Attempting full verification using callout
 callout cache: found domain record
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
diff --git a/test/stderr/0473 b/test/stderr/0473
index 2c5b343c6..090335d97 100644
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -11,8 +11,8 @@ Considering r11@two.test.ex
 Attempting full verification using callout
 callout cache: found domain record
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO the.local.host.name
   SMTP<< 250 OK
@@ -40,8 +40,8 @@ Considering r11@two.test.ex
 Attempting full verification using callout
 callout cache: found domain record
 callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 SMTP timeout
 LOG: MAIN REJECT
   U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout
diff --git a/test/stderr/0476 b/test/stderr/0476
index 0e649913f..f0dc33650 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -16,7 +16,7 @@ checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO the.local.host.name
   SMTP<< 250-server id
@@ -66,7 +66,7 @@ checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 status = usable
 delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
 set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for CALLER@the.local.host.name: result DEFER
diff --git a/test/stderr/0525 b/test/stderr/0525
index 8352a041e..553f8c1ce 100644
--- a/test/stderr/0525
+++ b/test/stderr/0525
@@ -3,7 +3,7 @@ LOG: smtp_connection MAIN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Welcome
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 Hi
diff --git a/test/stderr/3404 b/test/stderr/3404
index 516102adb..8d35b6730 100644
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -1,7 +1,7 @@
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -25,7 +25,7 @@ LOG: MAIN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaY-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -49,7 +49,7 @@ LOG: MAIN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaZ-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
diff --git a/test/stdout/0548 b/test/stdout/0548
index 1aa56c666..7f7d788b6 100644
--- a/test/stdout/0548
+++ b/test/stdout/0548
@@ -1,15 +1,15 @@
 +++++++++++++++++++++++++++
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred
 first failed = time last try = time2 next try = time2 + 1
-  T:thishost.test.ex:127.0.0.1:1225/127.0.0.1 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+  T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
 first failed = time last try = time2 next try = time2 + 1
 +++++++++++++++++++++++++++
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred
 first failed = time last try = time2 next try = time2 + 5 *
-  T:thishost.test.ex:127.0.0.1:1225/127.0.0.1 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+  T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
 first failed = time last try = time2 next try = time2 + 1
 +++++++++++++++++++++++++++
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred
 first failed = time last try = time2 next try = time2 + 5 *
-  T:thishost.test.ex:127.0.0.1:1225/127.0.0.1 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+  T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
 first failed = time last try = time2 next try = time2 + 1