Gitweb:
http://git.exim.org/exim.git/commitdiff/30079bc1d20c0473d012ef33654358cfadb0a2ff
Commit: 30079bc1d20c0473d012ef33654358cfadb0a2ff
Parent: 36e1cc0b9acab3a1e1d891f671bd03f0e2d98980
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Dec 13 20:18:39 2014 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sat Dec 13 20:18:39 2014 +0000
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 +
test/scripts/0000-Basic/0022 | 2 +-
test/scripts/0000-Basic/0035 | 6 +-
test/scripts/0000-Basic/0214 | 2 +-
test/scripts/0000-Basic/0230 | 2 +-
test/scripts/0000-Basic/0282 | 4 +-
test/scripts/0000-Basic/0287 | 2 +-
test/scripts/0000-Basic/0301 | 6 +-
test/scripts/0000-Basic/0454 | 2 +-
test/scripts/0000-Basic/0458 | 14 +++---
test/scripts/0000-Basic/0460 | 2 +-
test/scripts/0000-Basic/0480 | 2 +-
test/scripts/0000-Basic/0482 | 2 +-
test/scripts/0000-Basic/0547 | 8 ++--
test/scripts/0000-Basic/0559 | 2 +-
test/scripts/0000-Basic/0562 | 12 +++---
test/scripts/0000-Basic/0564 | 2 +-
test/scripts/3400-plaintext/3415 | 8 ++--
test/scripts/5500-PRDR/5500 | 10 ++--
test/stderr/0217 | 4 +-
test/stderr/0218 | 8 ++--
test/stderr/0227 | 28 +++++++-------
test/stderr/0276 | 8 ++--
test/stderr/0376 | 80 +++++++++++++++++++-------------------
test/stderr/0388 | 14 +++---
test/stderr/0398 | 4 +-
test/stderr/0432 | 12 +++---
test/stderr/0462 | 12 +++---
test/stderr/0473 | 8 ++--
test/stderr/0476 | 4 +-
test/stderr/0525 | 2 +-
test/stderr/3404 | 6 +-
test/stdout/0548 | 6 +-
115 files changed, 236 insertions(+), 144 deletions(-)
diff --git a/test/confs/0015 b/test/confs/0015
index fbfa534..2ae63be 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 6b455fa..22230c1 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 948d807..e35671a 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 7d88395..c8c2f86 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 d58ddea..f15bea3 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 48d493c..8857c2a 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 16d5292..8490482 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 273d0a7..5caa6f0 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 0aee0c0..1c4e6ab 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 08cb1d2..fef5f29 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 3b34b0c..f8851fc 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 410d2bf..36ee85c 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 284e384..1858c40 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 f1080e0..de755ca 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 a80fb6d..d55e1db 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 b9db7a0..c4ab4e6 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 486f1ae..c11fc7b 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 3894373..860909d 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 16a8a33..1a26a84 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 102fd0a..1266a7e 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 04195d1..846a089 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 96d97cb..da5958f 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 4458e18..d185033 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 06fae3f..063ced4 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 721b8f7..fcae1da 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 0acf78f..9eae48d 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 b72de8c..1e71872 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@???
diff --git a/test/confs/0259 b/test/confs/0259
index cd5c303..72dc009 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 96ce209..ddd49cb 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 f583248..06ca3f9 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 b7746b5..33fe2b4 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 938e08e..522423c 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 f956a18..12361fb 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 a33232e..5a66e6b 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 f9ad188..aabaa42 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 3e97eb8..9f853be 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 1719d5d..81ed9a8 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 560676b..6b243e8 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 e66020b..fe70fd8 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 5b7185d..1ae1698 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 f9a8d1c..b826003 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 3c1381b..69a0311 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 a1322bb..f5bf778 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 d86d1dd..2d68016 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 0252cbd..4c8f2f8 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 31c5617..565b781 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 8ae83de..bfc1aad 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 b61fead..438b284 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 68e7a41..d10dd9d 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 0cf9422..8b2fa19 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 1f69870..96cb76d 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 9c3bb73..477833d 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 5b51101..f56d6ad 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 7ff47e6..42d6c18 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 56011f4..39c297c 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 acbe1ff..37dd435 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 4596e39..7bb526b 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 baa3f15..8894c4f 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 bcdd980..70314f0 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 8706c79..b33cbf1 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 23748ae..1df7808 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 b00c634..2cc8c70 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 f604f5e..6e71fef 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 f76721a..15058d7 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 2c200f0..3724894 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 d8f24ae..f306962 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 56f679e..b0ee602 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 5865e31..13564d5 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 641335f..f9a23f3 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 e68280b..bbe942f 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 6306943..0f990c3 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 e08750f..865b97a 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 3ce7751..e7ec612 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 bdbc8df..b965bf4 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 edeb977..cf337b2 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 ecdbf95..801afbd 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 c51fd63..510f3f5 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 dec5b0d..5731085 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 60b1a46..92c0afc 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@???}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 dc556e9..e05ee79 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 e314151..460c584 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 bd8336e..df8cadc 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 4872421..c053103 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 = *
diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022
index 92d9551..5e20032 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
+client -t5 127.0.0.1 PORT_D 127.0.0.1
??? 220
mail from:<x@y>
??? 250
diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035
index 147c8e7..fc0850c 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
diff --git a/test/scripts/0000-Basic/0214 b/test/scripts/0000-Basic/0214
index fa2a533..34d518e 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
mail from:<x@???>
??? 250
diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230
index 1bd97d6..8a64308 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
mail from:<x@???>
??? 250
diff --git a/test/scripts/0000-Basic/0282 b/test/scripts/0000-Basic/0282
index d19464e..829b2c0 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
@@ -23,7 +23,7 @@ This is a test message.
quit
??? 221
****
-client 127.0.0.1 PORT_D2
+client 127.0.0.1 PORT_D2 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
diff --git a/test/scripts/0000-Basic/0287 b/test/scripts/0000-Basic/0287
index 9aa9f52..f18ef84 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 08996c7..20c2184 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo abcd\r\nmail from:<userx@???>
??? 250-
@@ -15,7 +15,7 @@ ehlo abcd\r\nmail from:<userx@???>
quit
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo en.force
??? 250-
diff --git a/test/scripts/0000-Basic/0454 b/test/scripts/0000-Basic/0454
index 902e296..e12f890 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
helo rhu.barb
??? 250
diff --git a/test/scripts/0000-Basic/0458 b/test/scripts/0000-Basic/0458
index 062dec5..2944146 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
@@ -22,7 +22,7 @@ DATA
QUIT
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
helo rhu.barb
??? 250
@@ -37,7 +37,7 @@ DATA
QUIT
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
@@ -56,7 +56,7 @@ DATA
QUIT
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
helo rhu.barb
??? 250
@@ -71,7 +71,7 @@ DATA
QUIT
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
@@ -94,7 +94,7 @@ DATA
QUIT
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
helo rhu.barb
??? 250
@@ -113,7 +113,7 @@ DATA
QUIT
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
diff --git a/test/scripts/0000-Basic/0460 b/test/scripts/0000-Basic/0460
index b91be20..e3dda1d 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
diff --git a/test/scripts/0000-Basic/0480 b/test/scripts/0000-Basic/0480
index cb4712b..45ab619 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
helo foobar
??? 250
diff --git a/test/scripts/0000-Basic/0482 b/test/scripts/0000-Basic/0482
index 48a53d7..c7c5011 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
helo foobar
??? 250
diff --git a/test/scripts/0000-Basic/0547 b/test/scripts/0000-Basic/0547
index 2595eff..b628c22 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
quit
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo x.y.z
??? 250
@@ -24,7 +24,7 @@ VRFY a@???
quit
??? 221
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo x.y.z
??? 250
diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559
index 7ebc64d..351df3d 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
+client -t5 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo abcd
??? 250-
diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562
index 9355c46..2fcaf35 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo abcd
??? 250-
@@ -18,14 +18,14 @@ mail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata
This is a test message.
+++ 2
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
+++ 2
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
unknown
??? 500
@@ -36,7 +36,7 @@ unknown
unknown
??? 500
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
vrfy
??? 252
@@ -49,7 +49,7 @@ vrfy
vrfy
??? 554
****
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo abcd
??? 250-
diff --git a/test/scripts/0000-Basic/0564 b/test/scripts/0000-Basic/0564
index 68fb607..d1f9d1e 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo abcd
??? 250-
diff --git a/test/scripts/3400-plaintext/3415 b/test/scripts/3400-plaintext/3415
index d5bcc33..22005aa 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
diff --git a/test/scripts/5500-PRDR/5500 b/test/scripts/5500-PRDR/5500
index 567b000..fec0701 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 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
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
@@ -94,7 +94,7 @@ quit
sleep 1
#
# 4: double temp-reject
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
@@ -123,7 +123,7 @@ quit
sleep 1
#
# 5: double reject
-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D 127.0.0.1
??? 220
ehlo rhu.barb
??? 250-
diff --git a/test/stderr/0217 b/test/stderr/0217
index 259df46..3ae4b8f 100644
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -1,7 +1,7 @@
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
delivering 10HmbL-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
@@ -827,7 +827,7 @@ LOG: MAIN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
delivering 10HmbP-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
diff --git a/test/stderr/0218 b/test/stderr/0218
index 4c74ff2..2ef5ae6 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
diff --git a/test/stderr/0227 b/test/stderr/0227
index 7a75ec0..dc64b4e 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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@???>: 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 2b01713..29a7765 100644
--- a/test/stderr/0276
+++ b/test/stderr/0276
@@ -1,7 +1,7 @@
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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@??? U=CALLER P=local S=sss
delivering 10HmaZ-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 8572959..4a604b5 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
+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
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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -681,8 +681,8 @@ Considering abcd@???
Attempting full verification using callout
callout cache: no domain record found
callout cache: no address record found
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -713,8 +713,8 @@ Considering abcd@???
Attempting full verification using callout
callout cache: found domain record
callout cache: no address record found
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -780,8 +780,8 @@ Considering z@???
Attempting full verification using callout
callout cache: no domain record found
callout cache: no address record found
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
diff --git a/test/stderr/0388 b/test/stderr/0388
index a7a2664..daad8d1 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 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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: errno=dd more_errno=dd,A flags=2
+added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL: 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 from subprocess
+reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL 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 (y) = * 0 0
-dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224
+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
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
+Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL
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
+dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL
timed out: all retries expired
LOG: MAIN
** x@y: retry timeout exceeded
diff --git a/test/stderr/0398 b/test/stderr/0398
index 5118c1a..82ec322 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 a9581e9..533fc0d 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+>>> interface=127.0.0.1 port=1224
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+>>> interface=127.0.0.1 port=1224
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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 f9133d6..255a769 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
diff --git a/test/stderr/0473 b/test/stderr/0473
index 090335d..2c5b343 100644
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -11,8 +11,8 @@ Considering r11@???
Attempting full verification using callout
callout cache: found domain record
callout cache: no address record found
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO the.local.host.name
SMTP<< 250 OK
@@ -40,8 +40,8 @@ Considering r11@???
Attempting full verification using callout
callout cache: found domain record
callout cache: no address record found
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=127.0.0.1 port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP timeout
LOG: MAIN REJECT
U=CALLER F=<x11@???> temporarily rejected RCPT r11@???: Could not complete recipient verify callout
diff --git a/test/stderr/0476 b/test/stderr/0476
index f0dc336..0e64991 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@???)
set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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@???)
set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... 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@???: result DEFER
diff --git a/test/stderr/0525 b/test/stderr/0525
index 553f8c1..8352a04 100644
--- a/test/stderr/0525
+++ b/test/stderr/0525
@@ -3,7 +3,7 @@ LOG: smtp_connection MAIN
LOG: MAIN
<= CALLER@??? U=CALLER P=local-smtp S=sss
delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 Welcome
SMTP>> EHLO myhost.test.ex
SMTP<< 250 Hi
diff --git a/test/stderr/3404 b/test/stderr/3404
index 8d35b67..516102a 100644
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -1,7 +1,7 @@
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
@@ -25,7 +25,7 @@ LOG: MAIN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
delivering 10HmaY-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
@@ -49,7 +49,7 @@ LOG: MAIN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
delivering 10HmaZ-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
diff --git a/test/stdout/0548 b/test/stdout/0548
index 7f7d788..1aa56c6 100644
--- a/test/stdout/0548
+++ b/test/stdout/0548
@@ -1,15 +1,15 @@
+++++++++++++++++++++++++++
R:userx@???:<CALLER@???> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
first failed = time last try = time2 next try = time2 + 1
- 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
+ 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
first failed = time last try = time2 next try = time2 + 1
+++++++++++++++++++++++++++
R:userx@???:<CALLER@???> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
first failed = time last try = time2 next try = time2 + 5 *
- 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
+ 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
first failed = time last try = time2 next try = time2 + 1
+++++++++++++++++++++++++++
R:userx@???:<CALLER@???> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
first failed = time last try = time2 next try = time2 + 5 *
- 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
+ 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
first failed = time last try = time2 next try = time2 + 1
