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

author Jeremy Harris <jgh146exb@wizmail.org>

Sun, 14 Dec 2014 17:31:44 +0000 (17:31 +0000)

committer Jeremy Harris <jgh146exb@wizmail.org>

Sun, 14 Dec 2014 17:31:44 +0000 (17:31 +0000)
author Jeremy Harris <jgh146exb@wizmail.org>
Sun, 14 Dec 2014 17:31:44 +0000 (17:31 +0000)
committer Jeremy Harris <jgh146exb@wizmail.org>
Sun, 14 Dec 2014 17:31:44 +0000 (17:31 +0000)
diff --git a/test/confs/0015 b/test/confs/0015

index 2ae63be323655496d488041e97aab22baf6f6217..fbfa534df87e5682fdac2533637e709d84f7ecea 100644 (file)
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -106,7 +106,6 @@ delivery_s:
    hosts = 127.0.0.1
    port = PORT_S
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
    allow_localhost
-  interface = 127.0.0.1
  
  address_reply:
    driver = autoreply
  
  address_reply:
    driver = autoreply
diff --git a/test/confs/0033 b/test/confs/0033

index 22230c1cac3c6eac235aafd983853687cfc90433..6b455fa8a3bd4487f39a517020982e2afedf8a75 100644 (file)
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -43,6 +43,5 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  # End
  
  # End
diff --git a/test/confs/0100 b/test/confs/0100

index e35671af42734b634bf9b96c53698b4d3ee89611..948d807c1ad4376eb9e304d590a61c28d40bd209 100644 (file)
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -77,7 +77,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
  
  filtered_smtp:
    driver = smtp
  
  filtered_smtp:
    driver = smtp
diff --git a/test/confs/0101 b/test/confs/0101

index c8c2f86049cffdbd7972329f81d839b35369576b..7d88395b95a10f88f344386247f01d30c4fd7d06 100644 (file)
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -55,7 +55,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  local_delivery:
    driver = pipe
  
  local_delivery:
    driver = pipe
diff --git a/test/confs/0106 b/test/confs/0106

index f15bea385429f71c9dc0b6cc5e0c6d6e7271bae4..d58ddea98034180bc04fd8235125fae95796a5c2 100644 (file)
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -34,7 +34,6 @@ smtp:
    command_timeout = 1s
    final_timeout = 1s
    port = PORT_S
    command_timeout = 1s
    final_timeout = 1s
    port = PORT_S
-  interface = 127.0.0.1
  
  # ----- Retry -----
  
  
  # ----- Retry -----
  
diff --git a/test/confs/0160 b/test/confs/0160

index 8857c2a864b69ec30189e6d17bbe4bcfc7ad4512..48d493c76504e14a9db7a4849028ae5eb7503825 100644 (file)
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -36,7 +36,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0163 b/test/confs/0163

index 8490482a002e9fb9a8e47b3ab4d0cbf2b7ae42c5..16d5292f3dc2849c62c0a1e2db8dc30507b2086f 100644 (file)
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -33,7 +33,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0177 b/test/confs/0177

index 5caa6f01d397d1808fcdf9efe88426fa36adc108..273d0a7c27b1fe28c7a7015518e94e04b7b53065 100644 (file)
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -80,7 +80,6 @@ autoreply:
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0179 b/test/confs/0179

index 1c4e6ab81bcb869c82432e34637568ff67e10380..0aee0c0562be96dea018a9bcaf9ce9485a78ba42 100644 (file)
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -34,7 +34,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0185 b/test/confs/0185

index fef5f29f17138a908d2a65290dd504ea43e7a8e4..08cb1d2c74defec7d16e4201436f649de70a3ef0 100644 (file)
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -77,7 +77,6 @@ autoreply:
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0190 b/test/confs/0190

index f8851fc8b27659799d3a9474b4f026850982db26..3b34b0cad19a6dd2cca3ad8c4f89bf34d675a566 100644 (file)
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -94,7 +94,6 @@ smtp:
  smtp2:
    driver = smtp
    port = PORT_S
  smtp2:
    driver = smtp
    port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
  
  smtp3:
    driver = smtp
  
  smtp3:
    driver = smtp
@@ -102,7 +101,6 @@ smtp3:
    max_rcpt = 2
    connection_max_messages = 1
    port = PORT_S
    max_rcpt = 2
    connection_max_messages = 1
    port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0191 b/test/confs/0191

index 36ee85c06092a41699b85c232eb004f838441f78..410d2bf09e526856810feee14bed081b6cf441d4 100644 (file)
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -33,7 +33,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  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"
    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 1858c40e9ef760f01341a2e34a52cb59d03e9939..284e3848b85282c7c4b99363c380e6660b6d512e 100644 (file)
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -31,7 +31,6 @@ t1:
    hosts = 127.0.0.1
    allow_localhost
    port = PORT_S
    hosts = 127.0.0.1
    allow_localhost
    port = PORT_S
-  interface = 127.0.0.1
    transport_filter = /bin/sh -c 'cat; exit 99'
  
  
    transport_filter = /bin/sh -c 'cat; exit 99'
  
  
diff --git a/test/confs/0203 b/test/confs/0203

index de755ca6b02b67004af8d70192f2058cd7c8ec82..f1080e060fcaaaf4120ca10dae890c97b60c4fc5 100644 (file)
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -34,7 +34,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0208 b/test/confs/0208

index d55e1db9b96ccd3cbb6bc875a0f0f7011af4adb0..a80fb6de57e4fb1c78e894263259db795e41595a 100644 (file)
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -64,7 +64,6 @@ fail:
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0209 b/test/confs/0209

index c4ab4e6bdbd3af28e48178c5d27eaa2fca24c026..b9db7a0cc7c9061ac9796dfea0f4f55ef4cebc70 100644 (file)
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -44,7 +44,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0210 b/test/confs/0210

index c11fc7b7db47d562c3892f64c4ecbd33ef088b54..486f1ae3d15d650c43802760a719269a2017c6d8 100644 (file)
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -67,7 +67,6 @@ bsmtp_smtp:
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0211 b/test/confs/0211

index 860909d1b3a4c6eb8a833d93eefc1da833e7de80..389437340cdbd393a69c227c7aa0bbee1d89487e 100644 (file)
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -53,7 +53,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  local_delivery:
    driver = appendfile
  
  local_delivery:
    driver = appendfile
diff --git a/test/confs/0213 b/test/confs/0213

index 1a26a84e31a5820f97b7d42f00548e3ea9f49bf9..16a8a33a86bde25bc19afbcc4a5e5230de1077c0 100644 (file)
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -34,7 +34,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0215 b/test/confs/0215

index 1266a7e97b6f173f3cf193ad4203aeed24ed4afa..102fd0ada4d8db25fd61ce8495e0b1f8b051e720 100644 (file)
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -45,7 +45,6 @@ lmtp:
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    protocol = LMTP
    lmtp_ignore_quota = IGNORE_QUOTA
    AUTHS
    protocol = LMTP
    lmtp_ignore_quota = IGNORE_QUOTA
    AUTHS
diff --git a/test/confs/0216 b/test/confs/0216

index 846a0894fdf168870a37fd887c82889d706a58ca..04195d15323272f949884e0798115b240f6acaa9 100644 (file)
--- 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
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_D
-  interface = 127.0.0.1
    max_rcpt = 0
  
  
    max_rcpt = 0
  
  
diff --git a/test/confs/0217 b/test/confs/0217

index da5958ff7d1604bb3576f6f0dfb1b5aac75743f0..96d97cba48714a2e4f6c6327ffdef516ce627e07 100644 (file)
--- 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
    command_timeout = 1s
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    HAP
    max_rcpt = 1000
  
    HAP
    max_rcpt = 1000
  
diff --git a/test/confs/0218 b/test/confs/0218

index d185033ea2079fa87271fbeabb489b9fc85780aa..4458e18466500788049fae32eaed33e8c2355357 100644 (file)
--- 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
    command_timeout = 1s
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    debug_print = T: $transport_name  (${acl {expand_check}})
  
  
    debug_print = T: $transport_name  (${acl {expand_check}})
  
  
diff --git a/test/confs/0227 b/test/confs/0227

index 063ced4819e41aa274752ad6e2a0644eb9d823e3..06fae3f560f7702b31f8f4ba0be8b82f7cb6e455 100644 (file)
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -82,7 +82,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
  
  lmtp:
    driver = smtp
  
  lmtp:
    driver = smtp
diff --git a/test/confs/0231 b/test/confs/0231

index fcae1da1833f374f68bfa1747895fa17be9ff92c..721b8f7e5715df99371db8ec57f08baa19a26153 100644 (file)
--- 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
    headers_rewrite = *@domain1 $1-rewrite@domain2 f :\
                      *@domain1 $1-other@domain2
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0242 b/test/confs/0242

index 9eae48d94d15d640d96f34890bae1e2bebdf3ca6..0acf78fca78d4c53f27a82436761d893040cd35a 100644 (file)
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -35,7 +35,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0253 b/test/confs/0253

index 1e7187243aca7a10a78e24b20920a4fc7a80b9f9..b72de8cd2e19f0fcf06eccf8b45579c632049f7c 100644 (file)
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -69,7 +69,6 @@ t3:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    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
    max_rcpt = 1
    allow_localhost
    return_path = pqr=$local_part+$domain@verp.domain
diff --git a/test/confs/0259 b/test/confs/0259

index 72dc00963a978b45cee62bdc75dc0a26a7359d68..cd5c303628b86566cd7311b0f4d5346f65a64221 100644 (file)
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -29,7 +29,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  begin retry
  
  
  begin retry
diff --git a/test/confs/0276 b/test/confs/0276

index ddd49cb26e633280da4f509e3309d46c535ea120..96ce2095777c49ad4bbecb3d1942825c0b78007c 100644 (file)
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -21,7 +21,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  # ----- Routers -----
    allow_localhost
  
  # ----- Routers -----
diff --git a/test/confs/0285 b/test/confs/0285

index 06ca3f91fc7cfd457f44741acf86882bfd739cde..f583248170e0b813d79bc26a670b9b6418a38342 100644 (file)
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -38,7 +38,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
    max_rcpt = 2
    connection_max_messages = 3
  
    max_rcpt = 2
    connection_max_messages = 3
  
diff --git a/test/confs/0286 b/test/confs/0286

index 33fe2b46337533ca57f36e910cd6eafba74aae01..b7746b5e7dc2ba3d26d5ab230604fa3f9e75c9e5 100644 (file)
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -39,7 +39,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
    max_rcpt = 2
    connection_max_messages = 3
  
    max_rcpt = 2
    connection_max_messages = 3
  
diff --git a/test/confs/0288 b/test/confs/0288

index 522423c6b7e66d8eecb95a12c0fb1107125da38c..938e08ed575c1bf0eaefb08953297de61bf4aa9c 100644 (file)
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -34,7 +34,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
    max_rcpt = 1
    connection_max_messages = 1
    serialize_hosts = 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 12361fbf9a61d20c9286d412558a71b6c6158c26..f956a1836908326c01a8f9b4674e879461eacece 100644 (file)
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -43,7 +43,6 @@ t2:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    max_rcpt = 2
  
    allow_localhost
    max_rcpt = 2
  
diff --git a/test/confs/0322 b/test/confs/0322

index 5a66e6b390a4b30bf613803342fd757f1a24db35..a33232ee6a9929b79a16377c76eea625c41943bd 100644 (file)
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -38,7 +38,6 @@ smtp:
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # End
  
  
  # End
diff --git a/test/confs/0332 b/test/confs/0332

index aabaa42a4586b4dfe2a34d377043316aa1a765d7..f9ad188d6b494487a740ea75b3b2e61ffdfb5aca 100644 (file)
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -39,7 +39,6 @@ t1:
    hosts = 127.0.0.1
    hosts_override
    port = PORT_S
    hosts = 127.0.0.1
    hosts_override
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0333 b/test/confs/0333

index 9f853be65e26f0c73d6ad9aa7a20cbb37938ad0f..3e97eb804266df5487b1255eb466529d0e65c225 100644 (file)
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -38,7 +38,6 @@ t1:
    hosts = 127.0.0.1
    hosts_override
    port = PORT_S
    hosts = 127.0.0.1
    hosts_override
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0341 b/test/confs/0341

index 81ed9a8ae8304c04c3befe0234a1693b4e7ede03..1719d5d477b8acb8273ba976e8b764ec83f9cfe0 100644 (file)
--- 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
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_D
-  interface = 127.0.0.1
  
  
  # End
  
  
  # End
diff --git a/test/confs/0357 b/test/confs/0357

index 6b243e8606bbc99ad71a6b3eb1e3e5a53e1722f4..560676b14848a66a02f265cde6500145973d01b3 100644 (file)
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -31,7 +31,6 @@ t1:
    hosts = 127.0.0.1
    allow_localhost
    port = PORT_S
    hosts = 127.0.0.1
    allow_localhost
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0358 b/test/confs/0358

index fe70fd8fe9378a43b9372edb9fba2c3858b0356a..e66020b695c0ab4f93678a51c83e5b778c7f4d02 100644 (file)
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -31,7 +31,6 @@ t1:
    hosts = 127.0.0.1
    allow_localhost
    port = PORT_S
    hosts = 127.0.0.1
    allow_localhost
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0363 b/test/confs/0363

index 1ae169891ac46f4682823a30a5502d00f6b5531a..5b7185d4282c47c0cadd791c82da88e94531fa78 100644 (file)
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -31,7 +31,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  
    allow_localhost
  
  
diff --git a/test/confs/0367 b/test/confs/0367

index b826003bda0e6a16bd74eea67ed5bf9ebe0c1db5..f9a8d1ca559e562cdc2836ede6d89e6b944255a1 100644 (file)
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -33,7 +33,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0374 b/test/confs/0374

index 69a0311652c69058a33b461df893e12cf10c2b5f..3c1381b8c37864c599e238efc4adbfde3a747fd6 100644 (file)
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -81,7 +81,6 @@ ut4:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    max_rcpt = 1
  
    allow_localhost
    max_rcpt = 1
  
diff --git a/test/confs/0375 b/test/confs/0375

index f5bf7783f4da1be1f1c05604ddbb19ee625853d2..a1322bbedc3e39b5ae185bb53c28bb36a65c72d0 100644 (file)
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -119,7 +119,6 @@ ut4:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    max_rcpt = 1
    disable_logging
    allow_localhost
    max_rcpt = 1
    disable_logging
@@ -130,7 +129,6 @@ ut5:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    max_rcpt = 1
    disable_logging
    allow_localhost
    max_rcpt = 1
    disable_logging
@@ -142,7 +140,6 @@ ut6:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    max_rcpt = 1
    disable_logging
    allow_localhost
    max_rcpt = 1
    disable_logging
diff --git a/test/confs/0376 b/test/confs/0376

index 2d68016ec15cfbca879ce65a35c5e1e26f3155fa..d86d1dd558b71c195518c811748dfce82c321461 100644 (file)
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -71,7 +71,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0388 b/test/confs/0388

index 4c8f2f88d37190ca1e8876d4eaab753d8b86d857..0252cbd9e6532184eba06caeb228acb8866b1134 100644 (file)
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -36,7 +36,6 @@ smtp:
    driver = smtp
    hosts_max_try = 1
    port = PORT_S
    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
  
    connect_timeout = 2s
    address_retry_include_sender = false
  
diff --git a/test/confs/0398 b/test/confs/0398

index 565b78177d98a69836e49cbad10241952520cc58..31c561765fb6f18bcfd6cce3027eb1b452a76770 100644 (file)
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -65,7 +65,6 @@ t1:
  t2:
    driver = smtp
    port = PORT_S
  t2:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  
    allow_localhost
  
  
diff --git a/test/confs/0413 b/test/confs/0413

index bfc1aad94e32818ba631913bf583458b6c6077bf..8ae83dee37366e6e390541bb61fbf864edb9b6d5 100644 (file)
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -56,7 +56,6 @@ t1:
    hosts = 127.0.0.1
    allow_localhost
    port = PORT_S
    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
  
  t2:
    driver = smtp
@@ -64,7 +63,6 @@ t2:
    hosts_override
    allow_localhost
    port = PORT_S
    hosts_override
    allow_localhost
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # End
  
  
  # End
diff --git a/test/confs/0426 b/test/confs/0426

index 438b284295511c1cb87389b895c560746db53d51..b61fead03b209a4c100de21f6b8721b61ff7cd6a 100644 (file)
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -34,7 +34,6 @@ begin transports
  t1:
    driver = smtp
    port = PORT_S
  t1:
    driver = smtp
    port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
  
  
  # End
  
  
  # End
diff --git a/test/confs/0429 b/test/confs/0429

index d10dd9dd74f7ed43acd183905340d11066e249ba..68e7a417a3e2bfaf0367dab2fdf76afaf9d159db 100644 (file)
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -29,7 +29,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    hosts_avoid_esmtp = 127.0.0.1
  
    allow_localhost
    hosts_avoid_esmtp = 127.0.0.1
  
diff --git a/test/confs/0431 b/test/confs/0431

index 8b2fa19eb0bed654d71e2d0011a42d57f5029e29..0cf94222578ff37e6fae681f9f151530bffb019e 100644 (file)
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -47,7 +47,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    AFFIX
  
    allow_localhost
    AFFIX
  
diff --git a/test/confs/0432 b/test/confs/0432

index 96cb76dd871432d09d85073c172adcaf854be7a6..1f69870de1d937c734c643d54ab2fb9da9c4a6c8 100644 (file)
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -42,7 +42,6 @@ t1:
    driver = smtp
    hosts = <; 127.0.0.1 ;
    port = PORT_S
    driver = smtp
    hosts = <; 127.0.0.1 ;
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  # End
    allow_localhost
  
  # End
diff --git a/test/confs/0440 b/test/confs/0440

index 477833d61c9c39eaeec73040d7e8eb273ef9e013..9c3bb73dedc59f20c680c5ce347f6c156c70d7d4 100644 (file)
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -33,7 +33,6 @@ begin transports
  t1:
    driver = smtp
    port = PORT_S
  t1:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
    transport_filter = /bin/cat
  
  
    transport_filter = /bin/cat
  
  
diff --git a/test/confs/0461 b/test/confs/0461

index f56d6ad57490679120ff47d9f9f5342848b8d3bc..5b511010422358b8c78d3fe8e6b948c002988a89 100644 (file)
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -42,7 +42,6 @@ begin transports
  t1:
    driver = smtp
    port = PORT_S
  t1:
    driver = smtp
    port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
    connect_timeout = 1s
    allow_localhost
  
    connect_timeout = 1s
    allow_localhost
  
diff --git a/test/confs/0462 b/test/confs/0462

index 42d6c188b94f05a2228a0474a0c639685a410555..7ff47e6b5f9981b9b18caabe6f5905ea4a698b89 100644 (file)
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -49,7 +49,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0467 b/test/confs/0467

index 39c297c0d752de866d3f34b46f3817c53275d0d8..56011f4a342ec85a103a4f0fcec53b45a169faee 100644 (file)
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -32,6 +32,5 @@ begin transports
  
  t1:
    driver = smtp
  
  t1:
    driver = smtp
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
  
  # End
  
  # End
diff --git a/test/confs/0473 b/test/confs/0473

index 37dd435603a5b64b3e03b133f710e9cc1943fc59..acbe1ff8c10a58e92f77537ca1c3ef97c10b19a4 100644 (file)
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -47,6 +47,5 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  # End
  
  # End
diff --git a/test/confs/0474 b/test/confs/0474

index 7bb526b67e01e3011e49e5a7c0b74677e789fe4b..4596e39222ff64f95d4dc216b67b34abb44b7017 100644 (file)
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -29,7 +29,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0476 b/test/confs/0476

index 8894c4f57bdf7582678b4bd0bfaa488d9bae29b8..baa3f15a527c39195ebb33c224ebeaf726d424ee 100644 (file)
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -31,7 +31,6 @@ begin transports
  t1:
    driver = smtp
    port = PORT_S
  t1:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0478 b/test/confs/0478

index 70314f0f17eb2488db67d0165ff96ef1e474e8ae..bcdd98069ab7e6b973f7e7b15ee88397fce7cc82 100644 (file)
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -31,9 +31,8 @@ begin transports
  
  t1:
    driver = smtp
  
  t1:
    driver = smtp
-  hosts = ${if eq {$sender_host_address}{}{$local_part}{V4NET.0.0.2}}
    port = PORT_D
    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
  
    allow_localhost
    connect_timeout = 1s
  
diff --git a/test/confs/0495 b/test/confs/0495

index b33cbf1ef89f50a617e5155aa16a06aac21328ec..8706c790b8ca075bfa53296b2f00bb0665f1d490 100644 (file)
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -69,7 +69,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1 : HOSTIPV4
    port = PORT_S
    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
  
    allow_localhost
    command_timeout = 1s
  
diff --git a/test/confs/0497 b/test/confs/0497

index 1df7808cf3a0a0ca9582b36590bdc919b16e3685..23748aedf1f9a82adff931072bc2aa2db3f67705 100644 (file)
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -35,7 +35,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  
    allow_localhost
  
  
diff --git a/test/confs/0498 b/test/confs/0498

index 2cc8c706ca8f497254ea4f5a9a4ca383f6eea2b9..b00c634ae86580ffe232b6555ef50921211dba87 100644 (file)
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -35,7 +35,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    final_timeout = 1s
  
    allow_localhost
    final_timeout = 1s
  
diff --git a/test/confs/0504 b/test/confs/0504

index 6e71fef846a84b2c034e8ee15996a8579d21f66e..f604f5e5dc19c89f03406ff2c253dd5421c33e9c 100644 (file)
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -40,7 +40,6 @@ t3:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    transport_filter = /non/existent/file
  
    allow_localhost
    transport_filter = /non/existent/file
  
diff --git a/test/confs/0511 b/test/confs/0511

index 15058d703424be9f7e2682adf94d0a8e5941fd9f..f76721ac9f6581f20adb4c44fa82fba408e707a6 100644 (file)
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -29,7 +29,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  # End
    allow_localhost
  
  # End
diff --git a/test/confs/0518 b/test/confs/0518

index 372489467a9d9e2db1188d63d67c2f8d00938da7..2c200f07f2d422eab8e956deac440594c84e9da5 100644 (file)
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -45,7 +45,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    rcpt_include_affixes
  
    allow_localhost
    rcpt_include_affixes
  
@@ -53,7 +52,6 @@ t2:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  # End
    allow_localhost
  
  # End
diff --git a/test/confs/0525 b/test/confs/0525

index f30696241ed2e34ebf1df5c84612e0f6ee05a984..d8f24ae546904b0c3e54ad1a5d2f9cd8f85b7212 100644 (file)
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -37,7 +37,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    data_timeout = 1s
  
    allow_localhost
    data_timeout = 1s
  
diff --git a/test/confs/0531 b/test/confs/0531

index b0ee602964a82bd65ca1dd2f786fe382c3c1c60e..56f679ed86b07678313181ffa7e1e0f92794d944 100644 (file)
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -44,7 +44,6 @@ lmtp:
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    protocol = LMTP
  
  
    protocol = LMTP
  
  
diff --git a/test/confs/0538 b/test/confs/0538

index 13564d57c92f09ea00c6fd98594c9a6f383f04c0..5865e3110e7f7c028054e9148c2508ac1c3970e1 100644 (file)
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -45,7 +45,6 @@ begin transports
  
  t1:
    driver = smtp
  
  t1:
    driver = smtp
-  interface = 127.0.0.1
  
  
  # End
  
  
  # End
diff --git a/test/confs/0540 b/test/confs/0540

index f9a23f306fd67dc537af8086cd96356491a306d9..641335f6bccb057786ad1e015095dce55ac94afa 100644 (file)
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -41,7 +41,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    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}}
  
    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
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  # End
    allow_localhost
  
  # End
diff --git a/test/confs/0543 b/test/confs/0543

index bbe942fa42d81e4a2c19d1e9d03f79664dcd2308..e68280b0e857cce63bab67dbed01fdd76417ce6c 100644 (file)
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -33,7 +33,6 @@ smtp:
    hosts_max_try = 1
    allow_localhost
    port = PORT_S
    hosts_max_try = 1
    allow_localhost
    port = PORT_S
-  interface = ${if eq {$host_address}{127.0.0.1} {127.0.0.1}}
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0548 b/test/confs/0548

index 0f990c31a0a6a9f8fc641f0e4546a30d86c6f6dc..6306943de3e1d277174dd0c4289f805065f84833 100644 (file)
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -49,7 +49,6 @@ smtp:
    hosts = HOSTIPV4 : thishost.test.ex
    allow_localhost
    port = PORT_D
    hosts = HOSTIPV4 : thishost.test.ex
    allow_localhost
    port = PORT_D
-  interface = ${if eq {$host_address}{127.0.0.1} {127.0.0.1}}
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/0550 b/test/confs/0550

index 865b97a52df222a18f6f5a218f616da39fc791dc..e08750fdd1ffa7a573beee3e92c1c93efb67776b 100644 (file)
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -29,7 +29,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1 : HOSTIPV4
    port = PORT_S
    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}} \
    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 e7ec612ab7311c699335fb76fe0b0f1f4c794cee..3ce775148eaa0fde20562383a4d7a96d8f099962 100644 (file)
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -50,9 +50,8 @@ begin transports
  
  t1:
    driver = smtp
  
  t1:
    driver = smtp
-  hosts = 127.0.0.1
    port = PORT_D
    port = PORT_D
-  interface = 127.0.0.1
+  hosts = 127.0.0.1
    allow_localhost
    command_timeout = 2s
  
    allow_localhost
    command_timeout = 2s
  
diff --git a/test/confs/0553 b/test/confs/0553

index b965bf4aa452f23facd82359a5627cd6fd5f205c..bdbc8df48b3ae44f62903639db0869e1bd7ee172 100644 (file)
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -50,7 +50,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_D
  smtp:
    driver = smtp
    port = PORT_D
-  interface = 127.0.0.1
    command_timeout = 2s
  
  
    command_timeout = 2s
  
  
diff --git a/test/confs/0554 b/test/confs/0554

index cf337b21b1487c8d0019af50843d4e0108c945f9..edeb977fa95f340bf3684afd98cea54558c27727 100644 (file)
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -30,7 +30,6 @@ begin transports
  smtp:
    driver = smtp
    port = PORT_S
  smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
  
  # ----- Retry -----
  
  
  # ----- Retry -----
  
diff --git a/test/confs/0561 b/test/confs/0561

index 801afbd34d4726d2a39b66b7b6186ca00640d7d8..ecdbf95040994642d68f041e9985528d4d04ebec 100644 (file)
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -38,6 +38,5 @@ begin transports
  t1:
    driver = smtp
    port = PORT_D
  t1:
    driver = smtp
    port = PORT_D
-  interface = 127.0.0.1
  
  # End
  
  # End
diff --git a/test/confs/0565 b/test/confs/0565

index 510f3f57324464f12a6394e8cdb7253a6988fff3..c51fd6354551bc3a3dd92e4307446974076f48d3 100644 (file)
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -39,13 +39,11 @@ begin transports
  remote_smtp:
    driver = smtp
    port = PORT_S
  remote_smtp:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
  
  remote_smtp_hdrs:
    driver = smtp
    port = PORT_S
    allow_localhost
  
  remote_smtp_hdrs:
    driver = smtp
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    headers_only
  
    allow_localhost
    headers_only
  
diff --git a/test/confs/0568 b/test/confs/0568

index 5731085b7c32044ec6d8323c12043e9142acf8a4..dec5b0dbc67c647b9c0d77bf974444c00448e745 100644 (file)
--- a/test/confs/0568
+++ b/test/confs/0568
@@ -56,7 +56,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    hosts_try_auth = *
  
    allow_localhost
    hosts_try_auth = *
  
@@ -64,7 +63,6 @@ t2:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    hosts_try_auth = *
    authenticated_sender= brian
    allow_localhost
    hosts_try_auth = *
    authenticated_sender= brian
diff --git a/test/confs/3401 b/test/confs/3401

index 92c0afc32276fa68e0d56e1cb6b6bbbb2aeb9a14..60b1a4624e53c35da7a12bc0870689cd6f76db75 100644 (file)
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -62,14 +62,12 @@ smtp_try:
    driver = smtp
    hosts_try_auth = *
    port = PORT_S
    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
    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 -----
  
  
  # ----- Retry -----
diff --git a/test/confs/3404 b/test/confs/3404

index e05ee791409774cc0013c7646e0002594b21d142..dc556e961af7c047586b087d56da95fc84a7a22e 100644 (file)
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -50,7 +50,6 @@ smtp:
    driver = smtp
    hosts_try_auth = *
    port = PORT_S
    driver = smtp
    hosts_try_auth = *
    port = PORT_S
-  interface = 127.0.0.1
  
  
  # ----- Retry -----
  
  
  # ----- Retry -----
diff --git a/test/confs/3405 b/test/confs/3405

index 460c5842eb0276fc0109f3928c5139e305521dc8..e3141510b99091a5f1de26cb69a69885009c90e9 100644 (file)
--- 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
    headers_add = X-TAID: >$authenticated_id<
    hosts_try_auth = *
    port = PORT_S
-  interface = 127.0.0.1
  
  # End
  
  # End
diff --git a/test/confs/3412 b/test/confs/3412

index df8cadc87f2e0baa2ce2e7d63e1d189f4f87f5c1..bd8336e9eb522d810209bd5b85ce5b7b0a67e19f 100644 (file)
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -49,7 +49,6 @@ smtp:
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
    allow_localhost
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    hosts_try_auth = *
  
  # End
    hosts_try_auth = *
  
  # End
diff --git a/test/confs/5510 b/test/confs/5510

index c0531034d00599e04a73dd00e06ac68c455b3c58..48724213b4f1445aab88fa3fa437447b5d0059f0 100644 (file)
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -42,7 +42,6 @@ t1:
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
    driver = smtp
    hosts = 127.0.0.1
    port = PORT_S
-  interface = 127.0.0.1
    allow_localhost
    hosts_try_prdr = *
  
    allow_localhost
    hosts_try_prdr = *
  
diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022

index 5e20032aa67f2f2eac9a916d5f5154f5a27df05f..92d95517116fef48f4f9ed7943d44368e3cc34ef 100644 (file)
--- 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
  ****
  ****
  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
  ??? 220
  mail from:<x@y>
  ??? 250
diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035

index fc0850c9024f08a03d8d9a0387b236f64ed20b0c..147c8e7e250b1f3f5becb87b6e2694992f2c302e 100644 (file)
--- 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
  ****
  #
  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-
  ??? 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
  ****
  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-
  ??? 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
  ****
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
diff --git a/test/scripts/0000-Basic/0214 b/test/scripts/0000-Basic/0214

index 34d518efdf85bfd5bd15af3e8252dd82482f914d..fa2a5334a86f33c390c2e71958888ccc268513b0 100644 (file)
--- 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
  ****
  #
  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
  ??? 220
  mail from:<x@y.x>
  ??? 250
diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230

index 8a64308aff86fc22b296724df9a90cc061176f24..1bd97d670336249cd0dc0f36aa1252a59db5cdef 100644 (file)
--- a/test/scripts/0000-Basic/0230
+++ b/test/scripts/0000-Basic/0230
@@ -17,7 +17,7 @@ quit
  ??? 221
  +++ 1
  ****
  ??? 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
  ??? 220
  mail from:<x@y.x>
  ??? 250
diff --git a/test/scripts/0000-Basic/0282 b/test/scripts/0000-Basic/0282

index 829b2c0d39210c2c00248f191907107702e0bec4..d19464e12278c44b5965afb5b182f551a86354fb 100644 (file)
--- 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
  ****
  #
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
@@ -23,7 +23,7 @@ This is a test message.
  quit
  ??? 221
  ****
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
diff --git a/test/scripts/0000-Basic/0287 b/test/scripts/0000-Basic/0287

index f18ef843784bdd3ce9057236ae88991b46631d8d..9aa9f52e240e50fc36ac3097213bdfefd59b6006 100644 (file)
--- 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
  ****
  #
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301

index 20c2184bc585ff497521fc3df81c9862c1677774..08996c7efb223d92b6742d5a9bf82fc1a2b7d270 100644 (file)
--- 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
  ****
  #
  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-
  ??? 220
  ehlo abcd\r\nmail from:<userx@test.ex>
  ??? 250-
@@ -15,7 +15,7 @@ ehlo abcd\r\nmail from:<userx@test.ex>
  quit
  ??? 221
  ****
  quit
  ??? 221
  ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
  ??? 220
  ehlo abcd
  ??? 250-
  ??? 220
  ehlo abcd
  ??? 250-
@@ -39,7 +39,7 @@ quit
  ??? 221
  ****
  # For this one, the check will be dyamically turned on again
  ??? 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-
  ??? 220
  ehlo en.force
  ??? 250-
diff --git a/test/scripts/0000-Basic/0454 b/test/scripts/0000-Basic/0454

index e12f8904afcf6dff397bcc0bed12d4bf0a57b783..902e2966e2900f60c64b92d18115155ae0f6714c 100644 (file)
--- 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
  ****
  #
  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
  ??? 220
  helo rhu.barb
  ??? 250
diff --git a/test/scripts/0000-Basic/0458 b/test/scripts/0000-Basic/0458

index 2944146e105c6027ddaa40d04bc49039857fbf0d..062dec50097c891569b68398b19057c76451c8a9 100644 (file)
--- 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
  ****
  #
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
@@ -22,7 +22,7 @@ DATA
  QUIT
  ??? 221
  ****
  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
  ??? 220
  helo rhu.barb
  ??? 250
@@ -37,7 +37,7 @@ DATA
  QUIT
  ??? 221
  ****
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
@@ -56,7 +56,7 @@ DATA
  QUIT
  ??? 221
  ****
  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
  ??? 220
  helo rhu.barb
  ??? 250
@@ -71,7 +71,7 @@ DATA
  QUIT
  ??? 221
  ****
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
@@ -94,7 +94,7 @@ DATA
  QUIT
  ??? 221
  ****
  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
  ??? 220
  helo rhu.barb
  ??? 250
@@ -113,7 +113,7 @@ DATA
  QUIT
  ??? 221
  ****
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
diff --git a/test/scripts/0000-Basic/0460 b/test/scripts/0000-Basic/0460

index e3dda1d5258874ae80fa71fcddc0c7a8aff23d22..b91be2084e65e46dd6ca0ee48583147a6e811e88 100644 (file)
--- 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
  ****
  #
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
diff --git a/test/scripts/0000-Basic/0480 b/test/scripts/0000-Basic/0480

index 45ab61958444c73d3c2c75a9a6a85c831919a333..cb4712bb1e10d8d464d24f2274b20d648d833a25 100644 (file)
--- 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
  ****
  ****
  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
  ??? 220
  helo foobar
  ??? 250
diff --git a/test/scripts/0000-Basic/0482 b/test/scripts/0000-Basic/0482

index c7c501125d6a4b621a00cfbe63bad10fdcc33a1c..48a53d749caa9efcfe687297f5356badc325165b 100644 (file)
--- 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
  ****
  #
  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
  ??? 220
  helo foobar
  ??? 250
diff --git a/test/scripts/0000-Basic/0547 b/test/scripts/0000-Basic/0547

index b628c2278309c5ca98eeb069470cee804c5c5c7f..2595eff482c85c01256368f54d18e444dc1aab61 100644 (file)
--- 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
  ****
  #
  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
  ****
  ??? 220
  ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
  ??? 220
  quit
  ??? 221
  ****
  ??? 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
  ??? 220
  ehlo x.y.z
  ??? 250
@@ -24,7 +24,7 @@ VRFY a@b.c
  quit
  ??? 221
  ****
  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
  ??? 220
  ehlo x.y.z
  ??? 250
diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559

index 351df3de0e43ad1106df8d7512cb3be0013429cc..7ebc64d341de480d2a643b5ce61b8ea00d8c9234 100644 (file)
--- 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
  ****
  #
  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-
  ??? 220
  ehlo abcd
  ??? 250-
diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562

index 2fcaf354de4cfc1162c7b98e5a932e7146608328..9355c46fcc5d82324282aaa928c480dacb5d36e4 100644 (file)
--- 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
  ****
  #
  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-
  ??? 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
  ****
  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
  ****
  ??? 220
  +++ 2
  ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
  ??? 220
  ****
  ??? 220
  ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
  ??? 220
  unknown
  ??? 500
  ??? 220
  unknown
  ??? 500
@@ -36,7 +36,7 @@ unknown
  unknown
  ??? 500
  ****
  unknown
  ??? 500
  ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
  ??? 220
  vrfy
  ??? 252
  ??? 220
  vrfy
  ??? 252
@@ -49,7 +49,7 @@ vrfy
  vrfy
  ??? 554
  ****
  vrfy
  ??? 554
  ****
-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D
  ??? 220
  ehlo abcd
  ??? 250-
  ??? 220
  ehlo abcd
  ??? 250-
diff --git a/test/scripts/0000-Basic/0564 b/test/scripts/0000-Basic/0564

index d1f9d1ee0e24e5690b78e56270d877cb316b5170..68fb607ec1b1e3652137873d0867c0d6a7046956 100644 (file)
--- a/test/scripts/0000-Basic/0564
+++ b/test/scripts/0000-Basic/0564
@@ -3,7 +3,7 @@ need_ipv4
  #
  exim -DSERVER=wait:PORT_D -bw
  ****
  #
  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-
  ??? 220
  ehlo abcd
  ??? 250-
diff --git a/test/scripts/3400-plaintext/3415 b/test/scripts/3400-plaintext/3415

index 22005aa07bbae87b1ff9e94d23711dc8753a0c00..d5bcc33be5f52d1ea84cb87d539d75450ffc8232 100644 (file)
--- 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
  ****
  #
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
@@ -38,7 +38,7 @@ killdaemon
  millisleep 500
  exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=another.domain -bd -oX PORT_D
  ****
  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-
  ??? 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
  ****
  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-
  ??? 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
  ****
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
diff --git a/test/scripts/5500-PRDR/5500 b/test/scripts/5500-PRDR/5500

index fec0701a27e1e9019d757362d00ed929c4353dcc..567b0008596467213a2c2204fffba6a04fec1506 100644 (file)
--- 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
  ****
  #    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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
@@ -39,7 +39,7 @@ sleep 1
  #
  #
  # 2: traditional data acl should be called, resulting in an overall reject
  #
  #
  # 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-
  ??? 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.
  #
  # 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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
@@ -94,7 +94,7 @@ quit
  sleep 1
  #
  # 4: double temp-reject
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
@@ -123,7 +123,7 @@ quit
  sleep 1
  #
  # 5: double reject
  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-
  ??? 220
  ehlo rhu.barb
  ??? 250-
diff --git a/test/stderr/0217 b/test/stderr/0217

index 3ae4b8fe52589695b5741edf07b6ba5a9ea1f1b4..259df4604216f7717cb6eb8fd9e4754a9d89207f 100644 (file)
--- 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
  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
    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
  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
    SMTP<< 220 Server ready
    SMTP>> EHLO myhost.test.ex
    SMTP<< 250-OK
diff --git a/test/stderr/0218 b/test/stderr/0218

index 2ef5ae6c4191fde504fa4903e4bc7884b57c7f7c..4c74ff2943913bea1571507f9fe3d0d393cd770f 100644 (file)
--- 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)
  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
    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)
  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
    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)
  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
  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)
  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
    SMTP<< 220 Server ready
    SMTP>> EHLO myhost.test.ex
    SMTP<< 250-OK
diff --git a/test/stderr/0227 b/test/stderr/0227

index dc64b4e7507adafd22cccaec37e0e00930491923..7a75ec0154da7bca8610490d8d14faa71cc60965 100644 (file)
--- a/test/stderr/0227
+++ b/test/stderr/0227
@@ -1,6 +1,6 @@
  LOG: smtp_connection MAIN
    SMTP connection from root
  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
    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
    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
    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
    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
    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
    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
    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
    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
    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
    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
    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
    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
    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
    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
  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
    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
    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
    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
    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
    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
    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
    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
    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
    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
    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
    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
  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 29a77659e096d9e93a0cb24e6957572530ecc456..2b01713f803c58258af9409020c5f4cbde16dd99 100644 (file)
--- 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
  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
    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
  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
  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
  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
    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
  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
  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 4a604b5bd5363126694696a1c34e75488b869623..85729597862ce7fec3a0aa4f4642873cf015dee2 100644 (file)
--- 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
  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
    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
  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
  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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    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
  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
    SMTP<< 220 Server ready
    SMTP>> EHLO myhost.test.ex
    SMTP<< 250 OK
diff --git a/test/stderr/0388 b/test/stderr/0388

index daad8d1135fe03d8fc8c1f743d0ff71355ffd29d..a7a266418c8b7dd83ad379c27e0ff532b0ecab4a 100644 (file)
--- 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)
  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
    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
  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
  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
    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 "*")
  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
  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
    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
  timed out: all retries expired
  LOG: MAIN
    ** x@y: retry timeout exceeded
diff --git a/test/stderr/0398 b/test/stderr/0398

index 82ec322930ee4f394ee8195af3e2c972d944d929..5118c1af771c1357e3309a13c9a40a88137190eb 100644 (file)
--- 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
  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
    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 533fc0d3b3efa7ce6afa10caaf84952c8eaffbee..a9581e9b4d55f8805222c904714fe9eff2bf83d1 100644 (file)
--- 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
  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
    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
  >>> 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
  >>>   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
  >>> 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
  >>>   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 255a7696a2ef48f544290e4769007278f4b7b75e..f9133d60246d7893f81893c9131d42d54ab478c0 100644 (file)
--- 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
  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
    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
  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
    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
  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
    SMTP<< 220 Server ready
    SMTP>> EHLO myhost.test.ex
    SMTP<< 250 OK
diff --git a/test/stderr/0473 b/test/stderr/0473

index 2c5b343c633ed18c81736f82c5ffc5178cd708a0..090335d97d7358b0c8cbc8075e12936c0f79e6d1 100644 (file)
--- 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
  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
    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
  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
  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 0e649913f25f89d284d95600b48e7b894b3bb58b..f0dc33650a4ec18adad5031cfc7778ca850f07db 100644 (file)
--- 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)
  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
    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)
  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
  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 8352a041ed069a55cdbffbfde6ac7cc6a542e620..553f8c1ce3adff70a58feab901b71b0269406b56 100644 (file)
--- 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
  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
    SMTP<< 220 Welcome
    SMTP>> EHLO myhost.test.ex
    SMTP<< 250 Hi
diff --git a/test/stderr/3404 b/test/stderr/3404

index 516102adb7057bcd37bed415d99de922d757a5b3..8d35b67302aa37da2aebe75f1c27d5531768b929 100644 (file)
--- 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
  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
    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
  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
    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
  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
    SMTP<< 220 ESMTP
    SMTP>> EHLO myhost.test.ex
    SMTP<< 250-OK
diff --git a/test/stdout/0548 b/test/stdout/0548

index 1aa56c666efbc0355351480a4edd922c88686dd0..7f7d788b664afec34b1f1bb9ccb1c8c05a7ffc4c 100644 (file)
--- 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
  +++++++++++++++++++++++++++
    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 *
  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 *
  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
  first failed = time last try = time2 next try = time2 + 1
author	Jeremy Harris <jgh146exb@wizmail.org>
	Sun, 14 Dec 2014 17:31:44 +0000 (17:31 +0000)
committer	Jeremy Harris <jgh146exb@wizmail.org>
	Sun, 14 Dec 2014 17:31:44 +0000 (17:31 +0000)
test/confs/0015		patch \| blob \| blame \| history
test/confs/0033		patch \| blob \| blame \| history
test/confs/0100		patch \| blob \| blame \| history
test/confs/0101		patch \| blob \| blame \| history
test/confs/0106		patch \| blob \| blame \| history
test/confs/0160		patch \| blob \| blame \| history
test/confs/0163		patch \| blob \| blame \| history
test/confs/0177		patch \| blob \| blame \| history
test/confs/0179		patch \| blob \| blame \| history
test/confs/0185		patch \| blob \| blame \| history
test/confs/0190		patch \| blob \| blame \| history
test/confs/0191		patch \| blob \| blame \| history
test/confs/0201		patch \| blob \| blame \| history
test/confs/0203		patch \| blob \| blame \| history
test/confs/0208		patch \| blob \| blame \| history
test/confs/0209		patch \| blob \| blame \| history
test/confs/0210		patch \| blob \| blame \| history
test/confs/0211		patch \| blob \| blame \| history
test/confs/0213		patch \| blob \| blame \| history
test/confs/0215		patch \| blob \| blame \| history
test/confs/0216		patch \| blob \| blame \| history
test/confs/0217		patch \| blob \| blame \| history
test/confs/0218		patch \| blob \| blame \| history
test/confs/0227		patch \| blob \| blame \| history
test/confs/0231		patch \| blob \| blame \| history
test/confs/0242		patch \| blob \| blame \| history
test/confs/0253		patch \| blob \| blame \| history
test/confs/0259		patch \| blob \| blame \| history
test/confs/0276		patch \| blob \| blame \| history
test/confs/0285		patch \| blob \| blame \| history
test/confs/0286		patch \| blob \| blame \| history
test/confs/0288		patch \| blob \| blame \| history
test/confs/0299		patch \| blob \| blame \| history
test/confs/0322		patch \| blob \| blame \| history
test/confs/0332		patch \| blob \| blame \| history
test/confs/0333		patch \| blob \| blame \| history
test/confs/0341		patch \| blob \| blame \| history
test/confs/0357		patch \| blob \| blame \| history
test/confs/0358		patch \| blob \| blame \| history
test/confs/0363		patch \| blob \| blame \| history
test/confs/0367		patch \| blob \| blame \| history
test/confs/0374		patch \| blob \| blame \| history
test/confs/0375		patch \| blob \| blame \| history
test/confs/0376		patch \| blob \| blame \| history
test/confs/0388		patch \| blob \| blame \| history
test/confs/0398		patch \| blob \| blame \| history
test/confs/0413		patch \| blob \| blame \| history
test/confs/0426		patch \| blob \| blame \| history
test/confs/0429		patch \| blob \| blame \| history
test/confs/0431		patch \| blob \| blame \| history
test/confs/0432		patch \| blob \| blame \| history
test/confs/0440		patch \| blob \| blame \| history
test/confs/0461		patch \| blob \| blame \| history
test/confs/0462		patch \| blob \| blame \| history
test/confs/0467		patch \| blob \| blame \| history
test/confs/0473		patch \| blob \| blame \| history
test/confs/0474		patch \| blob \| blame \| history
test/confs/0476		patch \| blob \| blame \| history
test/confs/0478		patch \| blob \| blame \| history
test/confs/0495		patch \| blob \| blame \| history
test/confs/0497		patch \| blob \| blame \| history
test/confs/0498		patch \| blob \| blame \| history
test/confs/0504		patch \| blob \| blame \| history
test/confs/0511		patch \| blob \| blame \| history
test/confs/0518		patch \| blob \| blame \| history
test/confs/0525		patch \| blob \| blame \| history
test/confs/0531		patch \| blob \| blame \| history
test/confs/0538		patch \| blob \| blame \| history
test/confs/0540		patch \| blob \| blame \| history
test/confs/0543		patch \| blob \| blame \| history
test/confs/0548		patch \| blob \| blame \| history
test/confs/0550		patch \| blob \| blame \| history
test/confs/0552		patch \| blob \| blame \| history
test/confs/0553		patch \| blob \| blame \| history
test/confs/0554		patch \| blob \| blame \| history
test/confs/0561		patch \| blob \| blame \| history
test/confs/0565		patch \| blob \| blame \| history
test/confs/0568		patch \| blob \| blame \| history
test/confs/3401		patch \| blob \| blame \| history
test/confs/3404		patch \| blob \| blame \| history
test/confs/3405		patch \| blob \| blame \| history
test/confs/3412		patch \| blob \| blame \| history
test/confs/5510		patch \| blob \| blame \| history
test/scripts/0000-Basic/0022		patch \| blob \| blame \| history
test/scripts/0000-Basic/0035		patch \| blob \| blame \| history
test/scripts/0000-Basic/0214		patch \| blob \| blame \| history
test/scripts/0000-Basic/0230		patch \| blob \| blame \| history
test/scripts/0000-Basic/0282		patch \| blob \| blame \| history
test/scripts/0000-Basic/0287		patch \| blob \| blame \| history
test/scripts/0000-Basic/0301		patch \| blob \| blame \| history
test/scripts/0000-Basic/0454		patch \| blob \| blame \| history
test/scripts/0000-Basic/0458		patch \| blob \| blame \| history
test/scripts/0000-Basic/0460		patch \| blob \| blame \| history
test/scripts/0000-Basic/0480		patch \| blob \| blame \| history
test/scripts/0000-Basic/0482		patch \| blob \| blame \| history
test/scripts/0000-Basic/0547		patch \| blob \| blame \| history
test/scripts/0000-Basic/0559		patch \| blob \| blame \| history
test/scripts/0000-Basic/0562		patch \| blob \| blame \| history
test/scripts/0000-Basic/0564		patch \| blob \| blame \| history
test/scripts/3400-plaintext/3415		patch \| blob \| blame \| history
test/scripts/5500-PRDR/5500		patch \| blob \| blame \| history
test/stderr/0217		patch \| blob \| blame \| history
test/stderr/0218		patch \| blob \| blame \| history
test/stderr/0227		patch \| blob \| blame \| history
test/stderr/0276		patch \| blob \| blame \| history
test/stderr/0376		patch \| blob \| blame \| history
test/stderr/0388		patch \| blob \| blame \| history
test/stderr/0398		patch \| blob \| blame \| history
test/stderr/0432		patch \| blob \| blame \| history
test/stderr/0462		patch \| blob \| blame \| history
test/stderr/0473		patch \| blob \| blame \| history
test/stderr/0476		patch \| blob \| blame \| history
test/stderr/0525		patch \| blob \| blame \| history
test/stderr/3404		patch \| blob \| blame \| history
test/stdout/0548		patch \| blob \| blame \| history