From 30079bc1d20c0473d012ef33654358cfadb0a2ff Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 13 Dec 2014 20:18:39 +0000
Subject: Testsuite: Use explicit interface for send to localhost

FreeBSD is more lax in its choice of local address to bind; the
difference is just noise in testcase output.
---
 test/confs/0015 | 1 +
 test/confs/0033 | 1 +
 test/confs/0100 | 1 +
 test/confs/0101 | 1 +
 test/confs/0106 | 1 +
 test/confs/0160 | 1 +
 test/confs/0163 | 1 +
 test/confs/0177 | 1 +
 test/confs/0179 | 1 +
 test/confs/0185 | 1 +
 test/confs/0190 | 2 ++
 test/confs/0191 | 1 +
 test/confs/0201 | 1 +
 test/confs/0203 | 1 +
 test/confs/0208 | 1 +
 test/confs/0209 | 1 +
 test/confs/0210 | 1 +
 test/confs/0211 | 1 +
 test/confs/0213 | 1 +
 test/confs/0215 | 1 +
 test/confs/0216 | 1 +
 test/confs/0217 | 1 +
 test/confs/0218 | 1 +
 test/confs/0227 | 1 +
 test/confs/0231 | 1 +
 test/confs/0242 | 1 +
 test/confs/0253 | 1 +
 test/confs/0259 | 1 +
 test/confs/0276 | 1 +
 test/confs/0285 | 1 +
 test/confs/0286 | 1 +
 test/confs/0288 | 1 +
 test/confs/0299 | 1 +
 test/confs/0322 | 1 +
 test/confs/0332 | 1 +
 test/confs/0333 | 1 +
 test/confs/0341 | 1 +
 test/confs/0357 | 1 +
 test/confs/0358 | 1 +
 test/confs/0363 | 1 +
 test/confs/0367 | 1 +
 test/confs/0374 | 1 +
 test/confs/0375 | 3 +++
 test/confs/0376 | 1 +
 test/confs/0388 | 1 +
 test/confs/0398 | 1 +
 test/confs/0413 | 2 ++
 test/confs/0426 | 1 +
 test/confs/0429 | 1 +
 test/confs/0431 | 1 +
 test/confs/0432 | 1 +
 test/confs/0440 | 1 +
 test/confs/0461 | 1 +
 test/confs/0462 | 1 +
 test/confs/0467 | 1 +
 test/confs/0473 | 1 +
 test/confs/0474 | 1 +
 test/confs/0476 | 1 +
 test/confs/0478 | 3 ++-
 test/confs/0495 | 1 +
 test/confs/0497 | 1 +
 test/confs/0498 | 1 +
 test/confs/0504 | 1 +
 test/confs/0511 | 1 +
 test/confs/0518 | 2 ++
 test/confs/0525 | 1 +
 test/confs/0531 | 1 +
 test/confs/0538 | 1 +
 test/confs/0540 | 2 ++
 test/confs/0543 | 1 +
 test/confs/0548 | 1 +
 test/confs/0550 | 1 +
 test/confs/0552 | 3 ++-
 test/confs/0553 | 1 +
 test/confs/0554 | 1 +
 test/confs/0561 | 1 +
 test/confs/0565 | 2 ++
 test/confs/0568 | 2 ++
 test/confs/3401 | 2 ++
 test/confs/3404 | 1 +
 test/confs/3405 | 1 +
 test/confs/3412 | 1 +
 test/confs/5510 | 1 +
 83 files changed, 94 insertions(+), 2 deletions(-)

(limited to 'test/confs')

diff --git a/test/confs/0015 b/test/confs/0015
index fbfa534df..2ae63be32 100644
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -106,6 +106,7 @@ 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 6b455fa8a..22230c1ca 100644
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -43,5 +43,6 @@ 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 948d807c1..e35671af4 100644
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -77,6 +77,7 @@ 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 7d88395b9..c8c2f8604 100644
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -55,6 +55,7 @@ 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 d58ddea98..f15bea385 100644
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -34,6 +34,7 @@ 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 48d493c76..8857c2a86 100644
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -36,6 +36,7 @@ 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 16d5292f3..8490482a0 100644
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -33,6 +33,7 @@ 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 273d0a7c2..5caa6f01d 100644
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -80,6 +80,7 @@ autoreply:
 smtp:
   driver = smtp
   port = PORT_S
+  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0179 b/test/confs/0179
index 0aee0c056..1c4e6ab81 100644
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -34,6 +34,7 @@ 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 08cb1d2c7..fef5f29f1 100644
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -77,6 +77,7 @@ autoreply:
 smtp:
   driver = smtp
   port = PORT_S
+  interface = 127.0.0.1
 
 
 # ----- Retry -----
diff --git a/test/confs/0190 b/test/confs/0190
index 3b34b0cad..f8851fc8b 100644
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -94,6 +94,7 @@ smtp:
 smtp2:
   driver = smtp
   port = PORT_S
+  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 smtp3:
   driver = smtp
@@ -101,6 +102,7 @@ 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 410d2bf09..36ee85c06 100644
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -33,6 +33,7 @@ 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 284e3848b..1858c40e9 100644
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -31,6 +31,7 @@ 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 f1080e060..de755ca6b 100644
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -34,6 +34,7 @@ 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 a80fb6de5..d55e1db9b 100644
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -64,6 +64,7 @@ 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 b9db7a0cc..c4ab4e6bd 100644
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -44,6 +44,7 @@ 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 486f1ae3d..c11fc7b7d 100644
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -67,6 +67,7 @@ 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 389437340..860909d1b 100644
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -53,6 +53,7 @@ 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 16a8a33a8..1a26a84e3 100644
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -34,6 +34,7 @@ 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 102fd0ada..1266a7e97 100644
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -45,6 +45,7 @@ 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 04195d153..846a0894f 100644
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -39,6 +39,7 @@ 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 96d97cba4..da5958ff7 100644
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -45,6 +45,7 @@ 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 4458e1846..d185033ea 100644
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -56,6 +56,7 @@ 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 06fae3f56..063ced481 100644
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -82,6 +82,7 @@ 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 721b8f7e5..fcae1da18 100644
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -70,6 +70,7 @@ 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 0acf78fca..9eae48d94 100644
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -35,6 +35,7 @@ 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 b72de8cd2..1e7187243 100644
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -69,6 +69,7 @@ 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 cd5c30362..72dc00963 100644
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -29,6 +29,7 @@ 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 96ce20957..ddd49cb26 100644
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -21,6 +21,7 @@ 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 f58324817..06ca3f91f 100644
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -38,6 +38,7 @@ 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 b7746b5e7..33fe2b463 100644
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -39,6 +39,7 @@ 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 938e08ed5..522423c6b 100644
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -34,6 +34,7 @@ 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 f956a1836..12361fbf9 100644
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -43,6 +43,7 @@ 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 a33232ee6..5a66e6b39 100644
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -38,6 +38,7 @@ 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 f9ad188d6..aabaa42a4 100644
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -39,6 +39,7 @@ 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 3e97eb804..9f853be65 100644
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -38,6 +38,7 @@ 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 1719d5d47..81ed9a8ae 100644
--- a/test/confs/0341
+++ b/test/confs/0341
@@ -52,6 +52,7 @@ 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 560676b14..6b243e860 100644
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -31,6 +31,7 @@ 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 e66020b69..fe70fd8fe 100644
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -31,6 +31,7 @@ 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 5b7185d42..1ae169891 100644
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -31,6 +31,7 @@ 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 f9a8d1ca5..b826003bd 100644
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -33,6 +33,7 @@ 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 3c1381b8c..69a031165 100644
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -81,6 +81,7 @@ 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 a1322bbed..f5bf7783f 100644
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -119,6 +119,7 @@ ut4:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  interface = 127.0.0.1
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -129,6 +130,7 @@ ut5:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  interface = 127.0.0.1
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -140,6 +142,7 @@ 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 d86d1dd55..2d68016ec 100644
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -71,6 +71,7 @@ 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 0252cbd9e..4c8f2f88d 100644
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -36,6 +36,7 @@ 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 31c561765..565b78177 100644
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -65,6 +65,7 @@ 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 8ae83dee3..bfc1aad94 100644
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -56,6 +56,7 @@ 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
@@ -63,6 +64,7 @@ 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 b61fead03..438b28429 100644
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -34,6 +34,7 @@ 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 68e7a417a..d10dd9dd7 100644
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -29,6 +29,7 @@ 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 0cf942225..8b2fa19eb 100644
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -47,6 +47,7 @@ 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 1f69870de..96cb76dd8 100644
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -42,6 +42,7 @@ 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 9c3bb73de..477833d61 100644
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -33,6 +33,7 @@ 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 5b5110104..f56d6ad57 100644
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -42,6 +42,7 @@ 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 7ff47e6b5..42d6c188b 100644
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -49,6 +49,7 @@ 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 56011f4a3..39c297c0d 100644
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -32,5 +32,6 @@ 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 acbe1ff8c..37dd43560 100644
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -47,5 +47,6 @@ 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 4596e3922..7bb526b67 100644
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -29,6 +29,7 @@ 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 baa3f15a5..8894c4f57 100644
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -31,6 +31,7 @@ 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 bcdd98069..70314f0f1 100644
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -31,8 +31,9 @@ begin transports
 
 t1:
   driver = smtp
-  port = PORT_D
   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}}
   allow_localhost
   connect_timeout = 1s
 
diff --git a/test/confs/0495 b/test/confs/0495
index 8706c790b..b33cbf1ef 100644
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -69,6 +69,7 @@ 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 23748aedf..1df7808cf 100644
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -35,6 +35,7 @@ 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 b00c634ae..2cc8c706c 100644
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -35,6 +35,7 @@ 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 f604f5e5d..6e71fef84 100644
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -40,6 +40,7 @@ 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 f76721ac9..15058d703 100644
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -29,6 +29,7 @@ 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 2c200f07f..372489467 100644
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -45,6 +45,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  interface = 127.0.0.1
   allow_localhost
   rcpt_include_affixes
 
@@ -52,6 +53,7 @@ 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 d8f24ae54..f30696241 100644
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -37,6 +37,7 @@ 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 56f679ed8..b0ee60296 100644
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -44,6 +44,7 @@ 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 5865e3110..13564d57c 100644
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -45,6 +45,7 @@ begin transports
 
 t1:
   driver = smtp
+  interface = 127.0.0.1
 
 
 # End
diff --git a/test/confs/0540 b/test/confs/0540
index 641335f6b..f9a23f306 100644
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -41,6 +41,7 @@ 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}}
 
@@ -48,6 +49,7 @@ 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 e68280b0e..bbe942fa4 100644
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -33,6 +33,7 @@ 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 6306943de..0f990c31a 100644
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -49,6 +49,7 @@ 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 e08750fdd..865b97a52 100644
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -29,6 +29,7 @@ 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 3ce775148..e7ec612ab 100644
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -50,8 +50,9 @@ begin transports
 
 t1:
   driver = smtp
-  port = PORT_D
   hosts = 127.0.0.1
+  port = PORT_D
+  interface = 127.0.0.1
   allow_localhost
   command_timeout = 2s
 
diff --git a/test/confs/0553 b/test/confs/0553
index bdbc8df48..b965bf4aa 100644
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -50,6 +50,7 @@ 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 edeb977fa..cf337b21b 100644
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -30,6 +30,7 @@ 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 ecdbf9504..801afbd34 100644
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -38,5 +38,6 @@ 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 c51fd6354..510f3f573 100644
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -39,11 +39,13 @@ 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 dec5b0dbc..5731085b7 100644
--- a/test/confs/0568
+++ b/test/confs/0568
@@ -56,6 +56,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  interface = 127.0.0.1
   allow_localhost
   hosts_try_auth = *
 
@@ -63,6 +64,7 @@ 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 60b1a4624..92c0afc32 100644
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -62,12 +62,14 @@ 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 dc556e961..e05ee7914 100644
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -50,6 +50,7 @@ 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 e3141510b..460c5842e 100644
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -45,5 +45,6 @@ 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 bd8336e9e..df8cadc87 100644
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -49,6 +49,7 @@ 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 48724213b..c0531034d 100644
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -42,6 +42,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  interface = 127.0.0.1
   allow_localhost
   hosts_try_prdr = *
 
-- 
cgit v1.2.3