Gitweb:
https://git.exim.org/exim.git/commitdiff/2f8e0a5f6bc17ccd0749c0dc28f5da28da5d25a2
Commit: 2f8e0a5f6bc17ccd0749c0dc28f5da28da5d25a2
Parent: b9a2d0dd658cab56e0d1365e1c6a7c5ce9473bcf
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Jun 15 19:27:04 2021 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Tue Jun 15 20:34:28 2021 +0100
hosts_require_helo
---
doc/doc-docbook/spec.xfpt | 5 +
doc/doc-txt/NewStuff | 2 +
doc/doc-txt/OptionLists.txt | 1 +
src/src/globals.c | 2 +
src/src/globals.h | 2 +
src/src/readconf.c | 1 +
src/src/smtp_in.c | 34 ++--
test/aux-fixed/0258.m3 | 1 +
test/aux-fixed/0258.m4 | 1 +
test/aux-fixed/5101.script | 0
test/confs/0021 | 2 +
test/confs/0070 | 1 +
test/confs/0139 | 1 +
test/confs/0416 | 1 +
test/confs/0457 | 1 +
test/confs/3453 | 1 +
test/confs/3463 | 1 +
test/log/0014 | 4 +-
test/log/0022 | 8 +-
test/log/0023 | 50 +++---
test/log/0024 | 34 ++--
test/log/0094 | 6 +-
test/log/0212 | 16 +-
test/log/0214 | 2 +-
test/log/0227 | 48 ++---
test/log/0230 | 12 +-
test/log/0234 | 2 +-
test/log/0293 | 4 +-
test/log/0372 | 6 +-
test/log/0376 | 36 ++--
test/log/0386 | 8 +-
test/log/0387 | 2 +-
test/log/0453 | 2 +-
test/log/0462 | 10 +-
test/log/0578 | 36 ++--
test/log/0609 | 4 +-
test/log/1103 | 2 +-
test/log/1105 | 2 +-
test/log/1108 | 2 +-
test/log/1110 | 2 +-
test/log/2002 | 10 +-
test/log/2014 | 4 +-
test/log/2029 | 4 +-
test/log/2102.openssl_1_1_1 | 8 +-
test/log/2114 | 4 +-
test/log/2132 | 6 +-
test/log/2150 | 2 +-
test/mail/0005.CALLER | 15 +-
test/mail/0023.cond- | 2 +-
test/mail/0023.cond--1 | 2 +-
test/mail/0023.cond-0 | 2 +-
test/mail/0023.cond-00 | 2 +-
test/mail/0023.cond-1 | 2 +-
test/mail/0023.cond-10 | 2 +-
test/mail/0023.cond-false | 2 +-
test/mail/0023.cond-no | 2 +-
test/mail/0023.cond-rhubarb | 4 +-
test/mail/0023.cond-true | 2 +-
test/mail/0023.cond-yes | 4 +-
test/mail/0023.okbatch | 2 +-
test/mail/0023.userx | 4 +-
test/mail/0023.userx-vs | 2 +-
test/mail/0024.postmaster | 8 +-
test/mail/0024.userx | 4 +-
test/mail/0025.userx | 3 +-
test/mail/0026.userx | 9 +-
test/mail/0049.userx | 6 +-
test/mail/0050.userx | 6 +-
test/mail/0079.userx | 3 +-
test/mail/0094.userx | 6 +-
test/mail/0127.userx | 6 +-
test/mail/0136.forwarder | 6 +-
test/mail/0197.copies | 3 +-
test/mail/0202.userx | 6 +-
test/mail/0220.userx | 3 +-
test/mail/0221.userx | 3 +-
test/mail/0230.x | 6 +-
test/mail/0256.abc@def | 3 +-
"test/mail/0256.abcd+unknown.domain+\"abc@def\"" | 3 +-
test/mail/0258.userx | 6 +-
test/mail/0386.2 | 4 +-
test/mail/0395.userx | 12 +-
test/mail/0398.x | 3 +-
test/mail/0446.userx | 3 +-
test/mail/0496.someone | 3 +-
test/mail/0500.userx | 3 +-
test/mail/0517.userx | 3 +-
test/mail/0517.usery | 3 +-
test/mail/0532.rcptok | 3 +-
test/mail/0567.rcptok | 3 +-
test/mail/0580.local | 3 +-
test/mail/0600.CALLER | 10 +-
test/mail/1110.userx | 4 +-
test/mail/2002.CALLER | 12 +-
test/mail/2102.CALLER | 16 +-
test/mail/2132.CALLER | 6 +-
test/rejectlog/0014 | 4 +-
test/rejectlog/0023 | 14 +-
test/rejectlog/0024 | 22 +--
test/rejectlog/0026 | 18 +-
test/rejectlog/0027 | 9 +-
test/rejectlog/0028 | 3 +-
test/rejectlog/0162 | 3 +-
test/rejectlog/0212 | 8 +-
test/rejectlog/0214 | 4 +-
test/rejectlog/0227 | 52 +++---
test/rejectlog/0234 | 2 +-
test/rejectlog/0365 | 12 +-
test/rejectlog/0376 | 32 ++--
test/rejectlog/0387 | 2 +-
test/rejectlog/0453 | 2 +-
test/rejectlog/0462 | 10 +-
test/rejectlog/0465 | 3 +-
test/rejectlog/0468 | 6 +-
test/rejectlog/0490 | 3 +-
test/rejectlog/0505 | 3 +-
test/rejectlog/0507 | 9 +-
test/rejectlog/0578 | 32 ++--
test/rejectlog/0585 | 9 +-
test/rejectlog/1103 | 2 +-
test/rejectlog/1105 | 2 +-
test/rejectlog/2014 | 4 +-
test/rejectlog/2037 | 3 +-
test/rejectlog/2114 | 4 +-
test/rejectlog/2137 | 3 +-
test/scripts/0000-Basic/0002 | 3 +
test/scripts/0000-Basic/0003 | 1 +
test/scripts/0000-Basic/0004 | 1 +
test/scripts/0000-Basic/0005 | 3 +
test/scripts/0000-Basic/0014 | 1 +
test/scripts/0000-Basic/0021 | 8 +-
test/scripts/0000-Basic/0022 | 12 ++
test/scripts/0000-Basic/0023 | 43 +++++
test/scripts/0000-Basic/0024 | 6 +
test/scripts/0000-Basic/0025 | 1 +
test/scripts/0000-Basic/0026 | 13 ++
test/scripts/0000-Basic/0027 | 6 +
test/scripts/0000-Basic/0028 | 1 +
test/scripts/0000-Basic/0029 | 1 +
test/scripts/0000-Basic/0030 | 1 +
test/scripts/0000-Basic/0034 | 1 +
test/scripts/0000-Basic/0049 | 2 +
test/scripts/0000-Basic/0050 | 2 +
test/scripts/0000-Basic/0056 | 1 +
test/scripts/0000-Basic/0057 | 1 +
test/scripts/0000-Basic/0058 | 1 +
test/scripts/0000-Basic/0059 | 1 +
test/scripts/0000-Basic/0060 | 8 +
test/scripts/0000-Basic/0061 | 2 +
test/scripts/0000-Basic/0062 | 3 +
test/scripts/0000-Basic/0063 | 2 +
test/scripts/0000-Basic/0064 | 2 +
test/scripts/0000-Basic/0065 | 7 +
test/scripts/0000-Basic/0066 | 9 +
test/scripts/0000-Basic/0067 | 1 +
test/scripts/0000-Basic/0068 | 1 +
test/scripts/0000-Basic/0069 | 8 +
test/scripts/0000-Basic/0077 | 3 +
test/scripts/0000-Basic/0079 | 1 +
test/scripts/0000-Basic/0086 | 6 +
test/scripts/0000-Basic/0087 | 5 +
test/scripts/0000-Basic/0091 | 4 +
test/scripts/0000-Basic/0092 | 4 +
test/scripts/0000-Basic/0094 | 6 +
test/scripts/0000-Basic/0121 | 1 +
test/scripts/0000-Basic/0124 | 1 +
test/scripts/0000-Basic/0127 | 2 +
test/scripts/0000-Basic/0130 | 1 +
test/scripts/0000-Basic/0136 | 2 +
test/scripts/0000-Basic/0145 | 2 +
test/scripts/0000-Basic/0157 | 3 +
test/scripts/0000-Basic/0162 | 1 +
test/scripts/0000-Basic/0175 | 3 +
test/scripts/0000-Basic/0197 | 1 +
test/scripts/0000-Basic/0202 | 2 +
test/scripts/0000-Basic/0212 | 1 +
test/scripts/0000-Basic/0214 | 2 +
test/scripts/0000-Basic/0220 | 1 +
test/scripts/0000-Basic/0221 | 1 +
test/scripts/0000-Basic/0227 | 18 ++
test/scripts/0000-Basic/0230 | 6 +
test/scripts/0000-Basic/0233 | 1 +
test/scripts/0000-Basic/0234 | 2 +
test/scripts/0000-Basic/0251 | 3 +
test/scripts/0000-Basic/0256 | 1 +
test/scripts/0000-Basic/0281 | 4 +
test/scripts/0000-Basic/0293 | 8 +-
test/scripts/0000-Basic/0294 | 4 +
test/scripts/0000-Basic/0304 | 1 +
test/scripts/0000-Basic/0305 | 1 +
test/scripts/0000-Basic/0306 | 1 +
test/scripts/0000-Basic/0308 | 2 +
test/scripts/0000-Basic/0312 | 1 +
test/scripts/0000-Basic/0320 | 1 +
test/scripts/0000-Basic/0325 | 1 +
test/scripts/0000-Basic/0340 | 1 +
test/scripts/0000-Basic/0342 | 1 +
test/scripts/0000-Basic/0362 | 1 +
test/scripts/0000-Basic/0365 | 2 +
test/scripts/0000-Basic/0372 | 2 +
test/scripts/0000-Basic/0376 | 28 +++
test/scripts/0000-Basic/0381 | 1 +
test/scripts/0000-Basic/0386 | 2 +
test/scripts/0000-Basic/0387 | 4 +
test/scripts/0000-Basic/0389 | 1 +
test/scripts/0000-Basic/0391 | 1 +
test/scripts/0000-Basic/0395 | 7 +
test/scripts/0000-Basic/0396 | 1 +
test/scripts/0000-Basic/0398 | 4 +
test/scripts/0000-Basic/0407 | 1 +
test/scripts/0000-Basic/0410 | 1 +
test/scripts/0000-Basic/0413 | 1 +
test/scripts/0000-Basic/0417 | 2 +
test/scripts/0000-Basic/0418 | 1 +
test/scripts/0000-Basic/0425 | 1 +
test/scripts/0000-Basic/0432 | 6 +
test/scripts/0000-Basic/0443 | 1 +
test/scripts/0000-Basic/0445 | 1 +
test/scripts/0000-Basic/0446 | 1 +
test/scripts/0000-Basic/0453 | 1 +
test/scripts/0000-Basic/0459 | 1 +
test/scripts/0000-Basic/0462 | 3 +
test/scripts/0000-Basic/0464 | 1 +
test/scripts/0000-Basic/0465 | 3 +
test/scripts/0000-Basic/0468 | 1 +
test/scripts/0000-Basic/0475 | 1 +
test/scripts/0000-Basic/0483 | 1 +
test/scripts/0000-Basic/0488 | 1 +
test/scripts/0000-Basic/0490 | Bin 190 -> 200 bytes
test/scripts/0000-Basic/0496 | 1 +
test/scripts/0000-Basic/0500 | 2 +
test/scripts/0000-Basic/0501 | 1 +
test/scripts/0000-Basic/0502 | 2 +
test/scripts/0000-Basic/0505 | 2 +
test/scripts/0000-Basic/0507 | 6 +
test/scripts/0000-Basic/0517 | 2 +
test/scripts/0000-Basic/0518 | 1 +
test/scripts/0000-Basic/0525 | 1 +
test/scripts/0000-Basic/0527 | 1 +
test/scripts/0000-Basic/0530 | 5 +
test/scripts/0000-Basic/0532 | 1 +
test/scripts/0000-Basic/0538 | 3 +
test/scripts/0000-Basic/0539 | 1 +
test/scripts/0000-Basic/0540 | 1 +
test/scripts/0000-Basic/0542 | 1 +
test/scripts/0000-Basic/0555 | 2 +
test/scripts/0000-Basic/0561 | 2 +
test/scripts/0000-Basic/0565 | 2 +
test/scripts/0000-Basic/0567 | 1 +
test/scripts/0000-Basic/0569 | 6 +
test/scripts/0000-Basic/0575 | 1 +
test/scripts/0000-Basic/0576 | 4 +
test/scripts/0000-Basic/0578 | 28 +++
test/scripts/0000-Basic/0580 | 5 +
test/scripts/0000-Basic/0582 | 2 +
test/scripts/0000-Basic/0584 | 3 +
test/scripts/0000-Basic/0585 | 6 +
test/scripts/0000-Basic/0593 | 2 +
test/scripts/0000-Basic/0596 | 2 +
test/scripts/0000-Basic/0599 | 1 +
test/scripts/0000-Basic/0600 | 2 +
test/scripts/0000-Basic/0607 | 1 +
test/scripts/0000-Basic/0609 | 4 +
test/scripts/0000-Basic/0610 | 1 +
test/scripts/0000-Basic/0614 | 1 +
test/scripts/0000-Basic/0615 | 1 +
test/scripts/0999-EXP-Queue-Ramp/0999 | 1 +
test/scripts/1000-Basic-ipv6/1002 | 1 +
test/scripts/1100-Basic-TLS/1103 | 6 +
test/scripts/1100-Basic-TLS/1105 | 8 +
test/scripts/1100-Basic-TLS/1108 | 6 +
test/scripts/1100-Basic-TLS/1110 | 2 +
test/scripts/2000-GnuTLS/2002 | 14 ++
test/scripts/2000-GnuTLS/2014 | 12 +-
test/scripts/2000-GnuTLS/2029 | 2 +
test/scripts/2000-GnuTLS/2035 | 1 +
test/scripts/2000-GnuTLS/2037 | 2 +
test/scripts/2100-OpenSSL/2102 | 24 +++
test/scripts/2100-OpenSSL/2114 | 10 ++
test/scripts/2100-OpenSSL/2132 | 6 +
test/scripts/2100-OpenSSL/2135 | 1 +
test/scripts/2100-OpenSSL/2137 | 2 +
test/scripts/2100-OpenSSL/2150 | 2 +
test/scripts/2200-dnsdb/2202 | 1 +
test/scripts/2600-SQLite/2600 | 3 +
test/scripts/2610-MySQL/2610 | 1 +
test/scripts/2620-Postgresql/2620 | 1 +
test/scripts/3200-testdb/3202 | 3 +
test/scripts/3200-testdb/3204 | 1 +
test/scripts/3200-testdb/3205 | 2 +
test/scripts/3200-testdb/3211 | 3 +
test/scripts/3400-plaintext/3400 | 1 +
test/scripts/3400-plaintext/3410 | 2 +
test/scripts/5300-ipliteral/5300 | 1 +
test/scripts/5300-ipliteral/5301 | 1 +
test/scripts/5600-OCSP-OpenSSL/5600 | 2 +
test/scripts/5600-OCSP-OpenSSL/5610 | 2 +
test/scripts/5650-OCSP-GnuTLS/5650 | 2 +
test/scripts/5820-DANE-GnuTLS/5820 | 1 +
test/scripts/5840-DANE-OpenSSL/5840 | 1 +
test/stderr/0002 | 17 +-
test/stderr/0003 | 61 +++----
test/stderr/0004 | 39 +++--
test/stderr/0021 | 33 ++--
test/stderr/0022 | 74 +++++---
test/stderr/0023 | 128 +++++++++-----
test/stderr/0026 | 6 +-
test/stderr/0056 | 3 +-
test/stderr/0057 | 7 +-
test/stderr/0058 | 5 +-
test/stderr/0059 | 5 +-
test/stderr/0060 | 34 ++--
test/stderr/0061 | 8 +-
test/stderr/0062 | 11 +-
test/stderr/0063 | 8 +-
test/stderr/0064 | 8 +-
test/stderr/0065 | 25 ++-
test/stderr/0066 | 33 ++--
test/stderr/0067 | 37 ++--
test/stderr/0068 | 3 +-
test/stderr/0069 | 37 ++--
test/stderr/0070 | 17 +-
test/stderr/0077 | 5 +-
test/stderr/0086 | 18 +-
test/stderr/0087 | 15 +-
test/stderr/0091 | 14 +-
test/stderr/0092 | 16 +-
test/stderr/0094 | 14 +-
test/stderr/0121 | 23 +--
test/stderr/0124 | 5 +-
test/stderr/0130 | 5 +-
test/stderr/0139 | 212 ++++++++++++-----------
test/stderr/0145 | 8 +-
test/stderr/0157 | 9 +-
test/stderr/0175 | 13 +-
test/stderr/0227 | 48 ++---
test/stderr/0234 | 3 +-
test/stderr/0251 | 1 +
test/stderr/0281 | 26 +--
test/stderr/0293 | 4 +-
test/stderr/0294 | 20 ++-
test/stderr/0304 | 37 ++--
test/stderr/0305 | 3 +-
test/stderr/0306 | 5 +-
test/stderr/0308 | 2 +
test/stderr/0312 | 3 +-
test/stderr/0325 | 3 +-
test/stderr/0342 | 1 +
test/stderr/0362 | 8 +-
test/stderr/0372 | 4 +-
test/stderr/0376 | 36 ++--
test/stderr/0381 | 11 +-
test/stderr/0386 | 38 ++--
test/stderr/0391 | 8 +-
test/stderr/0395 | 8 +-
test/stderr/0396 | 2 +
test/stderr/0398 | 2 +
test/stderr/0432 | 24 ++-
test/stderr/0443 | 5 +-
test/stderr/0445 | 9 +-
test/stderr/0462 | 10 +-
test/stderr/0464 | 2 +
test/stderr/0465 | 12 +-
test/stderr/0475 | 5 +-
test/stderr/0569 | 18 +-
test/stderr/0575 | 12 +-
test/stderr/0578 | 36 ++--
test/stderr/0584 | 11 +-
test/stderr/0609 | 4 +-
test/stderr/1002 | 3 +-
test/stderr/2202 | 18 +-
test/stderr/2600 | 32 +++-
test/stderr/2610 | 16 +-
test/stderr/2620 | 24 ++-
test/stderr/3202 | 9 +-
test/stderr/3204 | 3 +-
test/stderr/3205 | 6 +-
test/stderr/3211 | 6 +-
test/stderr/3400 | 5 +-
test/stderr/3410 | 8 +-
test/stderr/5820 | 3 +-
test/stderr/5840 | 3 +-
test/stdout/0002 | 3 +
test/stdout/0003 | 1 +
test/stdout/0004 | 1 +
test/stdout/0005 | 3 +
test/stdout/0014 | 1 +
test/stdout/0022 | 13 ++
test/stdout/0023 | 43 +++++
test/stdout/0024 | 6 +
test/stdout/0025 | 1 +
test/stdout/0026 | 13 ++
test/stdout/0027 | 6 +
test/stdout/0028 | 1 +
test/stdout/0029 | 1 +
test/stdout/0030 | 1 +
test/stdout/0034 | 1 +
test/stdout/0049 | 2 +
test/stdout/0050 | 2 +
test/stdout/0056 | 1 +
test/stdout/0057 | 1 +
test/stdout/0058 | 1 +
test/stdout/0059 | 1 +
test/stdout/0060 | 8 +
test/stdout/0061 | 2 +
test/stdout/0062 | 3 +
test/stdout/0063 | 2 +
test/stdout/0064 | 2 +
test/stdout/0065 | 7 +
test/stdout/0066 | 9 +
test/stdout/0067 | 1 +
test/stdout/0068 | 1 +
test/stdout/0069 | 8 +
test/stdout/0077 | 3 +
test/stdout/0079 | 1 +
test/stdout/0086 | 6 +
test/stdout/0087 | 5 +
test/stdout/0091 | 4 +
test/stdout/0092 | 4 +
test/stdout/0094 | 6 +
test/stdout/0121 | 1 +
test/stdout/0124 | 1 +
test/stdout/0127 | 2 +
test/stdout/0130 | 1 +
test/stdout/0136 | 2 +
test/stdout/0145 | 2 +
test/stdout/0157 | 3 +
test/stdout/0162 | 1 +
test/stdout/0175 | 3 +
test/stdout/0197 | 1 +
test/stdout/0202 | 2 +
test/stdout/0212 | 1 +
test/stdout/0214 | 3 +
test/stdout/0220 | 1 +
test/stdout/0221 | 1 +
test/stdout/0227 | 18 ++
test/stdout/0230 | 8 +
test/stdout/0233 | 1 +
test/stdout/0234 | 2 +
test/stdout/0251 | 4 +
test/stdout/0256 | 1 +
test/stdout/0258 | 2 +
test/stdout/0281 | 4 +
test/stdout/0293 | 2 +
test/stdout/0294 | 4 +
test/stdout/0304 | 1 +
test/stdout/0305 | 1 +
test/stdout/0306 | 1 +
test/stdout/0308 | 2 +
test/stdout/0312 | 1 +
test/stdout/0320 | 1 +
test/stdout/0325 | 1 +
test/stdout/0340 | 1 +
test/stdout/0342 | 1 +
test/stdout/0362 | 1 +
test/stdout/0365 | 2 +
test/stdout/0372 | 2 +
test/stdout/0376 | 28 +++
test/stdout/0381 | 1 +
test/stdout/0386 | 2 +
test/stdout/0387 | 4 +
test/stdout/0389 | 5 +-
test/stdout/0391 | 1 +
test/stdout/0395 | 11 +-
test/stdout/0396 | 1 +
test/stdout/0398 | 4 +
test/stdout/0407 | 1 +
test/stdout/0410 | 1 +
test/stdout/0413 | 1 +
test/stdout/0417 | 2 +
test/stdout/0418 | 1 +
test/stdout/0425 | 1 +
test/stdout/0432 | 6 +
test/stdout/0443 | 1 +
test/stdout/0445 | 1 +
test/stdout/0446 | 1 +
test/stdout/0453 | 1 +
test/stdout/0459 | 1 +
test/stdout/0462 | 3 +
test/stdout/0464 | 1 +
test/stdout/0465 | 3 +
test/stdout/0468 | 1 +
test/stdout/0475 | 1 +
test/stdout/0483 | 1 +
test/stdout/0488 | 5 +-
test/stdout/0490 | 5 +-
test/stdout/0496 | 1 +
test/stdout/0500 | 2 +
test/stdout/0501 | 1 +
test/stdout/0502 | 2 +
test/stdout/0505 | 2 +
test/stdout/0507 | 6 +
test/stdout/0517 | 2 +
test/stdout/0518 | 1 +
test/stdout/0525 | 1 +
test/stdout/0527 | 1 +
test/stdout/0530 | 5 +
test/stdout/0532 | 1 +
test/stdout/0538 | 3 +
test/stdout/0539 | 1 +
test/stdout/0540 | 1 +
test/stdout/0542 | 1 +
test/stdout/0555 | 2 +
test/stdout/0561 | 2 +
test/stdout/0565 | 8 +-
test/stdout/0567 | 1 +
test/stdout/0569 | 6 +
test/stdout/0575 | 1 +
test/stdout/0576 | 4 +
test/stdout/0578 | 28 +++
test/stdout/0580 | 20 ++-
test/stdout/0584 | 3 +
test/stdout/0585 | 6 +
test/stdout/0593 | 2 +
test/stdout/0596 | 2 +
test/stdout/0599 | 1 +
test/stdout/0600 | 2 +
test/stdout/0607 | 1 +
test/stdout/0609 | 6 +
test/stdout/0610 | 1 +
test/stdout/0614 | 1 +
test/stdout/0615 | 1 +
test/stdout/1002 | 1 +
test/stdout/1103 | 11 ++
test/stdout/1105 | 14 ++
test/stdout/1108 | 11 ++
test/stdout/1110 | 3 +
test/stdout/2002 | 23 +++
test/stdout/2014 | 17 +-
test/stdout/2029 | 3 +
test/stdout/2102 | 44 +++++
test/stdout/2114.openssl_1_1_1 | 15 ++
test/stdout/2132.openssl_1_1_1 | 9 +
test/stdout/2150 | 3 +
test/stdout/2202 | 1 +
test/stdout/2600 | 3 +
test/stdout/2610 | 1 +
test/stdout/2620 | 1 +
test/stdout/3202 | 3 +
test/stdout/3204 | 1 +
test/stdout/3205 | 2 +
test/stdout/3211 | 3 +
test/stdout/3400 | 1 +
test/stdout/3410 | 2 +
test/stdout/5300 | 1 +
test/stdout/5301 | 1 +
test/stdout/5600 | 3 +
test/stdout/5610 | 3 +
test/stdout/5650 | 3 +
test/stdout/5820 | 1 +
test/stdout/5840 | 1 +
551 files changed, 2642 insertions(+), 1026 deletions(-)
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index b462f67..0915da3 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -25641,6 +25641,11 @@ There will be no fallback to in-clear communication.
See the &%dnssec_request_domains%& router and transport options.
See section &<<SECDANE>>&.
+.option hosts_require_helo smtp "host list&!!" *
+.cindex "HELO/EHLO" requiring
+Exim will require an accepted HELO or EHLO command from a host matching
+this list, before accepting a MAIL command.
+
.option hosts_require_ocsp smtp "host list&!!" unset
.cindex "TLS" "requiring for certain servers"
Exim will request, and check for a valid Certificate Status being given, on a
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index c5a70da..46a69c1 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -54,6 +54,8 @@ Version 4.95
15. Main option "smtp_backlog_monitor", to set a level abve which listen
socket backlogs are logged.
+16. Main option "hosts_require_helo", requiring HELO or EHLO before MAIL.
+
Version 4.94
------------
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 2f3435f..d7362ef 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -314,6 +314,7 @@ hosts_randomize boolean false manualroute
false smtp 3.14
hosts_require_auth host list unset smtp 4.00
hosts_require_dane host list unset smtp 4.91 (4.85 experimental)
+hosts_require_helo host list "*" main 4.95
hosts_require_ocsp host list unset smtp 4.82 if experimental_ocsp
hosts_require_tls host list unset smtp 3.20
hosts_treat_as_local domain list unset main 1.95
diff --git a/src/src/globals.c b/src/src/globals.c
index ef7063d..e965860 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -994,6 +994,7 @@ uschar *host_reject_connection = NULL;
tree_node *hostlist_anchor = NULL;
int hostlist_count = 0;
uschar *hosts_treat_as_local = NULL;
+uschar *hosts_require_helo = US"*";
uschar *hosts_connection_nolog = NULL;
int ignore_bounce_errors_after = 10*7*24*60*60; /* 10 weeks */
@@ -1487,6 +1488,7 @@ FILE *smtp_in = NULL;
int smtp_listen_backlog = 0;
int smtp_load_reserve = -1;
int smtp_mailcmd_count = 0;
+int smtp_mailcmd_max = -1;
FILE *smtp_out = NULL;
uschar *smtp_etrn_command = NULL;
int smtp_max_synprot_errors= 3;
diff --git a/src/src/globals.h b/src/src/globals.h
index c7a2635..937cce7 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -640,6 +640,7 @@ extern uschar *host_lookup_order; /* Order of host lookup types */
extern uschar *host_lookup_msg; /* Text for why it failed */
extern int host_number; /* For sharing spools */
extern uschar *host_number_string; /* For expanding */
+extern uschar *hosts_require_helo; /* check for HELO/EHLO before MAIL */
extern uschar *host_reject_connection; /* Reject these hosts */
extern tree_node *hostlist_anchor; /* Tree of defined host lists */
extern int hostlist_count; /* Number defined */
@@ -963,6 +964,7 @@ extern FILE *smtp_in; /* Incoming SMTP input file */
extern int smtp_listen_backlog; /* Current listener socket backlog, if monitored */
extern int smtp_load_reserve; /* Only from reserved if load > this */
extern int smtp_mailcmd_count; /* Count of MAIL commands */
+extern int smtp_mailcmd_max; /* Limit for MAIL commands */
extern int smtp_max_synprot_errors;/* Max syntax/protocol errors */
extern int smtp_max_unknown_commands; /* As it says */
extern uschar *smtp_names[]; /* decode for command codes */
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 6d7e7a1..ae36fa0 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -181,6 +181,7 @@ static optionlist optionlist_config[] = {
#ifdef SUPPORT_PROXY
{ "hosts_proxy", opt_stringptr, {&hosts_proxy} },
#endif
+ { "hosts_require_helo", opt_stringptr, {&hosts_require_helo} },
{ "hosts_treat_as_local", opt_stringptr, {&hosts_treat_as_local} },
#ifdef LOOKUP_IBASE
{ "ibase_servers", opt_stringptr, {&ibase_servers} },
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 8e9b93a..1d7b222 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -139,7 +139,7 @@ static struct {
#endif
BOOL dsn_advertised :1;
BOOL esmtp :1;
- BOOL helo_required :1;
+ BOOL helo_verify_required :1;
BOOL helo_verify :1;
BOOL helo_seen :1;
BOOL helo_accept_junk :1;
@@ -153,7 +153,7 @@ static struct {
BOOL smtputf8_advertised :1;
#endif
} fl = {
- .helo_required = FALSE,
+ .helo_verify_required = FALSE,
.helo_verify = FALSE,
.smtp_exit_function_called = FALSE,
};
@@ -2936,8 +2936,8 @@ if (!f.sender_host_unknown)
/* Determine whether HELO/EHLO is required for this host. The requirement
can be hard or soft. */
- fl.helo_required = verify_check_host(&helo_verify_hosts) == OK;
- if (!fl.helo_required)
+ fl.helo_verify_required = verify_check_host(&helo_verify_hosts) == OK;
+ if (!fl.helo_verify_required)
fl.helo_verify = verify_check_host(&helo_try_verify_hosts) == OK;
/* Determine whether this hosts is permitted to send syntactic junk
@@ -3981,7 +3981,6 @@ int
smtp_setup_msg(void)
{
int done = 0;
-int mailmax = -1;
BOOL toomany = FALSE;
BOOL discarded = FALSE;
BOOL last_was_rej_mail = FALSE;
@@ -4251,7 +4250,7 @@ while (done <= 0)
/* If sender_host_unknown is true, we have got here via the -bs interface,
not called from inetd. Otherwise, we are running an IP connection and the
host address will be set. If the helo name is the primary name of this
- host and we haven't done a reverse lookup, force one now. If helo_required
+ host and we haven't done a reverse lookup, force one now. If helo_verify_required
is set, ensure that the HELO name matches the actual host. If helo_verify
is set, do the same check, but softly. */
@@ -4279,19 +4278,19 @@ while (done <= 0)
tls_in.active.sock >= 0 ? " TLS" : "", host_and_ident(FALSE));
/* Verify if configured. This doesn't give much security, but it does
- make some people happy to be able to do it. If helo_required is set,
+ make some people happy to be able to do it. If helo_verify_required is set,
(host matches helo_verify_hosts) failure forces rejection. If helo_verify
is set (host matches helo_try_verify_hosts), it does not. This is perhaps
now obsolescent, since the verification can now be requested selectively
at ACL time. */
f.helo_verified = f.helo_verify_failed = sender_helo_dnssec = FALSE;
- if (fl.helo_required || fl.helo_verify)
+ if (fl.helo_verify_required || fl.helo_verify)
{
BOOL tempfail = !smtp_verify_helo();
if (!f.helo_verified)
{
- if (fl.helo_required)
+ if (fl.helo_verify_required)
{
smtp_printf("%d %s argument does not match calling host\r\n", FALSE,
tempfail? 451 : 550, hello);
@@ -4348,7 +4347,7 @@ while (done <= 0)
#endif
/* Expand the per-connection message count limit option */
- mailmax = expand_mailmax(smtp_accept_max_per_connection);
+ smtp_mailcmd_max = expand_mailmax(smtp_accept_max_per_connection);
smtp_code = US"250 "; /* Default response code plus space*/
if (!user_msg)
@@ -4410,12 +4409,12 @@ while (done <= 0)
}
#ifdef EXPERIMENTAL_ESMTP_LIMITS
- if ( (mailmax > 0 || recipients_max)
+ if ( (smtp_mailcmd_max > 0 || recipients_max)
&& verify_check_host(&limits_advertise_hosts) == OK)
{
g = string_fmt_append(g, "%.3s-LIMITS", smtp_code);
- if (mailmax > 0)
- g = string_fmt_append(g, " MAILMAX=%d", mailmax);
+ if (smtp_mailcmd_max > 0)
+ g = string_fmt_append(g, " MAILMAX=%d", smtp_mailcmd_max);
if (recipients_max)
g = string_fmt_append(g, " RCPTMAX=%d", recipients_max);
g = string_catn(g, US"\r\n", 2);
@@ -4639,15 +4638,16 @@ while (done <= 0)
env_mail_type_t * mail_args; /* Sanity check & validate args */
if (!fl.helo_seen)
- if (fl.helo_required)
+ if ( fl.helo_verify_required
+ || verify_check_host(&hosts_require_helo) == OK)
{
smtp_printf("503 HELO or EHLO required\r\n", FALSE);
log_write(0, LOG_MAIN|LOG_REJECT, "rejected MAIL from %s: no "
"HELO/EHLO given", host_and_ident(FALSE));
break;
}
- else if (mailmax < 0)
- mailmax = expand_mailmax(smtp_accept_max_per_connection);
+ else if (smtp_mailcmd_max < 0)
+ smtp_mailcmd_max = expand_mailmax(smtp_accept_max_per_connection);
if (sender_address)
{
@@ -4666,7 +4666,7 @@ while (done <= 0)
/* Check to see if the limit for messages per connection would be
exceeded by accepting further messages. */
- if (mailmax > 0 && smtp_mailcmd_count > mailmax)
+ if (smtp_mailcmd_max > 0 && smtp_mailcmd_count > smtp_mailcmd_max)
{
smtp_printf("421 too many messages in this connection\r\n", FALSE);
log_write(0, LOG_MAIN|LOG_REJECT, "rejected MAIL command %s: too many "
diff --git a/test/aux-fixed/0258.m3 b/test/aux-fixed/0258.m3
index aa97035..c8a6622 100644
--- a/test/aux-fixed/0258.m3
+++ b/test/aux-fixed/0258.m3
@@ -1,3 +1,4 @@
+helo test
Mail from: x@y
rcpt to: userx@???
data
diff --git a/test/aux-fixed/0258.m4 b/test/aux-fixed/0258.m4
index 7ba96f4..14938dc 100644
--- a/test/aux-fixed/0258.m4
+++ b/test/aux-fixed/0258.m4
@@ -1,3 +1,4 @@
+helo test
Mail from: x@y
rcpt to: userx@???
data
diff --git a/test/aux-fixed/5101.script b/test/aux-fixed/5101.script
old mode 100644
new mode 100755
diff --git a/test/confs/0021 b/test/confs/0021
index cf0ac21..8d252e8 100644
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -2,6 +2,7 @@
SERVER=
BR=
+HVH=
LOG_SELECTOR=
.include DIR/aux-var/std_conf_prefix
@@ -22,6 +23,7 @@ acl_smtp_mail = mail
acl_smtp_rcpt = rcpt
BR
+HVH
log_selector = LOG_SELECTOR
qualify_domain = test.ex
diff --git a/test/confs/0070 b/test/confs/0070
index 9ef3b2a..81c2881 100644
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -9,6 +9,7 @@ primary_hostname = myhost.test.ex
# ----- Main settings -----
acl_smtp_rcpt = rcpt
+hosts_require_helo =
helo_verify_hosts = ten-1.test.ex : ten-3.test.ex : HVH
helo_try_verify_hosts = ten-2.test.ex
log_selector = -host_lookup_failed
diff --git a/test/confs/0139 b/test/confs/0139
index 0c195c1..34ebb91 100644
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -7,6 +7,7 @@
domainlist local_domains = exim.test.ex
trusted_users = CALLER
+hosts_require_helo =
acl_smtp_helo = check_helo
acl_smtp_rcpt = check_recipient
diff --git a/test/confs/0416 b/test/confs/0416
index 752ba04..63964b7 100644
--- a/test/confs/0416
+++ b/test/confs/0416
@@ -7,6 +7,7 @@
primary_hostname = mail.test.ex
qualify_domain = test.ex
+hosts_require_helo =
queue_only
no_queue_only_override
diff --git a/test/confs/0457 b/test/confs/0457
index 866950e..d36c5f8 100644
--- a/test/confs/0457
+++ b/test/confs/0457
@@ -2,6 +2,7 @@
.include DIR/aux-var/std_conf_prefix
+hosts_require_helo =
# ----- Main settings -----
diff --git a/test/confs/3453 b/test/confs/3453
index 8d8a008..ca6a3a7 100644
--- a/test/confs/3453
+++ b/test/confs/3453
@@ -14,6 +14,7 @@ tls_advertise_hosts = *
tls_certificate = DIR/aux-fixed/cert1
tls_privatekey = DIR/aux-fixed/cert1
tls_remember_esmtp = REMEMBER
+hosts_require_helo =
# ----- Authenticators -----
diff --git a/test/confs/3463 b/test/confs/3463
index ab15af2..5b77277 100644
--- a/test/confs/3463
+++ b/test/confs/3463
@@ -15,6 +15,7 @@ tls_certificate = DIR/aux-fixed/cert1
tls_privatekey = DIR/aux-fixed/cert1
tls_remember_esmtp = REMEMBER
+hosts_require_helo =
# ----- Authenticators -----
diff --git a/test/log/0014 b/test/log/0014
index b480506..53e69a4 100644
--- a/test/log/0014
+++ b/test/log/0014
@@ -5,5 +5,5 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= J.Caesar@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@???> R=userx T=appendfile
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 H=[10.0.0.2] U=CALLER sender verify fail for <"jules@???>: Unrouteable mail domain "plc.example"
-1999-03-02 09:44:33 H=[10.0.0.2] U=CALLER F=<jules@???> rejected RCPT <userx@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [10.0.0.2] U=CALLER sender verify fail for <"jules@???>: Unrouteable mail domain "plc.example"
+1999-03-02 09:44:33 H=(test) [10.0.0.2] U=CALLER F=<jules@???> rejected RCPT <userx@???>: Sender verify failed
diff --git a/test/log/0022 b/test/log/0022
index 4fc9183..a3a1c3e 100644
--- a/test/log/0022
+++ b/test/log/0022
@@ -13,9 +13,9 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Connections=1
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss
1999-03-02 09:44:33 10HmbB-0005vi-00 frozen by ACL
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss
1999-03-02 09:44:33 10HmbD-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss
diff --git a/test/log/0023 b/test/log/0023
index 422944a..3ea6e2f 100644
--- a/test/log/0023
+++ b/test/log/0023
@@ -1,61 +1,61 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=[32.32.32.32] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=(test) [32.32.32.32] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx-vs <userx-vs@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=[32.32.32.32] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=(test) [32.32.32.32] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@??? H=[55.55.55.55] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@??? H=(test) [55.55.55.55] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbA-0005vi-00 => cond-yes <cond-yes@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbB-0005vi-00 => cond-1 <cond-1@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbC-0005vi-00 => cond-10 <cond-10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbD-0005vi-00 => cond-true <cond-true@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 H=[56.56.56.56] U=CALLER Warning: ACL "warn" statement skipped: condition test deferred: invalid "condition" value "rhubarb"
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [56.56.56.56] U=CALLER Warning: ACL "warn" statement skipped: condition test deferred: invalid "condition" value "rhubarb"
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbE-0005vi-00 => cond-rhubarb <cond-rhubarb@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbF-0005vi-00 => cond- <cond-@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbG-0005vi-00 => cond-no <cond-no@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbH-0005vi-00 => cond-0 <cond-0@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbI-0005vi-00 => cond-00 <cond-00@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbJ-0005vi-00 => cond-false <cond-false@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= userx@??? H=[56.56.57.57] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= userx@??? H=(test) [56.56.57.57] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbK-0005vi-00 => cond-yes <cond-yes@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
-1999-03-02 09:44:33 H=[56.56.57.57] U=CALLER F=<userx@???> temporarily rejected RCPT <cond-rhubarb@???>: invalid "condition" value "rhubarb"
-1999-03-02 09:44:33 10HmbL-0005vi-00 <= userx@??? H=[56.56.57.57] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [56.56.57.57] U=CALLER F=<userx@???> temporarily rejected RCPT <cond-rhubarb@???>: invalid "condition" value "rhubarb"
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= userx@??? H=(test) [56.56.57.57] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbL-0005vi-00 => cond--1 <cond--1@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbM-0005vi-00 <= userx@??? H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= userx@??? H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbM-0005vi-00 => cond-rhubarb <cond-rhubarb@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad1@???>
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad2@???>
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad3@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 <= rcpttest@??? H=[56.56.58.58] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad1@???>
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad2@???>
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad3@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= rcpttest@??? H=(test) [56.56.58.58] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbN-0005vi-00 => ok1 <ok1@???> R=r0 T=t2
1999-03-02 09:44:33 10HmbN-0005vi-00 -> ok2 <ok2@???> R=r0 T=t2
1999-03-02 09:44:33 10HmbN-0005vi-00 -> ok3 <ok3@???> R=r0 T=t2
1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
-1999-03-02 09:44:33 H=[56.56.59.59] U=CALLER F=<rcpttest@???> rejected RCPT <fail@???>: here is a fail message
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+1999-03-02 09:44:33 H=(test) [56.56.59.59] U=CALLER F=<rcpttest@???> rejected RCPT <fail@???>: here is a fail message
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
diff --git a/test/log/0024 b/test/log/0024
index 60ddc65..3cf8db2 100644
--- a/test/log/0024
+++ b/test/log/0024
@@ -1,32 +1,32 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER sender verify fail for <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <userx@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@y>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@???>: Sender verify failed
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=[V4NET.0.0.0] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER sender verify fail for <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <userx@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@y>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@???>: Sender verify failed
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=(test) [V4NET.0.0.0] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 => postmaster <postmaster@???> R=r2 T=local_delivery
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@???>: relay not permitted
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=[V4NET.0.0.0] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@???>: relay not permitted
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.0] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? <føø@test.ex> R=r1 T=dev_null H=myhost.test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 => postmaster <postmaster@???> R=r2 T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@???> R=r2 T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 => x@??? R=r1 T=dev_null H=ten-1.test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 H=[V4NET.255.255.0] U=CALLER F=<userx@???> rejected RCPT <bad@???>: unknown user
-1999-03-02 09:44:33 H=[V4NET.255.255.0] U=CALLER F=<userx@???> rejected RCPT <x@y>: Unrouteable address
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@??? H=[V4NET.255.255.0] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.255.255.0] U=CALLER F=<userx@???> rejected RCPT <bad@???>: unknown user
+1999-03-02 09:44:33 H=(test) [V4NET.255.255.0] U=CALLER F=<userx@???> rejected RCPT <x@y>: Unrouteable address
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@??? H=(test) [V4NET.255.255.0] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 => x@??? R=r1 T=dev_null H=ten-1.test.ex
1999-03-02 09:44:33 10HmaZ-0005vi-00 => x@??? R=r1 T=dev_null H=ten-2.test.ex
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<userx@???> rejected RCPT <userx@???>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<userx@???> rejected RCPT <x@???>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@??? H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<userx@???> rejected RCPT <userx@???>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<userx@???> rejected RCPT <x@???>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@??? H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbA-0005vi-00 => postmaster <postmaster@???> R=r2 T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 H=[V4NET.11.12.16] U=CALLER Warning: found in rbl2.test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@??? H=[V4NET.11.12.16] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.16] U=CALLER Warning: found in rbl2.test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@??? H=(test) [V4NET.11.12.16] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmbB-0005vi-00 => postmaster <postmaster@???> R=r2 T=local_delivery
1999-03-02 09:44:33 10HmbB-0005vi-00 => userx <userx@???> R=r2 T=local_delivery
1999-03-02 09:44:33 10HmbB-0005vi-00 => x@??? R=r1 T=dev_null H=ten-1.test.ex
diff --git a/test/log/0094 b/test/log/0094
index 9325a34..43e20a9 100644
--- a/test/log/0094
+++ b/test/log/0094
@@ -1,10 +1,10 @@
1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=[V4NET.11.12.13] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.11.12.13] U=root P=smtp S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=[99.99.99.99] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=(test) [99.99.99.99] U=root P=smtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@??? H=[V4NET.99.99.96] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@??? H=(test) [V4NET.99.99.96] U=root P=smtp S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/log/0212 b/test/log/0212
index 9d42f2f..f0e07e9 100644
--- a/test/log/0212
+++ b/test/log/0212
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <b@???>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <f@???>: bad user
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@???>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <"smartuser.b@???>: Unrouteable address
-1999-03-02 09:44:33 VRFY failed for <b@???> H=[V4NET.0.0.0] U=CALLER
-1999-03-02 09:44:33 VRFY failed for <f@???> H=[V4NET.0.0.0] U=CALLER
-1999-03-02 09:44:33 VRFY failed for <x@???> H=[V4NET.0.0.0] U=CALLER
-1999-03-02 09:44:33 VRFY failed for <"smartuser.b@???> H=[V4NET.0.0.0] U=CALLER
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <b@???>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <f@???>: bad user
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@???>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <"smartuser.b@???>: Unrouteable address
+1999-03-02 09:44:33 VRFY failed for <b@???> H=(test) [V4NET.0.0.0] U=CALLER
+1999-03-02 09:44:33 VRFY failed for <f@???> H=(test) [V4NET.0.0.0] U=CALLER
+1999-03-02 09:44:33 VRFY failed for <x@???> H=(test) [V4NET.0.0.0] U=CALLER
+1999-03-02 09:44:33 VRFY failed for <"smartuser.b@???> H=(test) [V4NET.0.0.0] U=CALLER
diff --git a/test/log/0214 b/test/log/0214
index daede29..685bccb 100644
--- a/test/log/0214
+++ b/test/log/0214
@@ -1,4 +1,4 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[127.0.0.1] F=<x@???> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<x@???> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address
diff --git a/test/log/0227 b/test/log/0227
index 4ca892a..3cd4a10 100644
--- a/test/log/0227
+++ b/test/log/0227
@@ -1,27 +1,27 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550-Recipient not liked on two lines\n550 Here's the second
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked, with bad char:\200\377\377
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete recipient verify callout
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 10HmaY-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550-Recipient not liked on two lines\n550 Here's the second
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked, with bad char:\200\377\377
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete recipient verify callout
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
1999-03-02 09:44:33 H=(me) [V4NET.0.0.7] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
diff --git a/test/log/0230 b/test/log/0230
index 8014450..59e94c4 100644
--- a/test/log/0230
+++ b/test/log/0230
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 SMTP connection from root
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@??? H=[V4NET.9.8.7]:1111 U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@??? H=(test) [V4NET.9.8.7]:1111 U=root P=smtp S=sss
1999-03-02 09:44:33 SMTP connection from root closed by QUIT
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaY-0005vi-00 => x <x@???> R=server T=local_delivery
@@ -12,7 +12,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 SMTP connection from root
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@??? H=[V4NET.9.8.7]:1112 U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@??? H=(test) [V4NET.9.8.7]:1112 U=root P=smtp S=sss
1999-03-02 09:44:33 SMTP connection from root closed by QUIT
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmbB-0005vi-00 => x@??? R=to_server T=remote H=127.0.0.1 [127.0.0.1] I=[127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
@@ -22,11 +22,11 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@??? H=[ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss
-1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@??? H=(test) [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss
+1999-03-02 09:44:33 SMTP connection from (test) [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT
1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= x@??? H=[127.0.0.1]:1114 I=[127.0.0.1]:PORT_D P=smtp S=sss
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D closed by QUIT
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= x@??? H=(test) [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D P=smtp S=sss
+1999-03-02 09:44:33 SMTP connection from (test) [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D closed by QUIT
1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D (TCP/IP connection count = 1)
1999-03-02 09:44:33 10HmbA-0005vi-00 <= x@??? H=(rhubarb) [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss
1999-03-02 09:44:33 SMTP connection from (rhubarb) [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT
diff --git a/test/log/0234 b/test/log/0234
index fc68dfd..c0adaba 100644
--- a/test/log/0234
+++ b/test/log/0234
@@ -1 +1 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=root F=<a@b> rejected RCPT <c@d>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=root F=<a@b> rejected RCPT <c@d>: relay not permitted
diff --git a/test/log/0293 b/test/log/0293
index 703dbc1..7b60ffa 100644
--- a/test/log/0293
+++ b/test/log/0293
@@ -1,7 +1,7 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x1@y U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 => one <one@z> R=r1 T=t1
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= x2@y U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: more than 1 messages received in one connection
1999-03-02 09:44:33 rejected MAIL command U=CALLER: too many messages in one connection
1999-03-02 09:44:33 rejected MAIL command U=CALLER: too many messages in one connection
diff --git a/test/log/0372 b/test/log/0372
index b4a7cbe..034cdf9 100644
--- a/test/log/0372
+++ b/test/log/0372
@@ -1,10 +1,10 @@
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 => x <x@y> R=r1 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 => a <a@b> R=r1 T=t1
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=host2.name [4.3.2.1] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=host2.name (test) [4.3.2.1] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: failed to expand " acl_c0="$acl_c0"\n acl_c1="$acl_c1"\n acl_c2="$acl_c2"\n acl_c3="$acl_c3"\n acl_c4="$acl_c4"\n acl_c5="$acl_c5"\n acl_c6="$acl_c6"\n acl_c7="$acl_c7"\n acl_c8="$acl_c8"\n acl_c9="$acl_c9"\n acl_m0="$acl_m0"\n acl_m1="$acl_m1"\n acl_m2="$acl_m2"\n acl_m3="$acl_m3"\n acl_m4="$acl_m4"\n acl_m5="$acl_m5"\n acl_m6="$acl_m6"\n acl_m7="$acl_m7"\n acl_m8="$acl_m8"\n acl_m9="$acl_m9"\n acl_m_foo="$acl_m_foo"\n acl_m_bar="$acl_m_bar"\n acl_c_foo="$acl_c_foo"\n acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set)
******** SERVER ********
diff --git a/test/log/0376 b/test/log/0376
index 69e8326..e6da43b 100644
--- a/test/log/0376
+++ b/test/log/0376
@@ -1,22 +1,22 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 (random)
1999-03-02 09:44:33 (random)
1999-03-02 09:44:33 (random)
1999-03-02 09:44:33 (random)
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss
diff --git a/test/log/0386 b/test/log/0386
index 7f04264..bbed208 100644
--- a/test/log/0386
+++ b/test/log/0386
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 => 2 <2@b> R=r1 T=t1
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 => 2 <2@b> R=r1 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/0387 b/test/log/0387
index d83ecc3..04163ff 100644
--- a/test/log/0387
+++ b/test/log/0387
@@ -1,2 +1,2 @@
1999-03-02 09:44:33 U=CALLER F=<x@???> rejected RCPT <x@y>
-1999-03-02 09:44:33 H=[1.2.3.4] U=CALLER F=<x@???> rejected RCPT <x@y>
+1999-03-02 09:44:33 H=(test) [1.2.3.4] U=CALLER F=<x@???> rejected RCPT <x@y>
diff --git a/test/log/0453 b/test/log/0453
index 4ca6114..c191382 100644
--- a/test/log/0453
+++ b/test/log/0453
@@ -3,4 +3,4 @@
1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo", C=HELO,HELO,HELO,HELO)
-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>", C=MAIL,MAIL,MAIL)
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>", C=HELO,MAIL,MAIL,MAIL)
diff --git a/test/log/0462 b/test/log/0462
index d0a04da..bdb6e0c 100644
--- a/test/log/0462
+++ b/test/log/0462
@@ -1,5 +1,5 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
diff --git a/test/log/0578 b/test/log/0578
index faa062e..7940de6 100644
--- a/test/log/0578
+++ b/test/log/0578
@@ -1,22 +1,22 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 (random)
1999-03-02 09:44:33 (random)
1999-03-02 09:44:33 (random)
1999-03-02 09:44:33 (random)
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss
diff --git a/test/log/0609 b/test/log/0609
index 55c0476..10e8e59 100644
--- a/test/log/0609
+++ b/test/log/0609
@@ -2,6 +2,6 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1] closed by QUIT
+1999-03-02 09:44:33 SMTP connection from (test) [127.0.0.1] closed by QUIT
1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-1999-03-02 09:44:33 unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+1999-03-02 09:44:33 unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
diff --git a/test/log/1103 b/test/log/1103
index fb09e79..8c21fd6 100644
--- a/test/log/1103
+++ b/test/log/1103
@@ -5,5 +5,5 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 H=(test) [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=(rhu.barb) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
diff --git a/test/log/1105 b/test/log/1105
index cfe8981..3e13156 100644
--- a/test/log/1105
+++ b/test/log/1105
@@ -3,4 +3,4 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: encryption required
+1999-03-02 09:44:33 H=(test) [127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: encryption required
diff --git a/test/log/1108 b/test/log/1108
index f45aba3..5f19de3 100644
--- a/test/log/1108
+++ b/test/log/1108
@@ -1,5 +1,5 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: "You must encrypt"
diff --git a/test/log/1110 b/test/log/1110
index fc4b59e..450b9b4 100644
--- a/test/log/1110
+++ b/test/log/1110
@@ -8,4 +8,4 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D
1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=[ip4.ip4.ip4.ip4] P=smtp X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=(test) [ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss
diff --git a/test/log/2002 b/test/log/2002
index 0641b50..7289b2c 100644
--- a/test/log/2002
+++ b/test/log/2002
@@ -15,10 +15,10 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
@@ -44,10 +44,10 @@
1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 ver: TLS1.x
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server2.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=(test) [ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server2.example.com" S=sss
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
diff --git a/test/log/2014 b/test/log/2014
index 1fa2ace..c800ab7 100644
--- a/test/log/2014
+++ b/test/log/2014
@@ -4,7 +4,7 @@
1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=
1999-03-02 09:44:33 TLS error on connection from (rhu5.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 TLS error on connection from (rhu7.barb) [ip4.ip4.ip4.ip4] (certificate verification failed): certificate revoked
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=CN=revoked1.example.com
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=CN=revoked1.example.com
diff --git a/test/log/2029 b/test/log/2029
index 6d1107c..8100e40 100644
--- a/test/log/2029
+++ b/test/log/2029
@@ -1,5 +1,5 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated.
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=[127.0.0.1] P=smtps
+1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection from (test) [127.0.0.1] (recv): The TLS connection was non-properly terminated.
+1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=(test) [127.0.0.1] P=smtps
diff --git a/test/log/2102.openssl_1_1_1 b/test/log/2102.openssl_1_1_1
index 67d6c7e..0863d25 100644
--- a/test/log/2102.openssl_1_1_1
+++ b/test/log/2102.openssl_1_1_1
@@ -13,10 +13,10 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer cert:
@@ -42,8 +42,8 @@
1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 ver: TLS1.x
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
diff --git a/test/log/2114 b/test/log/2114
index 149442f..511cdc9 100644
--- a/test/log/2114
+++ b/test/log/2114
@@ -7,9 +7,9 @@
1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.net
1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=unable to verify the first certificate cert=/CN=server1.example.net
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=/CN=server1.example.net
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=/CN=server1.example.net
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=certificate revoked cert=/CN=revoked1.example.com
1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=certificate revoked cert=/CN=revoked1.example.com
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=revoked1.example.com" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=/CN=revoked1.example.com
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=revoked1.example.com" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=/CN=revoked1.example.com
diff --git a/test/log/2132 b/test/log/2132
index f38f0a1..605f750 100644
--- a/test/log/2132
+++ b/test/log/2132
@@ -11,11 +11,11 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
1999-03-02 09:44:33 SN <CN=server1.example.com>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=(test) [ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" S=sss
diff --git a/test/log/2150 b/test/log/2150
index 55c8b0e..5bafd09 100644
--- a/test/log/2150
+++ b/test/log/2150
@@ -1,4 +1,4 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=[127.0.0.1] P=smtps
+1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=(test) [127.0.0.1] P=smtps
diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER
index cde2b58..5494e4b 100644
--- a/test/mail/0005.CALLER
+++ b/test/mail/0005.CALLER
@@ -2,7 +2,8 @@ From someone@??? Tue Mar 02 09:44:33 1999
Return-path: <someone@???>
Envelope-to: CALLER@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <someone@???>)
id 10HmaX-0005vi-00
for CALLER@???;
@@ -13,7 +14,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
X-acl-message-linecount: 4
X-local-user: uid=CALLER_UID gid=CALLER_GID
X-body-linecount: 3
-X-message-linecount: 12
+X-message-linecount: 13
X-received-count: 1
This is a test message.
@@ -24,7 +25,8 @@ From someone@??? Tue Mar 02 09:44:33 1999
Return-path: <someone@???>
Envelope-to: CALLER@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <someone@???>)
id 10HmaY-0005vi-00
for CALLER@???;
@@ -36,7 +38,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
X-acl-message-linecount: 3
X-local-user: uid=CALLER_UID gid=CALLER_GID
X-body-linecount: 1
-X-message-linecount: 11
+X-message-linecount: 12
X-received-count: 1
This is a second test message.
@@ -45,7 +47,8 @@ From someone@??? Tue Mar 02 09:44:33 1999
Return-path: <someone@???>
Envelope-to: CALLER@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <someone@???>)
id 10HmaZ-0005vi-00
for CALLER@???;
@@ -58,7 +61,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
X-acl-message-linecount: 4
X-local-user: uid=CALLER_UID gid=CALLER_GID
X-body-linecount: 1
-X-message-linecount: 12
+X-message-linecount: 13
X-received-count: 1
This is a third test message.
diff --git a/test/mail/0023.cond- b/test/mail/0023.cond-
index da5322b..8fd4eac 100644
--- a/test/mail/0023.cond-
+++ b/test/mail/0023.cond-
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbF-0005vi-00
diff --git a/test/mail/0023.cond--1 b/test/mail/0023.cond--1
index 334186f..56557ac 100644
--- a/test/mail/0023.cond--1
+++ b/test/mail/0023.cond--1
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.57.57] (ident=CALLER)
+Received: from [56.56.57.57] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbL-0005vi-00
diff --git a/test/mail/0023.cond-0 b/test/mail/0023.cond-0
index 8b99af1..39d3f9f 100644
--- a/test/mail/0023.cond-0
+++ b/test/mail/0023.cond-0
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbH-0005vi-00
diff --git a/test/mail/0023.cond-00 b/test/mail/0023.cond-00
index c848706..793280c 100644
--- a/test/mail/0023.cond-00
+++ b/test/mail/0023.cond-00
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbI-0005vi-00
diff --git a/test/mail/0023.cond-1 b/test/mail/0023.cond-1
index d5ebc36..9694276 100644
--- a/test/mail/0023.cond-1
+++ b/test/mail/0023.cond-1
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbB-0005vi-00
diff --git a/test/mail/0023.cond-10 b/test/mail/0023.cond-10
index 7bc0533..9c6dd1d 100644
--- a/test/mail/0023.cond-10
+++ b/test/mail/0023.cond-10
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbC-0005vi-00
diff --git a/test/mail/0023.cond-false b/test/mail/0023.cond-false
index 05fdd3f..7be8d56 100644
--- a/test/mail/0023.cond-false
+++ b/test/mail/0023.cond-false
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbJ-0005vi-00
diff --git a/test/mail/0023.cond-no b/test/mail/0023.cond-no
index eb22c8e..b28aa57 100644
--- a/test/mail/0023.cond-no
+++ b/test/mail/0023.cond-no
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbG-0005vi-00
diff --git a/test/mail/0023.cond-rhubarb b/test/mail/0023.cond-rhubarb
index 030ca9d..fd8c33c 100644
--- a/test/mail/0023.cond-rhubarb
+++ b/test/mail/0023.cond-rhubarb
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbE-0005vi-00
@@ -9,7 +9,7 @@ X-message-body-size: 0
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbM-0005vi-00
diff --git a/test/mail/0023.cond-true b/test/mail/0023.cond-true
index 7e82414..4681550 100644
--- a/test/mail/0023.cond-true
+++ b/test/mail/0023.cond-true
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbD-0005vi-00
diff --git a/test/mail/0023.cond-yes b/test/mail/0023.cond-yes
index 967ff7c..d20f426 100644
--- a/test/mail/0023.cond-yes
+++ b/test/mail/0023.cond-yes
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbA-0005vi-00
@@ -10,7 +10,7 @@ X-message-body-size: 0
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [56.56.57.57] (ident=CALLER)
+Received: from [56.56.57.57] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbK-0005vi-00
diff --git a/test/mail/0023.okbatch b/test/mail/0023.okbatch
index 700461c..7101642 100644
--- a/test/mail/0023.okbatch
+++ b/test/mail/0023.okbatch
@@ -2,7 +2,7 @@ From rcpttest@??? Tue Mar 02 09:44:33 1999
Envelope-to: ok1@???,
ok2@???,
ok3@???
-Received: from [56.56.58.58] (ident=CALLER)
+Received: from [56.56.58.58] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <rcpttest@???>)
id 10HmbN-0005vi-00;
diff --git a/test/mail/0023.userx b/test/mail/0023.userx
index 02a958b..b95124b 100644
--- a/test/mail/0023.userx
+++ b/test/mail/0023.userx
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [32.32.32.32] (ident=CALLER)
+Received: from [32.32.32.32] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmaY-0005vi-00
@@ -12,7 +12,7 @@ X-message-body-size: 28
Test without verify sender.
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [55.55.55.55] (ident=CALLER)
+Received: from [55.55.55.55] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmaZ-0005vi-00
diff --git a/test/mail/0023.userx-vs b/test/mail/0023.userx-vs
index d5e8cd1..ffd2ef8 100644
--- a/test/mail/0023.userx-vs
+++ b/test/mail/0023.userx-vs
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [32.32.32.32] (ident=CALLER)
+Received: from [32.32.32.32] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmaX-0005vi-00
diff --git a/test/mail/0024.postmaster b/test/mail/0024.postmaster
index ea1c5d5..cba2de2 100644
--- a/test/mail/0024.postmaster
+++ b/test/mail/0024.postmaster
@@ -1,5 +1,5 @@
From x@y Tue Mar 02 09:44:33 1999
-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaX-0005vi-00
@@ -9,7 +9,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
Message 1
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmaY-0005vi-00;
@@ -18,7 +18,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
Message 2
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbA-0005vi-00
@@ -28,7 +28,7 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
Message 4
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.16] (ident=CALLER)
+Received: from [V4NET.11.12.16] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbB-0005vi-00;
diff --git a/test/mail/0024.userx b/test/mail/0024.userx
index d4b2247..519bd3f 100644
--- a/test/mail/0024.userx
+++ b/test/mail/0024.userx
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmaY-0005vi-00;
@@ -8,7 +8,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
Message 2
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.16] (ident=CALLER)
+Received: from [V4NET.11.12.16] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbB-0005vi-00;
diff --git a/test/mail/0025.userx b/test/mail/0025.userx
index a845d2d..b1fa7dc 100644
--- a/test/mail/0025.userx
+++ b/test/mail/0025.userx
@@ -1,5 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index 21b9abc..2560fd0 100644
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -1,5 +1,6 @@
From x@y Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmbF-0005vi-00
for userx@???;
@@ -12,7 +13,8 @@ X-warning: this is a test warning
Message 7
From x@y Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmbG-0005vi-00
for userx@???;
@@ -27,7 +29,8 @@ X-warning: this is a test warning
Message 10
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmbH-0005vi-00
for userx@???;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0049.userx b/test/mail/0049.userx
index cb34fea..059429e 100644
--- a/test/mail/0049.userx
+++ b/test/mail/0049.userx
@@ -62,7 +62,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
Return-path: <CALLER@???>
Envelope-to: userx@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbB-0005vi-00
for userx@???;
@@ -141,7 +142,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
Return-path: <CALLER@???>
Envelope-to: userx@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbG-0005vi-00
for userx@???;
diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index bcc824b..a688830 100644
--- a/test/mail/0050.userx
+++ b/test/mail/0050.userx
@@ -66,7 +66,8 @@ From userx@??? Tue Mar 02 09:44:33 1999
Return-path: <userx@???>
Envelope-to: userx@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.ex with local-smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbB-0005vi-00
for userx@???;
@@ -161,7 +162,8 @@ From userx@??? Tue Mar 02 09:44:33 1999
Return-path: <userx@???>
Envelope-to: userx@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.ex with local-smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmbH-0005vi-00
for userx@???;
diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 7587d5f..b60764e 100644
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -31,7 +31,8 @@ From postmaster@??? Tue Mar 02 09:44:33 1999
Return-path: <postmaster@???>
Envelope-to: userx@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <postmaster@???>)
id 10HmaZ-0005vi-00
for userx@???;
diff --git a/test/mail/0094.userx b/test/mail/0094.userx
index 122fc97..dd97d4c 100644
--- a/test/mail/0094.userx
+++ b/test/mail/0094.userx
@@ -1,5 +1,5 @@
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.13] (ident=root)
+Received: from [V4NET.11.12.13] (helo=test ident=root)
by the.local.host.name with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ host_lookup_deferred: 0
This is a test message
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [99.99.99.99] (ident=root)
+Received: from [99.99.99.99] (helo=test ident=root)
by the.local.host.name with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmaY-0005vi-00
@@ -23,7 +23,7 @@ host_lookup_deferred: 1
This is a test message
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [V4NET.99.99.96] (ident=root)
+Received: from [V4NET.99.99.96] (helo=test ident=root)
by the.local.host.name with smtp (Exim x.yz)
(envelope-from <userx@???>)
id 10HmaZ-0005vi-00
diff --git a/test/mail/0127.userx b/test/mail/0127.userx
index 0f5f186..65393ea 100644
--- a/test/mail/0127.userx
+++ b/test/mail/0127.userx
@@ -66,7 +66,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
Return-path: <CALLER@???>
Envelope-to: userx@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbB-0005vi-00
for userx@???;
@@ -146,7 +147,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
Return-path: <CALLER@???>
Envelope-to: userx@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbG-0005vi-00
for userx@???;
diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 2fb7c15..2a978a7 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -43,7 +43,8 @@ Status: 5.0.0
Content-type: message/rfc822
Return-path: <abcd@???>
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <abcd@???>)
id 10HmaX-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -100,7 +101,8 @@ Status: 5.0.0
Content-type: text/rfc822-headers
Return-path: <abcd@???>
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <abcd@???>)
id 10HmbA-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0197.copies b/test/mail/0197.copies
index 164bedd..d5251f7 100644
--- a/test/mail/0197.copies
+++ b/test/mail/0197.copies
@@ -16,7 +16,8 @@ MAIL FROM:<doesn't@matter>
RCPT TO:<x@???>
RCPT TO:<y@???>
DATA
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <doesn't@matter>)
id 10HmaY-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0202.userx b/test/mail/0202.userx
index 3d5baab..9d1ba77 100644
--- a/test/mail/0202.userx
+++ b/test/mail/0202.userx
@@ -1,5 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for userx@???;
@@ -14,7 +15,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
This line follows ..
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for userx@???;
diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 4b893ff..e8662a6 100644
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -23,7 +23,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
From foo@bar Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <foo@bar>)
id 10HmbA-0005vi-00
for userx@???;
diff --git a/test/mail/0221.userx b/test/mail/0221.userx
index 35f5435..1387ea3 100644
--- a/test/mail/0221.userx
+++ b/test/mail/0221.userx
@@ -21,7 +21,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00
for userx@???;
diff --git a/test/mail/0230.x b/test/mail/0230.x
index bef6df0..02272d3 100644
--- a/test/mail/0230.x
+++ b/test/mail/0230.x
@@ -1,5 +1,5 @@
From x@??? Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4] (port=1113)
+Received: from [ip4.ip4.ip4.ip4] (port=1113 helo=test)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@???>)
id 10HmaY-0005vi-00
@@ -9,7 +9,7 @@ Port: 1113
From x@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1] (port=1114)
+Received: from [127.0.0.1] (port=1114 helo=test)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@???>)
id 10HmaZ-0005vi-00
@@ -29,7 +29,7 @@ Port: 1115
From x@??? Tue Mar 02 09:44:33 1999
-Received: from [V4NET.9.8.7] (port=1111 ident=root)
+Received: from [V4NET.9.8.7] (port=1111 helo=test ident=root)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@???>)
id 10HmaX-0005vi-00
diff --git a/test/mail/0256.abc@def b/test/mail/0256.abc@def
index 80a36c3..6eab476 100644
--- a/test/mail/0256.abc@def
+++ b/test/mail/0256.abc@def
@@ -37,7 +37,8 @@ Status: 5.0.0
Content-type: message/rfc822
Return-path: <"abc@???>
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <"abc@???>)
id 10HmaZ-0005vi-00
for unknown@???;
diff --git "a/test/mail/0256.abcd+unknown.domain+\"abc@def\"" "b/test/mail/0256.abcd+unknown.domain+\"abc@def\""
index 80a36c3..6eab476 100644
--- "a/test/mail/0256.abcd+unknown.domain+\"abc@def\""
+++ "b/test/mail/0256.abcd+unknown.domain+\"abc@def\""
@@ -37,7 +37,8 @@ Status: 5.0.0
Content-type: message/rfc822
Return-path: <"abc@???>
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <"abc@???>)
id 10HmaZ-0005vi-00
for unknown@???;
diff --git a/test/mail/0258.userx b/test/mail/0258.userx
index 1cc37c5..722707b 100644
--- a/test/mail/0258.userx
+++ b/test/mail/0258.userx
@@ -128,7 +128,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
Not: a header line
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbF-0005vi-00
for userx@???;
@@ -145,7 +146,8 @@ CR.CR
terminate the message
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbG-0005vi-00
for userx@???;
diff --git a/test/mail/0386.2 b/test/mail/0386.2
index 79c2eea..fbfcae1 100644
--- a/test/mail/0386.2
+++ b/test/mail/0386.2
@@ -1,5 +1,5 @@
From x@y Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ X-Warning: This is a test blacklisting message
Message 1
From x@y Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaY-0005vi-00
diff --git a/test/mail/0395.userx b/test/mail/0395.userx
index 69b311e..f9dde98 100644
--- a/test/mail/0395.userx
+++ b/test/mail/0395.userx
@@ -50,7 +50,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-bsmtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbC-0005vi-00
for userx@???;
@@ -63,7 +64,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-bsmtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbD-0005vi-00
for userx@???;
@@ -76,7 +78,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbE-0005vi-00
for userx@???;
@@ -89,7 +92,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbF-0005vi-00
for userx@???;
diff --git a/test/mail/0398.x b/test/mail/0398.x
index 081d38b..ac339e4 100644
--- a/test/mail/0398.x
+++ b/test/mail/0398.x
@@ -1,5 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by mail.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by mail.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for x@local;
diff --git a/test/mail/0446.userx b/test/mail/0446.userx
index 416fabc..8e2ee54 100644
--- a/test/mail/0446.userx
+++ b/test/mail/0446.userx
@@ -14,7 +14,8 @@ X-Router: 3
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for userx@???;
diff --git a/test/mail/0496.someone b/test/mail/0496.someone
index c0010e1..ded6dfb 100644
--- a/test/mail/0496.someone
+++ b/test/mail/0496.someone
@@ -1,6 +1,7 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
At-Start: some text
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for someone@???;
diff --git a/test/mail/0500.userx b/test/mail/0500.userx
index e8882eb..54e2266 100644
--- a/test/mail/0500.userx
+++ b/test/mail/0500.userx
@@ -1,5 +1,6 @@
From postmaster@y Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <postmaster@y>)
id 10HmaX-0005vi-00
for userx@y;
diff --git a/test/mail/0517.userx b/test/mail/0517.userx
index 67462d3..b942233 100644
--- a/test/mail/0517.userx
+++ b/test/mail/0517.userx
@@ -1,5 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for userx@???;
diff --git a/test/mail/0517.usery b/test/mail/0517.usery
index 3afba6d..3a2a64b 100644
--- a/test/mail/0517.usery
+++ b/test/mail/0517.usery
@@ -1,5 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for usery@???;
diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok
index 5411418..e0e7f97 100644
--- a/test/mail/0532.rcptok
+++ b/test/mail/0532.rcptok
@@ -1,5 +1,6 @@
From mailok@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <mailok@???>)
id 10HmaX-0005vi-00
for rcptok@???;
diff --git a/test/mail/0567.rcptok b/test/mail/0567.rcptok
index 5c0c185..48d5f3c 100644
--- a/test/mail/0567.rcptok
+++ b/test/mail/0567.rcptok
@@ -1,5 +1,6 @@
From mailok@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <mailok@???>)
id 10HmaX-0005vi-00
for rcptok@???;
diff --git a/test/mail/0580.local b/test/mail/0580.local
index 9df481d..16b65d2 100644
--- a/test/mail/0580.local
+++ b/test/mail/0580.local
@@ -1,5 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbB-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0600.CALLER b/test/mail/0600.CALLER
index 2cd5947..987765e 100644
--- a/test/mail/0600.CALLER
+++ b/test/mail/0600.CALLER
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
Return-path: <CALLER@???>
Envelope-to: CALLER@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for CALLER@???;
@@ -19,7 +20,7 @@ From: CALLER@???
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-local-user: uid=CALLER_UID gid=CALLER_GID
X-body-linecount: 3
-X-message-linecount: 18
+X-message-linecount: 19
X-received-count: 1
This is a test message.
@@ -30,7 +31,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
Return-path: <CALLER@???>
Envelope-to: CALLER@???
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for CALLER@???;
@@ -41,7 +43,7 @@ From: CALLER@???
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-local-user: uid=CALLER_UID gid=CALLER_GID
X-body-linecount: 1
-X-message-linecount: 10
+X-message-linecount: 11
X-received-count: 1
This is a second test message.
diff --git a/test/mail/1110.userx b/test/mail/1110.userx
index cfc5029..a0aa956 100644
--- a/test/mail/1110.userx
+++ b/test/mail/1110.userx
@@ -11,8 +11,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn ''
This is a test encrypted message.
From userx@??? Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
- by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
+ by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <userx@???>)
id 10HmaY-0005vi-00
diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER
index adeef5a..2203c8e 100644
--- a/test/mail/2002.CALLER
+++ b/test/mail/2002.CALLER
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
This is a test encrypted message.
From "name with spaces"@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <"name with spaces"@???>)
@@ -25,7 +25,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
This is a test encrypted message.
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
@@ -38,7 +38,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=CN=server2.example.com
This is a test encrypted message from a verified host.
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
@@ -52,7 +52,7 @@ This is a test encrypted message.
It should be sent under the RSA server cert and with an RSA cipher.
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 13dcbf2..4cde374 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,6 +1,6 @@
From a@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <a@???>)
id 10HmaX-0005vi-00
@@ -12,8 +12,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
This is a test encrypted message.
From "name with spaces"@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <"name with spaces"@???>)
id 10HmaY-0005vi-00
@@ -25,8 +25,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
This is a test encrypted message.
From b@??? Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
- by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [ip4.ip4.ip4.ip4] (helo=rhu.barb)
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <b@???>)
id 10HmaZ-0005vi-00
@@ -38,8 +38,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com
This is a test encrypted message from a verified host.
From c@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+ by myhost.test.ex with esmtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <c@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 4e35082..abe23c5 100644
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -1,5 +1,5 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
@@ -12,7 +12,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
This is a test encrypted message.
From "name with spaces"@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <"name with spaces"@???>)
@@ -25,7 +25,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
This is a test encrypted message.
From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
diff --git a/test/rejectlog/0014 b/test/rejectlog/0014
index 7827437..5b8e2ee 100644
--- a/test/rejectlog/0014
+++ b/test/rejectlog/0014
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 H=[10.0.0.2] U=CALLER sender verify fail for <"jules@???>: Unrouteable mail domain "plc.example"
-1999-03-02 09:44:33 H=[10.0.0.2] U=CALLER F=<jules@???> rejected RCPT <userx@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [10.0.0.2] U=CALLER sender verify fail for <"jules@???>: Unrouteable mail domain "plc.example"
+1999-03-02 09:44:33 H=(test) [10.0.0.2] U=CALLER F=<jules@???> rejected RCPT <userx@???>: Sender verify failed
diff --git a/test/rejectlog/0023 b/test/rejectlog/0023
index dc6c7e9..74b4db5 100644
--- a/test/rejectlog/0023
+++ b/test/rejectlog/0023
@@ -1,7 +1,7 @@
-1999-03-02 09:44:33 H=[56.56.57.57] U=CALLER F=<userx@???> temporarily rejected RCPT <cond-rhubarb@???>: invalid "condition" value "rhubarb"
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad1@???>
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad2@???>
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad3@???>
-1999-03-02 09:44:33 H=[56.56.59.59] U=CALLER F=<rcpttest@???> rejected RCPT <fail@???>: here is a fail message
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+1999-03-02 09:44:33 H=(test) [56.56.57.57] U=CALLER F=<userx@???> temporarily rejected RCPT <cond-rhubarb@???>: invalid "condition" value "rhubarb"
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad1@???>
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad2@???>
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@???> rejected RCPT <bad3@???>
+1999-03-02 09:44:33 H=(test) [56.56.59.59] U=CALLER F=<rcpttest@???> rejected RCPT <fail@???>: here is a fail message
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
diff --git a/test/rejectlog/0024 b/test/rejectlog/0024
index be36148..f995b18 100644
--- a/test/rejectlog/0024
+++ b/test/rejectlog/0024
@@ -1,11 +1,11 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER sender verify fail for <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <userx@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@y>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@???>: relay not permitted
-1999-03-02 09:44:33 H=[V4NET.255.255.0] U=CALLER F=<userx@???> rejected RCPT <bad@???>: unknown user
-1999-03-02 09:44:33 H=[V4NET.255.255.0] U=CALLER F=<userx@???> rejected RCPT <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<userx@???> rejected RCPT <userx@???>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<userx@???> rejected RCPT <x@???>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER sender verify fail for <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <userx@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@y>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@???>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.255.255.0] U=CALLER F=<userx@???> rejected RCPT <bad@???>: unknown user
+1999-03-02 09:44:33 H=(test) [V4NET.255.255.0] U=CALLER F=<userx@???> rejected RCPT <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<userx@???> rejected RCPT <userx@???>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<userx@???> rejected RCPT <x@???>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 96682c4..0499db2 100644
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
Envelope-from: <x@y>
Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaX-0005vi-00
for x@y;
@@ -12,7 +13,8 @@ I Message-Id: <E10HmaX-0005vi-00@???>
1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<x@y> rejected after DATA: '>' missing at end of address: failing address in "To:" header is: <dummy@???
Envelope-from: <x@y>
Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaY-0005vi-00
for x@y;
@@ -25,7 +27,8 @@ I Message-Id: <E10HmaY-0005vi-00@???>
1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
Envelope-from: <>
Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaZ-0005vi-00
for x@y;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -35,7 +38,8 @@ I Message-Id: <E10HmaZ-0005vi-00@???>
1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
Envelope-from: <>
Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmbA-0005vi-00
for x@y;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -46,7 +50,8 @@ I Message-Id: <E10HmbA-0005vi-00@???>
1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
Envelope-from: <x@y>
Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmbB-0005vi-00
for x@y;
@@ -57,7 +62,8 @@ F From: x@y
1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
Envelope-from: <>
Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmbC-0005vi-00
for userx@???;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0027 b/test/rejectlog/0027
index 9ae0806..e4d8e5d 100644
--- a/test/rejectlog/0027
+++ b/test/rejectlog/0027
@@ -10,7 +10,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA
Envelope-from: <>
Envelope-to: <data@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaX-0005vi-00
for data@???;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -20,7 +21,8 @@ I Message-Id: <E10HmaX-0005vi-00@???>
1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
Envelope-from: <>
Envelope-to: <data@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaY-0005vi-00
for data@???;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -30,7 +32,8 @@ I Message-Id: <E10HmaY-0005vi-00@???>
1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test local_parts condition in DATA ACL
Envelope-from: <>
Envelope-to: <data@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaZ-0005vi-00
for data@???;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0028 b/test/rejectlog/0028
index 1e5600b..94dc562 100644
--- a/test/rejectlog/0028
+++ b/test/rejectlog/0028
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: message too big - $recipients=userx@??? (1)
Envelope-from: <CALLER@???>
Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for userx@???;
diff --git a/test/rejectlog/0162 b/test/rejectlog/0162
index 89361d3..1bef1ef 100644
--- a/test/rejectlog/0162
+++ b/test/rejectlog/0162
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: malformed address: ">,\n <u213@???>,\n may not follow <u212@???: failing address in "To:" header begins: <u212@???">,\n <u213@???>,\n <u214@???>,\n <u215@???>,\n <u216@???>,\n <u217@???>,\n <u218@???>,\n <u219@???>,\n <u220@???>,\n <u221@???>,\n <u222@???>,\n <u223@???>,\n <u224@???>,\n <u225@???>,\n <u226@???>,\n <u227@???>,\n <u228@???>,\n <u229@???>,\n <u230@???>,\n <u231@???>,\n <u232@???>,\n <u233@???>,\n <u234@???>,\n <u235@???>,\n <u236@???>,\n <u237@???>,\n <u238@???>,\n <u239@???>,\n <u240@???>,\n <u241@???>,\n <u242@???>,\n <u243@???>,\n <u244@???>,\n <u245@???>,\n <u246@???>,\n <u247@???>,\n <u248@???>,\n <u249@???>,\n <u250@???>,\n <u251@???>,\n <u252@???>,\n <u253@???>,\n <u254@compu
Envelope-from: <CALLER@???>
Envelope-to: <u3@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for u3@???;
diff --git a/test/rejectlog/0212 b/test/rejectlog/0212
index 2d68234..6debd3d 100644
--- a/test/rejectlog/0212
+++ b/test/rejectlog/0212
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <b@???>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <f@???>: bad user
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@???>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <"smartuser.b@???>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <b@???>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <f@???>: bad user
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <x@???>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@???> rejected RCPT <"smartuser.b@???>: Unrouteable address
diff --git a/test/rejectlog/0214 b/test/rejectlog/0214
index 59443bd..5da7cf1 100644
--- a/test/rejectlog/0214
+++ b/test/rejectlog/0214
@@ -1,9 +1,9 @@
******** SERVER ********
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[127.0.0.1] F=<x@???> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<x@???> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address
Envelope-from: <x@???>
Envelope-to: <x@???>
-P Received: from [127.0.0.1]
+P Received: from [127.0.0.1] (helo=test)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@???>)
id 10HmaX-0005vi-00
diff --git a/test/rejectlog/0227 b/test/rejectlog/0227
index 0246789..d0312f3 100644
--- a/test/rejectlog/0227
+++ b/test/rejectlog/0227
@@ -1,45 +1,45 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550-Recipient not liked on two lines\n550 Here's the second
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked, with bad char:\200\377\377
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete recipient verify callout
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550-Recipient not liked on two lines\n550 Here's the second
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked, with bad char:\200\377\377
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete recipient verify callout
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
Envelope-from: <uncheckable@localhost1>
Envelope-to: <z@???>
-P Received: from [V4NET.0.0.4] (ident=root)
+P Received: from [V4NET.0.0.4] (helo=test ident=root)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <uncheckable@localhost1>)
id 10HmaX-0005vi-00
for z@???;
Tue, 2 Mar 1999 09:44:33 +0000
F From: abcd@???
-1999-03-02 09:44:33 10HmaY-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
Envelope-from: <uncheckable@localhost1>
Envelope-to: <z@???>
-P Received: from [V4NET.0.0.4] (ident=root)
+P Received: from [V4NET.0.0.4] (helo=test ident=root)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <uncheckable@localhost1>)
id 10HmaY-0005vi-00
for z@???;
Tue, 2 Mar 1999 09:44:33 +0000
F From: abcd@???
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
1999-03-02 09:44:33 H=(me) [V4NET.0.0.7] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
diff --git a/test/rejectlog/0234 b/test/rejectlog/0234
index fc68dfd..c0adaba 100644
--- a/test/rejectlog/0234
+++ b/test/rejectlog/0234
@@ -1 +1 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=root F=<a@b> rejected RCPT <c@d>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=root F=<a@b> rejected RCPT <c@d>: relay not permitted
diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 5b3680d..5335915 100644
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
Envelope-from: <>
Envelope-to: <x@y>
-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
id 10HmaX-0005vi-00
for x@y;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -11,7 +12,8 @@ I Message-Id: <E10HmaX-0005vi-00@???>
1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
Envelope-from: <>
Envelope-to: <x@y>
-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
id 10HmaY-0005vi-00
for x@y;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -23,7 +25,8 @@ I Message-Id: <E10HmaY-0005vi-00@???>
1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
Envelope-from: <nosyntax@x>
Envelope-to: <x@y>
-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
(envelope-from <nosyntax@x>)
id 10HmaZ-0005vi-00
for x@y;
@@ -34,7 +37,8 @@ I Message-Id: <E10HmaZ-0005vi-00@???>
1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
Envelope-from: <>
Envelope-to: <x@y>
-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by the.local.host.name with local-smtp (Exim x.yz)
id 10HmbA-0005vi-00
for x@y;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0376 b/test/rejectlog/0376
index 17d806f..a0b8d31 100644
--- a/test/rejectlog/0376
+++ b/test/rejectlog/0376
@@ -1,16 +1,16 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
diff --git a/test/rejectlog/0387 b/test/rejectlog/0387
index d83ecc3..04163ff 100644
--- a/test/rejectlog/0387
+++ b/test/rejectlog/0387
@@ -1,2 +1,2 @@
1999-03-02 09:44:33 U=CALLER F=<x@???> rejected RCPT <x@y>
-1999-03-02 09:44:33 H=[1.2.3.4] U=CALLER F=<x@???> rejected RCPT <x@y>
+1999-03-02 09:44:33 H=(test) [1.2.3.4] U=CALLER F=<x@???> rejected RCPT <x@y>
diff --git a/test/rejectlog/0453 b/test/rejectlog/0453
index 4ca6114..c191382 100644
--- a/test/rejectlog/0453
+++ b/test/rejectlog/0453
@@ -3,4 +3,4 @@
1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo", C=HELO,HELO,HELO,HELO)
-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>", C=MAIL,MAIL,MAIL)
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>", C=HELO,MAIL,MAIL,MAIL)
diff --git a/test/rejectlog/0462 b/test/rejectlog/0462
index d0a04da..bdb6e0c 100644
--- a/test/rejectlog/0462
+++ b/test/rejectlog/0462
@@ -1,5 +1,5 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
diff --git a/test/rejectlog/0465 b/test/rejectlog/0465
index 2f16fd3..9636ffa 100644
--- a/test/rejectlog/0465
+++ b/test/rejectlog/0465
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz.
Envelope-from: <>
Envelope-to: <abc@xyz>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaX-0005vi-00
for abc@xyz;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0468 b/test/rejectlog/0468
index e78a7a1..71c552e 100644
--- a/test/rejectlog/0468
+++ b/test/rejectlog/0468
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: message body <This is the FIRST message body. > message end <This is the FIRST message body. >
Envelope-from: <CALLER@???>
Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for x@y;
@@ -12,7 +13,8 @@ F From: CALLER_NAME <CALLER@???>
1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: message body <This is the SECOND message body. > message end <This is the SECOND message body. >
Envelope-from: <CALLER@???>
Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for x@y;
diff --git a/test/rejectlog/0490 b/test/rejectlog/0490
index 5ae8529..89cfc1b 100644
--- a/test/rejectlog/0490
+++ b/test/rejectlog/0490
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: body contains 2 binary zero characters
Envelope-from: <CALLER@???>
Envelope-to: <aa@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for aa@???;
diff --git a/test/rejectlog/0505 b/test/rejectlog/0505
index b6ec7ac..232e4ad 100644
--- a/test/rejectlog/0505
+++ b/test/rejectlog/0505
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> temporarily rejected after DATA: cannot use "control=submission" in DATA ACL
Envelope-from: <CALLER@???>
Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for userx@???;
diff --git a/test/rejectlog/0507 b/test/rejectlog/0507
index 2f186fd..3c72ebd 100644
--- a/test/rejectlog/0507
+++ b/test/rejectlog/0507
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
Envelope-from: <CALLER@???>
Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for userx@???;
@@ -13,7 +14,8 @@ F From: CALLER_NAME <CALLER@???>
1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
Envelope-from: <CALLER@???>
Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for userx@???;
@@ -27,7 +29,8 @@ Envelope-from: <CALLER@???>
Envelope-to: <userx@???>
<usery@???>
<userz@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaZ-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0578 b/test/rejectlog/0578
index f6efe3b..1826e9c 100644
--- a/test/rejectlog/0578
+++ b/test/rejectlog/0578
@@ -1,16 +1,16 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
diff --git a/test/rejectlog/0585 b/test/rejectlog/0585
index ef368af..5adcf37 100644
--- a/test/rejectlog/0585
+++ b/test/rejectlog/0585
@@ -1,7 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
Envelope-from: <CALLER@???>
Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for userx@???;
@@ -13,7 +14,8 @@ F From: CALLER_NAME <CALLER@???>
1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
Envelope-from: <CALLER@???>
Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for userx@???;
@@ -27,7 +29,8 @@ Envelope-from: <CALLER@???>
Envelope-to: <userx@???>
<usery@???>
<userz@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaZ-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/1103 b/test/rejectlog/1103
index da1a81f..b4a6bcc 100644
--- a/test/rejectlog/1103
+++ b/test/rejectlog/1103
@@ -1,3 +1,3 @@
******** SERVER ********
-1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 H=(test) [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
diff --git a/test/rejectlog/1105 b/test/rejectlog/1105
index f6ad104..de6f3c9 100644
--- a/test/rejectlog/1105
+++ b/test/rejectlog/1105
@@ -1,3 +1,3 @@
******** SERVER ********
-1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: encryption required
+1999-03-02 09:44:33 H=(test) [127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: encryption required
diff --git a/test/rejectlog/2014 b/test/rejectlog/2014
index 62fa8d8..e57d3e9 100644
--- a/test/rejectlog/2014
+++ b/test/rejectlog/2014
@@ -1,5 +1,5 @@
******** SERVER ********
1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=CN=revoked1.example.com
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=CN=revoked1.example.com
diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index 36ff193..76545a3 100644
--- a/test/rejectlog/2037
+++ b/test/rejectlog/2037
@@ -11,7 +11,8 @@ P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
id 10HmaX-0005vi-00
for data_defer@???;
Tue, 2 Mar 1999 09:44:33 +0000
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for data_defer@???;
diff --git a/test/rejectlog/2114 b/test/rejectlog/2114
index 40fe9ac..0180dd4 100644
--- a/test/rejectlog/2114
+++ b/test/rejectlog/2114
@@ -1,5 +1,5 @@
******** SERVER ********
1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=/CN=server1.example.net
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=revoked1.example.com" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=/CN=revoked1.example.com
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=/CN=server1.example.net
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=revoked1.example.com" F=<userx@???> rejected RCPT <userx@???>: certificate not verified: peerdn=/CN=revoked1.example.com
diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index 36ff193..76545a3 100644
--- a/test/rejectlog/2137
+++ b/test/rejectlog/2137
@@ -11,7 +11,8 @@ P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
id 10HmaX-0005vi-00
for data_defer@???;
Tue, 2 Mar 1999 09:44:33 +0000
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for data_defer@???;
diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
index d3b4984..cc289e0 100644
--- a/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@ -1051,6 +1051,7 @@ exim -d -bh V4NET.0.0.2
****
# Test $reply_address
exim -bh V4NET.0.0.0
+helo test
mail from:<>
rcpt to:<some@body>
data
@@ -1081,6 +1082,7 @@ quit
****
# Check RFC 2047 decoding with (default) length check
exim -bh V4NET.0.0.0
+helo test
mail from:<>
rcpt to:<some@body>
data
@@ -1090,6 +1092,7 @@ quit
****
# Check RFC 2047 decoding with length check disabled
exim -DLENCHECK=check_rfc2047_length=false -bh V4NET.0.0.0
+helo test
mail from:<>
rcpt to:<some@body>
data
diff --git a/test/scripts/0000-Basic/0003 b/test/scripts/0000-Basic/0003
index b3b3f89..97ec254 100644
--- a/test/scripts/0000-Basic/0003
+++ b/test/scripts/0000-Basic/0003
@@ -1,5 +1,6 @@
# Caseless address blocking
exim -bh 1.1.1.1
+helo test
mail from:<a@???>
rcpt to:<x@???>
rset
diff --git a/test/scripts/0000-Basic/0004 b/test/scripts/0000-Basic/0004
index 2732d00..fe1029c 100644
--- a/test/scripts/0000-Basic/0004
+++ b/test/scripts/0000-Basic/0004
@@ -1,5 +1,6 @@
# Caseful address blocking
exim -bh 1.1.1.1
+helo test
mail from:<a@???>
rcpt to:<x@???>
rset
diff --git a/test/scripts/0000-Basic/0005 b/test/scripts/0000-Basic/0005
index 8e7b0d8..ea8a9f2 100644
--- a/test/scripts/0000-Basic/0005
+++ b/test/scripts/0000-Basic/0005
@@ -1,5 +1,6 @@
# -bs to simple local delivery
exim -bs -odi
+helo test
mail from:someone@???
rcpt to:CALLER@HOSTNAME
data
@@ -10,6 +11,7 @@ This is the last line.
quit
****
exim -bs -odi
+helo test
mail from:someone@???
rcpt to:CALLER@HOSTNAME
data
@@ -20,6 +22,7 @@ This is a second test message.
quit
****
exim_exim -bs -odq
+helo test
mail from:someone@???
rcpt to:CALLER@HOSTNAME
data
diff --git a/test/scripts/0000-Basic/0014 b/test/scripts/0000-Basic/0014
index a3c939a..84fe7a3 100644
--- a/test/scripts/0000-Basic/0014
+++ b/test/scripts/0000-Basic/0014
@@ -29,6 +29,7 @@ To: userx, jules@???,
Reply-to: jules@???
****
exim -odi -bs -oMa 10.0.0.2
+helo test
mail from:<jules@???>
rcpt to:<userx@???>
quit
diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021
index 6e4b847..2980133 100644
--- a/test/scripts/0000-Basic/0021
+++ b/test/scripts/0000-Basic/0021
@@ -26,7 +26,7 @@ exim -bs -oMa 10.9.8.7
****
exim -DLOG_SELECTOR=-connection_reject -bs -oMa 10.9.8.7
****
-exim -d-all+acl+lists -bs -oMa 10.9.8.8
+exim -d-all+acl+lists -DHVH=hosts_require_helo=: -bs -oMa 10.9.8.8
mail from:<bad@test1>
mail from:<ok@test1>
rcpt to:<x@y>
@@ -42,7 +42,7 @@ exim -bs -oMa 10.9.8.10
helo x.y.z
quit
****
-exim -d-all+acl+lists -odi -bs -oMa 10.9.8.8
+exim -d-all+acl+lists -DHVH=hosts_require_helo=: -odi -bs -oMa 10.9.8.8
mail from:<ok@test3>
rcpt to:<x@y>
data
@@ -63,7 +63,7 @@ exim -DBR=no_bounce_return_body -odi -f userx@test1 userx
Test message 1.
.
****
-exim -odi -bs -oMa 10.9.8.8
+exim -DHVH=hosts_require_helo=: -odi -bs -oMa 10.9.8.8
ehlo test.ex
mail from: <ok@test3> SIZE=1234
rcpt to:<x@y>
@@ -73,7 +73,7 @@ Some message
quit
****
#
-# Test returncode and logginf for no extractable recipients
+# Test returncode and logging for no extractable recipients
1
exim -odi -t
From: userx@test1
diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022
index dd11aa2..9c78373 100644
--- a/test/scripts/0000-Basic/0022
+++ b/test/scripts/0000-Basic/0022
@@ -1,5 +1,6 @@
# Extra ACLs: freeze/defer/drop/queue/delay/$host_data
exim -d -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<warn_empty@???>
data
@@ -9,6 +10,7 @@ Testing
quit
****
exim -d -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<warn_log@???>
data
@@ -18,6 +20,7 @@ Testing
quit
****
exim -d -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<warn_user@???>
data
@@ -27,6 +30,7 @@ Testing
quit
****
exim -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<defer@y>
rcpt to:<accept@y>
@@ -35,17 +39,20 @@ rcpt to:<rhubarb@y>
quit
****
exim -bh V4NET.9.8.7
+helo test
mail from:<>
rcpt to:<defer_senders@y>
quit
****
exim -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<delay_accept@y>
rcpt to:<delay_warn@y>
quit
****
exim -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<host_check@y>
rcpt to:<host_check@y>
@@ -54,6 +61,7 @@ rcpt to:<host_check2@y>
quit
****
exim -bs -N -odi
+helo test
mail from:<x@y>
rcpt to:<accept@y>
rcpt to:<freeze@y>
@@ -83,12 +91,14 @@ Testing 4
quit
****
exim -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<nested_drop@y>
rcpt to:<rhubarb@y>
quit
****
exim -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<nested_drop_require@y>
rcpt to:<rhubarb@y>
@@ -100,6 +110,8 @@ exim -DSERVER=server -odq -bd -oX PORT_D
****
client -t5 127.0.0.1 PORT_D
??? 220
+helo test
+??? 250
mail from:<x@y>
??? 250
rcpt to:<accept@y>
diff --git a/test/scripts/0000-Basic/0023 b/test/scripts/0000-Basic/0023
index 40a5bd9..109037f 100644
--- a/test/scripts/0000-Basic/0023
+++ b/test/scripts/0000-Basic/0023
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bh 1.2.3.4
+helo test
mail from:<x@y>
rcpt to:<postmaster@???>
rcpt to:<z@z>
@@ -15,6 +16,7 @@ rcpt to:<x@wontpass>
quit
****
exim -bh 5.6.7.8
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<x@???>
@@ -23,24 +25,28 @@ rcpt to:<spqr@???>
quit
****
exim -bh 9.9.9.9
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<a@b>
quit
****
exim -bh 9.9.9.8
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<a@b>
quit
****
exim -bh 9.9.9.255
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<a@b>
quit
****
exim -bh 5.6.8.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<y@x>
@@ -61,6 +67,7 @@ rset
quit
****
exim -bh 5.6.11.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<x2@y>
@@ -68,23 +75,27 @@ rcpt to:<y2@y>
quit
****
exim -bh 5.6.12.1
+helo test
mail from:<x@y>
rcpt to:<x@ok>
rcpt to:<x@y>
quit
****
exim -bh 5.6.12.2
+helo test
mail from:<x@y>
rcpt to:<x@ok>
rcpt to:<x@y>
quit
****
exim -bh 8.8.8.8
+helo test
mail from:<x@y>
rcpt to:<x@y>
quit
****
exim -bh 5.6.13.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<x1@y>
@@ -92,30 +103,35 @@ rcpt to:<x2@y>
quit
****
exim -bh V4NET.11.12.13
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<x1@y>
quit
****
exim -bh V4NET.11.12.12
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<x1@y>
quit
****
exim -bh 20.20.20.20
+helo test
mail from:<x@y>
rcpt to:<x1@y>
rcpt to:<x2@y>
quit
****
exim -bh 20.20.20.20
+helo test
mail from:<userx@y>
rcpt to:<x1@y>
rcpt to:<userx@y>
quit
****
exim -bh 21.21.21.21
+helo test
mail from:<userx@y>
rcpt to:<x1@y>
rcpt to:<userx@y>
@@ -130,12 +146,14 @@ rcpt to:<x@y>
quit
****
exim -bh 22.22.22.22
+helo test
mail from:<userx@y>
rcpt to:<userx@y>
rcpt to:<x@y>
quit
****
exim -bh 23.23.23.0
+helo test
mail from:<x@y>
rcpt to:<userx@y>
rset
@@ -144,21 +162,25 @@ rcpt to:<userx@y>
quit
****
exim -bh 23.23.23.1
+helo test
mail from:<x@y>
rcpt to:<userx@y>
quit
****
exim -bh 24.24.24.24
+helo test
mail from:<x@y>
rcpt to:<userx@y>
quit
****
exim -bh 25.25.25.25
+helo test
mail from:<x@y>
rcpt to:<x@y>
quit
****
exim -bh 26.26.26.26
+helo test
mail from:<>
rcpt to:<x@y>
rcpt to:<y@y>
@@ -166,11 +188,13 @@ rcpt to:<z@y>
quit
****
exim -bh 27.27.27.27
+helo test
mail from:<>
rcpt to:<x@y>
quit
****
exim -bh 28.28.28.28
+helo test
mail from:<>
rcpt to:<x@y>
rset
@@ -182,27 +206,32 @@ rcpt to:<x@y>
quit
****
exim -bh V4NET.0.0.3
+helo test
mail from:<>
rcpt to:<x@y>
quit
****
exim -bh V4NET.0.0.97
+helo test
mail from:<>
rcpt to:<x@y>
quit
****
# This resolves to a name which will give `try again' when looked up
exim -bh V4NET.99.99.96
+helo test
mail from:<>
rcpt to:<x@y>
quit
****
exim -bh V4NET.99.99.96
+helo test
mail from:<>
rcpt to:<defer_ok@y>
quit
****
exim -bh 29.29.29.29
+helo test
mail from:<a@localhost>
rcpt to:<x@y>
rset
@@ -211,6 +240,7 @@ rcpt to:<x@y>
quit
****
exim -bh 30.30.30.30
+helo test
mail from:<a@ten-1>
rcpt to:<x@y>
rset
@@ -222,11 +252,13 @@ rcpt to:<x@y>
quit
****
exim -bh 31.31.31.31
+helo test
mail from:<x@y>
rcpt to:<x@y>
quit
****
exim -odi -bs -oMa 32.32.32.32
+helo test
mail from:<userx@???>
rcpt to:<userx-vs@???>
data
@@ -235,6 +267,7 @@ Test with verify sender.
quit
****
exim -odi -bs -oMa 32.32.32.32
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -243,6 +276,7 @@ Test without verify sender.
quit
****
exim -bh 33.33.33.33
+helo test
mail from:<x@y>
rcpt to:<x1@y>
rcpt to:<x2@y>
@@ -250,11 +284,13 @@ quit
****
# The 1 causes a 1-second delay in the test.again.dns lookup
exim -bh 44.44.44.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
quit
****
exim -odi -bs -oMa 55.55.55.55
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -263,6 +299,7 @@ ACL header adding test.
quit
****
exim -odi -bs -oMa 56.56.56.56
+helo test
mail from:<userx@???>
rcpt to:<cond-yes@???>
data
@@ -306,6 +343,7 @@ data
quit
****
exim -odi -bs -oMa 56.56.57.57
+helo test
mail from:<userx@???>
rcpt to:<cond-yes@???>
data
@@ -320,6 +358,7 @@ data
quit
****
exim -DLOG_SELECTOR=log_selector=-acl_warn_skipped -odi -bs -oMa 56.56.56.56
+helo test
mail from:<userx@???>
rcpt to:<cond-rhubarb@???>
data
@@ -327,6 +366,7 @@ data
quit
****
exim -odi -bs -oMa 56.56.58.58
+helo test
mail from:<rcpttest@???>
rcpt to:<ok1@???>
rcpt to:<bad1@???>
@@ -339,17 +379,20 @@ data
quit
****
exim -odi -bs -oMa 56.56.59.59
+helo test
mail from:<rcpttest@???>
rcpt to:<fail@???>
quit
****
exim -odi -bs -oMa V4NET.11.12.13
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<x1@y>
quit
****
exim -bh 60.60.60.60
+helo test
mail from:<x@y>
rcpt to:<x@y>
rcpt to:<a@b>
diff --git a/test/scripts/0000-Basic/0024 b/test/scripts/0000-Basic/0024
index e0cdc55..862c6e3 100644
--- a/test/scripts/0000-Basic/0024
+++ b/test/scripts/0000-Basic/0024
@@ -8,6 +8,7 @@
# deny x@??? (good address, but sender verify failed)
#
exim -odi -oMa V4NET.0.0.0 -bs
+helo test
mail from:<x@y>
rcpt to:<postmaster@???>
rcpt to:<userx@???>
@@ -27,6 +28,7 @@ quit
# deny x@??? (good address, but not relay domain or host)
# accept EAI local part
exim -odi -oMa V4NET.0.0.0 -bs
+helo test
mail from:<userx@???>
rcpt to:<postmaster@???>
rcpt to:<userx@???>
@@ -45,6 +47,7 @@ quit
# accept x@??? (good relay address)
# accept x@??? (good non-relay address, relay host)
exim -odi -oMa V4NET.255.255.0 -bs
+helo test
mail from:<userx@???>
rcpt to:<bad@???>
rcpt to:<x@y>
@@ -59,6 +62,7 @@ quit
# accept postmaster@??? (postmaster at local domain)
# deny anything else
exim -odi -oMa V4NET.11.12.13 -bs
+helo test
mail from:<userx@???>
rcpt to:<postmaster@???>
rcpt to:<userx@???>
@@ -72,6 +76,7 @@ quit
# accept postmaster@??? (postmaster at local domain)
# deny anything else
exim -odi -oMa V4NET.11.12.16 -bs
+helo test
mail from:<userx@???>
rcpt to:<postmaster@???>
rcpt to:<userx@???>
@@ -84,6 +89,7 @@ quit
# Local SMTP - should accept everything
#
exim -odi -bs
+helo test
mail from:<x@y>
rcpt to:<postmaster@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0025 b/test/scripts/0000-Basic/0025
index 8d5e005..3ed7cf6 100644
--- a/test/scripts/0000-Basic/0025
+++ b/test/scripts/0000-Basic/0025
@@ -1,5 +1,6 @@
# ACL with -bs
exim -odi -bs
+helo test
mail from:<x@y>
rcpt to:<userx@???>
rcpt to:<x@y>
diff --git a/test/scripts/0000-Basic/0026 b/test/scripts/0000-Basic/0026
index 9d30d2d..cb1a308 100644
--- a/test/scripts/0000-Basic/0026
+++ b/test/scripts/0000-Basic/0026
@@ -2,6 +2,7 @@
#
# Syntax OK, non-null sender => should be accepted
exim -odq -bs
+helo test
mail from:<x@y>
rcpt to:<x@y>
data
@@ -11,6 +12,7 @@ quit
****
# Syntax error in header => should fail
exim -odq -bs
+helo test
mail from:<x@y>
rcpt to:<x@y>
data
@@ -22,6 +24,7 @@ quit
****
# Syntax error (version 2) in header => should fail
exim -odq -bs
+helo test
mail from:<x@y>
rcpt to:<x@y>
data
@@ -35,6 +38,7 @@ quit
****
# Syntax error in header => should fail even with null sender
exim -odq -bs
+helo test
mail from:<>
rcpt to:<x@y>
data
@@ -46,6 +50,7 @@ quit
****
# Null sender, invalid sender in header => fail
exim -odq -bs
+helo test
mail from:<>
rcpt to:<x@y>
data
@@ -57,6 +62,7 @@ quit
****
# Null sender, valid sender in header => accept
exim -odq -bs
+helo test
mail from:<>
rcpt to:<x@y>
data
@@ -69,6 +75,7 @@ quit
****
# Syntax OK, non-null sender, but bad data => reject
exim -odq -bs
+helo test
mail from:<x@y>
rcpt to:<x@y>
data
@@ -78,6 +85,7 @@ quit
****
# Syntax OK, non-null sender, good data
exim -odi -bs
+helo test
mail from:<x@y>
rcpt to:<userx@???>
data
@@ -87,6 +95,7 @@ quit
****
# -bh test: Syntax error in header => should fail
exim -bh 10.0.0.0
+helo test
mail from:<x@y>
rcpt to:<x@y>
data
@@ -98,6 +107,7 @@ quit
****
# -bh test: Syntax OK, non-null sender, but bad data => reject
exim -bh 10.0.0.0
+helo test
mail from:<x@y>
rcpt to:<x@y>
data
@@ -107,6 +117,7 @@ quit
****
# Group syntax in reply-to header
exim -odi -bs
+helo test
mail from:<x@y>
rcpt to:<userx@???>
data
@@ -120,6 +131,7 @@ quit
# Group syntax in reply-to header, but no address (falls back to From: for
# header_sender check - From: is valid)
exim -odi -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -134,6 +146,7 @@ quit
# Group syntax in reply-to header, but no address (falls back to From: for
# header_sender check - but there is no From:)
exim -odi -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0027 b/test/scripts/0000-Basic/0027
index 606c109..ca4be73 100644
--- a/test/scripts/0000-Basic/0027
+++ b/test/scripts/0000-Basic/0027
@@ -2,6 +2,7 @@
#
# Invalid sender, should reject both
exim -bs
+helo test
mail from:<x@y>
rcpt to:<userx@???>
rcpt to:<postmaster@???>
@@ -9,6 +10,7 @@ quit
****
# Valid sender, should only reject userx
exim -bs
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<postmaster@???>
@@ -16,6 +18,7 @@ quit
****
# ACL misconfigurations at RCPT time
exim -bs
+helo test
mail from:<>
rcpt to:<"deny verify = header_syntax"@???>
rcpt to:<"deny verify = junk"@???>
@@ -26,6 +29,7 @@ quit
****
# ACL misconfiguration at DATA time
exim -bs
+helo test
mail from:<>
rcpt to:<data@???>
data
@@ -35,6 +39,7 @@ quit
****
# ACL misconfiguration at DATA time
exim -bs
+helo test
mail from:<>
rcpt to:<data@???>
data
@@ -44,6 +49,7 @@ quit
****
# ACL misconfiguration at DATA time
exim -bs
+helo test
mail from:<>
rcpt to:<data@???>
data
diff --git a/test/scripts/0000-Basic/0028 b/test/scripts/0000-Basic/0028
index 4cf458d..d3fb0f7 100644
--- a/test/scripts/0000-Basic/0028
+++ b/test/scripts/0000-Basic/0028
@@ -2,6 +2,7 @@
#
# SIZE unset - should reject at DATA time
exim -bs
+helo test
mail from:<x@y>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0029 b/test/scripts/0000-Basic/0029
index d1f297e..eea2dc7 100644
--- a/test/scripts/0000-Basic/0029
+++ b/test/scripts/0000-Basic/0029
@@ -1,5 +1,6 @@
# ACL with sender=address
exim -bs
+helo test
mail from:<ok@???>
rcpt to:<a@b1>
rset
diff --git a/test/scripts/0000-Basic/0030 b/test/scripts/0000-Basic/0030
index b200e27..f6c3add 100644
--- a/test/scripts/0000-Basic/0030
+++ b/test/scripts/0000-Basic/0030
@@ -1,5 +1,6 @@
# Use of $address_data in ACL
exim -bs
+helo test
mail from:<>
rcpt to:<ok@???>
rcpt to:<notok@???>
diff --git a/test/scripts/0000-Basic/0034 b/test/scripts/0000-Basic/0034
index 1c8c380..879298c 100644
--- a/test/scripts/0000-Basic/0034
+++ b/test/scripts/0000-Basic/0034
@@ -16,6 +16,7 @@ ehlo a.b.c
ehlo a.b.c
****
exim -bs
+helo test
rset
mail from:<x@y>
rcpt to:<x@y>
diff --git a/test/scripts/0000-Basic/0049 b/test/scripts/0000-Basic/0049
index e3146a0..855d936 100644
--- a/test/scripts/0000-Basic/0049
+++ b/test/scripts/0000-Basic/0049
@@ -22,6 +22,7 @@ Sender: Sender in original <sender@???>
This is a test message.
****
exim -bs -odi
+helo test
mail from:userx@???
rcpt to:userx@???
data
@@ -58,6 +59,7 @@ From: From person <from@???>
This is a test message.
****
exim -bs -odi
+helo test
mail from:userx@???
rcpt to:userx@???
data
diff --git a/test/scripts/0000-Basic/0050 b/test/scripts/0000-Basic/0050
index 82e5cad..8f69599 100644
--- a/test/scripts/0000-Basic/0050
+++ b/test/scripts/0000-Basic/0050
@@ -22,6 +22,7 @@ Sender: Sender in original <sender@???>
This is a test message 4.
****
exim -bs -odi
+helo test
mail from:userx@???
rcpt to:userx@???
data
@@ -63,6 +64,7 @@ From: From person <from@???>
This is a test message 10.
****
exim -bs -odi
+helo test
mail from:userx@???
rcpt to:userx@???
data
diff --git a/test/scripts/0000-Basic/0056 b/test/scripts/0000-Basic/0056
index 5e033ce..8635453 100644
--- a/test/scripts/0000-Basic/0056
+++ b/test/scripts/0000-Basic/0056
@@ -1,5 +1,6 @@
# domain list set to *
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0057 b/test/scripts/0000-Basic/0057
index 0c39e13..5e9fc78 100644
--- a/test/scripts/0000-Basic/0057
+++ b/test/scripts/0000-Basic/0057
@@ -1,5 +1,6 @@
# domain list = !* and other ! and percent_hack domains
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0058 b/test/scripts/0000-Basic/0058
index 4b07714..60f2248 100644
--- a/test/scripts/0000-Basic/0058
+++ b/test/scripts/0000-Basic/0058
@@ -1,5 +1,6 @@
# Relay by hostlist *
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0059 b/test/scripts/0000-Basic/0059
index 85c9716..a3c0456 100644
--- a/test/scripts/0000-Basic/0059
+++ b/test/scripts/0000-Basic/0059
@@ -1,5 +1,6 @@
# Relay by hostlist !*
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0060 b/test/scripts/0000-Basic/0060
index 8798104..84b8fc4 100644
--- a/test/scripts/0000-Basic/0060
+++ b/test/scripts/0000-Basic/0060
@@ -1,5 +1,6 @@
# Relay by hostlist match for host name or IP address
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -8,6 +9,7 @@ data
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -16,6 +18,7 @@ data
quit
****
exim -bh V4NET.0.0.5
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -24,6 +27,7 @@ data
quit
****
exim -bh V4NET.0.0.6
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -32,6 +36,7 @@ data
quit
****
exim -bh V4NET.255.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -40,6 +45,7 @@ data
quit
****
exim -bh V4NET.255.0.2
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -48,6 +54,7 @@ data
quit
****
exim -bh V4NET.255.0.3
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -56,6 +63,7 @@ data
quit
****
exim -bh V4NET.255.0.4
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0061 b/test/scripts/0000-Basic/0061
index 5177f8e..90d5864 100644
--- a/test/scripts/0000-Basic/0061
+++ b/test/scripts/0000-Basic/0061
@@ -1,5 +1,6 @@
# Relay by hostlist @
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -8,6 +9,7 @@ data
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0062 b/test/scripts/0000-Basic/0062
index b5802a0..5cff10c 100644
--- a/test/scripts/0000-Basic/0062
+++ b/test/scripts/0000-Basic/0062
@@ -1,5 +1,6 @@
# Relay by hostlist end name match
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -8,6 +9,7 @@ data
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -16,6 +18,7 @@ data
quit
****
exim -bh V4NET.0.0.3
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0063 b/test/scripts/0000-Basic/0063
index 61abb6e..d34dfa3 100644
--- a/test/scripts/0000-Basic/0063
+++ b/test/scripts/0000-Basic/0063
@@ -1,5 +1,6 @@
# Relay by hostlist regex match
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -8,6 +9,7 @@ data
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0064 b/test/scripts/0000-Basic/0064
index a6ff0df..5d027c3 100644
--- a/test/scripts/0000-Basic/0064
+++ b/test/scripts/0000-Basic/0064
@@ -1,5 +1,6 @@
# Relay by hostlist lsearch
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -8,6 +9,7 @@ data
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0065 b/test/scripts/0000-Basic/0065
index d786200..df45d93 100644
--- a/test/scripts/0000-Basic/0065
+++ b/test/scripts/0000-Basic/0065
@@ -1,5 +1,6 @@
# Relay by hostlist matching by network
exim -bh 1.2.3.4
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -8,6 +9,7 @@ data
quit
****
exim -bh 1.2.3.5
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -16,6 +18,7 @@ data
quit
****
exim -bh 1.2.4.5
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -24,6 +27,7 @@ data
quit
****
exim -bh 1.3.2.4
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -32,6 +36,7 @@ data
quit
****
exim -bh 131.111.8.2
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -40,6 +45,7 @@ data
quit
****
exim -bh 192.152.98.3
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -48,6 +54,7 @@ data
quit
****
exim -bh 192.153.98.4
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0066 b/test/scripts/0000-Basic/0066
index cb4492e..09db4f9 100644
--- a/test/scripts/0000-Basic/0066
+++ b/test/scripts/0000-Basic/0066
@@ -1,5 +1,6 @@
# Relay by hostlist matching host or network
exim -bh 1.2.3.4
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -8,6 +9,7 @@ data
quit
****
exim -bh 1.2.3.5
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -16,6 +18,7 @@ data
quit
****
exim -bh 1.2.4.5
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -24,6 +27,7 @@ data
quit
****
exim -bh 1.3.2.4
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -32,6 +36,7 @@ data
quit
****
exim -bh 131.111.8.2
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -40,6 +45,7 @@ data
quit
****
exim -bh 192.152.98.3
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -48,6 +54,7 @@ data
quit
****
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -56,6 +63,7 @@ data
quit
****
exim -bh V4NET.11.12.13
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
@@ -64,6 +72,7 @@ data
quit
****
exim -bh V4NET.0.0.3
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
diff --git a/test/scripts/0000-Basic/0067 b/test/scripts/0000-Basic/0067
index 5212719..0ff4ef8 100644
--- a/test/scripts/0000-Basic/0067
+++ b/test/scripts/0000-Basic/0067
@@ -1,5 +1,6 @@
# sender_reject (various, including @@)
exim -bh 1.2.3.4
+helo test
mail from:<userx@???>
rcpt to:<x@???>
rset
diff --git a/test/scripts/0000-Basic/0068 b/test/scripts/0000-Basic/0068
index dd8cce0..8243dc5 100644
--- a/test/scripts/0000-Basic/0068
+++ b/test/scripts/0000-Basic/0068
@@ -1,5 +1,6 @@
# recipients_max_reject
exim -bh V4NET.10.10.10
+helo test
mail from:<x@y>
rcpt to:<a@b>
rcpt to:<a@b>
diff --git a/test/scripts/0000-Basic/0069 b/test/scripts/0000-Basic/0069
index 9170dfc..729d19f 100644
--- a/test/scripts/0000-Basic/0069
+++ b/test/scripts/0000-Basic/0069
@@ -2,41 +2,49 @@
need_ipv4
#
exim -bh V4NET.0.0.1
+helo test
mail from:<x@y>
rcpt to:<x@???>
quit
****
exim -bh V4NET.0.0.13
+helo test
MAIL FROM:<userx>
rcpt to:<x@???>
quit
****
exim -bh V4NET.0.0.13
+helo test
MAIL FROM:<userx@???>
rcpt to:<y@???>
quit
****
exim -bh V4NET.0.0.13
+helo test
MAIL FROM:<userx@???>
rcpt to:<z@???>
quit
****
exim -bh V4NET.0.0.13 -DLOG_SELECTOR=log_selector=+unknown_in_list
+helo test
MAIL FROM:<userx@???>
rcpt to:<y@???>
quit
****
exim -bh V4NET.0.0.13
+helo test
MAIL FROM:<userx>
rcpt to:<a@???>
quit
****
exim -bh V4NET.0.0.13
+helo test
MAIL FROM:<userx@???>
rcpt to:<b@???>
quit
****
exim -bh V4NET.0.0.13
+helo test
MAIL FROM:<userx@???>
rcpt to:<c@???>
quit
diff --git a/test/scripts/0000-Basic/0077 b/test/scripts/0000-Basic/0077
index 715bd28..493a7ae 100644
--- a/test/scripts/0000-Basic/0077
+++ b/test/scripts/0000-Basic/0077
@@ -1,15 +1,18 @@
# host_reject !@ : !localhost
exim -bh 127.0.0.1
+helo test
mail from:<x@???>
rcpt to:<x@???>
quit
****
exim -bh V4NET.10.10.10
+helo test
mail from:<x@???>
rcpt to:<x@???>
quit
****
exim -bh V4NET.0.0.1
+helo test
mail from:<x@???>
rcpt to:<x@???>
quit
diff --git a/test/scripts/0000-Basic/0079 b/test/scripts/0000-Basic/0079
index 0875ed0..3ade8af 100644
--- a/test/scripts/0000-Basic/0079
+++ b/test/scripts/0000-Basic/0079
@@ -29,6 +29,7 @@ test message data
quit
****
exim -odi -bs
+helo test
mail from:<postmaster@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0086 b/test/scripts/0000-Basic/0086
index 0a7582e..639b24d 100644
--- a/test/scripts/0000-Basic/0086
+++ b/test/scripts/0000-Basic/0086
@@ -1,5 +1,6 @@
# verify = header_syntax
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -12,6 +13,7 @@ Subject: testing
QUIT
****
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -26,6 +28,7 @@ Subject: testing
QUIT
****
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -40,6 +43,7 @@ Subject: testing
QUIT
****
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -94,6 +98,7 @@ Cc: "abcd@??? (missing quote),
QUIT
****
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -106,6 +111,7 @@ Subject: testing
QUIT
****
exim -bh V4NET.10.10.9
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0087 b/test/scripts/0000-Basic/0087
index 8e65e80..d2a0daf 100644
--- a/test/scripts/0000-Basic/0087
+++ b/test/scripts/0000-Basic/0087
@@ -1,5 +1,6 @@
# verify = header_sender & sender
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -12,6 +13,7 @@ Subject: testing
QUIT
****
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -25,6 +27,7 @@ Subject: testing
QUIT
****
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -37,6 +40,7 @@ Subject: testing
QUIT
****
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -49,6 +53,7 @@ Subject: testing
QUIT
****
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0091 b/test/scripts/0000-Basic/0091
index 89025e7..a97cf16 100644
--- a/test/scripts/0000-Basic/0091
+++ b/test/scripts/0000-Basic/0091
@@ -1,5 +1,6 @@
# sender_verify_hosts
exim -bh V4NET.0.0.1
+helo test
mail from:<junk@???>
rcpt to:<root@???>
data
@@ -8,6 +9,7 @@ From: <junk@???>
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<junk@???>
rcpt to:<root@???>
data
@@ -15,6 +17,7 @@ data
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<userx@???>
rcpt to:<root@???>
data
@@ -23,6 +26,7 @@ From: <junk@???>
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<userx@???>
rcpt to:<root@???>
data
diff --git a/test/scripts/0000-Basic/0092 b/test/scripts/0000-Basic/0092
index d22feeb..f7ab4e4 100644
--- a/test/scripts/0000-Basic/0092
+++ b/test/scripts/0000-Basic/0092
@@ -8,6 +8,7 @@
# stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
1
3 exim -bs
+helo test
mail from: userx@???
rcpt to: userx@???
data
@@ -21,6 +22,7 @@ data
# stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
1
3 exim -bh V4NET.0.0.1
+helo test
mail from:userx@???
rcpt to:userx@???
data
@@ -31,6 +33,7 @@ The quick brown fox
# late-expansion of smtp_receive_timeout
1
3 exim -d+expand '-DOPT=${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s' -bh V4NET.0.0.1
+helo test
mail from:userx@???
rcpt to:userx@???
data
@@ -52,6 +55,7 @@ jumps over the lazy dog.
# stdin-smtp, cmds then pause before dataphase, smtp command timeout 2s
1
3 exim -bh V4NET.0.0.1
+helo test
mail from: userx@???
rcpt to: verify@???
****
diff --git a/test/scripts/0000-Basic/0094 b/test/scripts/0000-Basic/0094
index 87fb530..1e9021c 100644
--- a/test/scripts/0000-Basic/0094
+++ b/test/scripts/0000-Basic/0094
@@ -1,16 +1,19 @@
# Reverse lookup failures
munge dnssec
exim -bh V4NET.11.12.13
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
quit
****
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
quit
****
sudo exim -odi -oMa V4NET.11.12.13 -bs
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -19,12 +22,14 @@ This is a test message
quit
****
exim -d -bh V4NET.99.99.90
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rcpt to:<userx@???>
quit
****
sudo exim -odi -oMa 99.99.99.99 -bs
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -33,6 +38,7 @@ This is a test message
quit
****
sudo exim -odi -oMa V4NET.99.99.96 -bs
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0121 b/test/scripts/0000-Basic/0121
index 9daae64..85392b6 100644
--- a/test/scripts/0000-Basic/0121
+++ b/test/scripts/0000-Basic/0121
@@ -1,5 +1,6 @@
# Sender verification SMTP (envelope and header)
exim -bh 127.0.0.1
+helo test
mail from:<unknown@???>
rcpt to:<userx@???>
rset
diff --git a/test/scripts/0000-Basic/0124 b/test/scripts/0000-Basic/0124
index fccedda..3274b61 100644
--- a/test/scripts/0000-Basic/0124
+++ b/test/scripts/0000-Basic/0124
@@ -1,5 +1,6 @@
# host lookup failure error message
exim -bh V4NET.0.0.97
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
rset
diff --git a/test/scripts/0000-Basic/0127 b/test/scripts/0000-Basic/0127
index 430d425..c87989d 100644
--- a/test/scripts/0000-Basic/0127
+++ b/test/scripts/0000-Basic/0127
@@ -22,6 +22,7 @@ Sender: Sender in original <sender@???>
This is a test message.
****
exim -bs -odi
+helo test
mail from:userx@???
rcpt to:userx@???
data
@@ -58,6 +59,7 @@ From: From person <from@???>
This is a test message.
****
exim -bs -odi
+helo test
mail from:userx@???
rcpt to:userx@???
data
diff --git a/test/scripts/0000-Basic/0130 b/test/scripts/0000-Basic/0130
index 11f0fb7..13eb7c2 100644
--- a/test/scripts/0000-Basic/0130
+++ b/test/scripts/0000-Basic/0130
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bh V4NET.0.0.0
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
quit
diff --git a/test/scripts/0000-Basic/0136 b/test/scripts/0000-Basic/0136
index 61afd6d..ebe4ded 100644
--- a/test/scripts/0000-Basic/0136
+++ b/test/scripts/0000-Basic/0136
@@ -1,5 +1,6 @@
# errors_to in user filters and bounce_return_body
exim -odi -bs
+helo test
mail from:<abcd@???>
rcpt to:<forwarder@???>
rcpt to:<forwarder2@???>
@@ -9,6 +10,7 @@ Test message.
quit
****
exim -DBRB=false -odi -bs
+helo test
mail from:<abcd@???>
rcpt to:<forwarder@???>
rcpt to:<forwarder2@???>
diff --git a/test/scripts/0000-Basic/0145 b/test/scripts/0000-Basic/0145
index 44a37c3..1c624ab 100644
--- a/test/scripts/0000-Basic/0145
+++ b/test/scripts/0000-Basic/0145
@@ -3,11 +3,13 @@
exim -bt x@???
****
exim -bh V4NET.9.8.7
+helo test
mail from:<x@???>
rcpt to:<x@y>
quit
****
exim -bh V4NET.9.8.7
+helo test
mail from:<x@???>
rcpt to:<x@???>
quit
diff --git a/test/scripts/0000-Basic/0157 b/test/scripts/0000-Basic/0157
index 03d3978..291cb44 100644
--- a/test/scripts/0000-Basic/0157
+++ b/test/scripts/0000-Basic/0157
@@ -1,5 +1,6 @@
# relay by sender and host
exim -bh V4NET.0.0.1
+helo test
mail from:<x@???>
rcpt to:<a@???>
rset
@@ -8,6 +9,7 @@ rcpt to:<a@???>
quit
****
exim -bh V4NET.0.0.2
+helo test
mail from:<x@???>
rcpt to:<a@???>
rset
@@ -16,6 +18,7 @@ rcpt to:<a@???>
quit
****
exim -bh V4NET.0.0.3
+helo test
mail from:<x@???>
rcpt to:<a@???>
rset
diff --git a/test/scripts/0000-Basic/0162 b/test/scripts/0000-Basic/0162
index 6b24b20..f9f169c 100644
--- a/test/scripts/0000-Basic/0162
+++ b/test/scripts/0000-Basic/0162
@@ -1,5 +1,6 @@
# failing header with very long apparent address
exim -odq -bs
+helo test
mail from:<u2@???>
rcpt to:<u3@???>
data
diff --git a/test/scripts/0000-Basic/0175 b/test/scripts/0000-Basic/0175
index ef40985..a1ffcc6 100644
--- a/test/scripts/0000-Basic/0175
+++ b/test/scripts/0000-Basic/0175
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bh V4NET.0.0.0
+helo test
mail from:<user@???>
rcpt to:<userx@???>
data
@@ -9,6 +10,7 @@ data
quit
****
exim -bh V4NET.0.0.0
+helo test
mail from:<user@???>
rcpt to:<userx@???>
data
@@ -16,6 +18,7 @@ data
quit
****
exim -bh V4NET.0.0.0
+helo test
mail from:<user@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0197 b/test/scripts/0000-Basic/0197
index dc6bb52..717b5da 100644
--- a/test/scripts/0000-Basic/0197
+++ b/test/scripts/0000-Basic/0197
@@ -6,6 +6,7 @@ Test one.
.
****
exim -odi -bs
+helo test
mail from:<doesn't@matter>
rcpt to:<x@???>
rcpt to:<y@???>
diff --git a/test/scripts/0000-Basic/0202 b/test/scripts/0000-Basic/0202
index 0bba061..04d3f20 100644
--- a/test/scripts/0000-Basic/0202
+++ b/test/scripts/0000-Basic/0202
@@ -1,5 +1,6 @@
# .. in header lines (SMTP and otherwise)
exim -bs
+HELO test
MAIL FROM:<userx@???>
RCPT TO:<userx@???>
DATA
@@ -11,6 +12,7 @@ This line follows ..
quit
****
exim -bs
+HELO test
MAIL FROM:<userx@???>
RCPT TO:<userx@???>
DATA
diff --git a/test/scripts/0000-Basic/0212 b/test/scripts/0000-Basic/0212
index 29a8d25..b21177a 100644
--- a/test/scripts/0000-Basic/0212
+++ b/test/scripts/0000-Basic/0212
@@ -14,6 +14,7 @@ file
"smartuser.b@???
****
exim -bs -oMa V4NET.0.0.0
+helo test
mail from:<userx@???>
rcpt to:<a@???>
rcpt to:<b@???>
diff --git a/test/scripts/0000-Basic/0214 b/test/scripts/0000-Basic/0214
index 7a58a62..fb28278 100644
--- a/test/scripts/0000-Basic/0214
+++ b/test/scripts/0000-Basic/0214
@@ -5,6 +5,8 @@ exim -DSERVER=server -bd -oX PORT_D
****
client 127.0.0.1 PORT_D
??? 220
+helo test
+??? 250
mail from:<x@???>
??? 250
rcpt to:<x@???>
diff --git a/test/scripts/0000-Basic/0220 b/test/scripts/0000-Basic/0220
index 2ac40c9..b1e8191 100644
--- a/test/scripts/0000-Basic/0220
+++ b/test/scripts/0000-Basic/0220
@@ -5,6 +5,7 @@ exim -odi userx
From foo@bar Fri Jan 5 12:35 GMT 1996
****
exim -odi -bs
+HELO test
MAIL FROM:<foo@bar>
RCPT TO:<userx@???>
DATA
diff --git a/test/scripts/0000-Basic/0221 b/test/scripts/0000-Basic/0221
index d08fc4a..2d4c519 100644
--- a/test/scripts/0000-Basic/0221
+++ b/test/scripts/0000-Basic/0221
@@ -5,6 +5,7 @@ exim -odi userx
From foo@bar Fri Jan 5 12:35 GMT 1996
****
exim -odi -bs
+HELO test
MAIL FROM:<foo@bar>
RCPT TO:<userx@???>
DATA
diff --git a/test/scripts/0000-Basic/0227 b/test/scripts/0000-Basic/0227
index ac7bcb0..e7b6d1e 100644
--- a/test/scripts/0000-Basic/0227
+++ b/test/scripts/0000-Basic/0227
@@ -14,12 +14,14 @@ QUIT
****
# sender
sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
****
# sender, no callout
sudo exim -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<unchecked@localhost>
RCPT TO:<z@???>
QUIT
@@ -37,6 +39,7 @@ QUIT
****
# sender, refused
sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<bad@localhost>
RCPT TO:<z@???>
QUIT
@@ -54,6 +57,7 @@ QUIT
****
# sender, tmperr
sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
QUIT
@@ -69,6 +73,7 @@ QUIT
****
# sender, err on mailfrom
sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<uncheckable2@localhost1>
RCPT TO:<z@???>
QUIT
@@ -85,6 +90,7 @@ QUIT
****
# sender, multiline err on mailfrom
sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
QUIT
@@ -100,6 +106,7 @@ QUIT
****
# sender, err on mailfrom, with bad char
sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<uncheckable2@localhost1>
RCPT TO:<z@???>
QUIT
@@ -117,6 +124,7 @@ QUIT
****
# recipient, refused
sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
QUIT
@@ -135,6 +143,7 @@ QUIT
****
# recipient, refused
sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
QUIT
@@ -152,12 +161,14 @@ QUIT
****
# recipient, refused, badchar in resp
sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
QUIT
****
# recipient, no conneect
sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
QUIT
@@ -174,6 +185,7 @@ QUIT
250 OK
****
sudo exim -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
DATA
@@ -193,6 +205,7 @@ QUIT
250 OK
****
sudo exim -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
DATA
@@ -218,6 +231,7 @@ QUIT
250 OK
****
sudo exim -v -bs -oMa V4NET.0.0.5
+HELO test
MAIL FROM:<ok@localhost1>
RCPT TO:<z@???>
QUIT
@@ -240,6 +254,7 @@ QUIT
250 OK
****
sudo exim -v -bs -oMa V4NET.0.0.5
+HELO test
MAIL FROM:<ok@localhost1>
RCPT TO:<z@???>
QUIT
@@ -348,6 +363,7 @@ QUIT
250 OK
****
sudo exim -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<uncheckable@localhost1>
RCPT TO:<z@???>
QUIT
@@ -355,11 +371,13 @@ QUIT
server PORT_S
****
sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<bad@localhost1>
RCPT TO:<z@???>
QUIT
****
sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<bad@localhost1>
RCPT TO:<z@???>
QUIT
diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230
index 92ef10c..11df586 100644
--- a/test/scripts/0000-Basic/0230
+++ b/test/scripts/0000-Basic/0230
@@ -5,6 +5,8 @@ exim -DSERVER=server -bd -oX PORT_D
****
client HOSTIPV4 PORT_D
??? 220
+helo test
+??? 250
mail from:<x@???>
??? 250
rcpt to:<x@???>
@@ -19,6 +21,8 @@ quit
****
client 127.0.0.1 PORT_D
??? 220
+helo test
+??? 250
mail from:<x@???>
??? 250
rcpt to:<x@???>
@@ -48,6 +52,7 @@ quit
****
killdaemon
sudo exim -bs -oMa V4NET.9.8.7.1234
+helo test
mail from:<x@???>
rcpt to:<x@???>
data
@@ -68,6 +73,7 @@ quit
exim -DSERVER=server -bd -oX PORT_D
****
sudo exim -DOPT -bs -oMa V4NET.9.8.7.1225
+helo test
mail from:<x@???>
rcpt to:<x@???>
data
diff --git a/test/scripts/0000-Basic/0233 b/test/scripts/0000-Basic/0233
index 1372681..bda2e68 100644
--- a/test/scripts/0000-Basic/0233
+++ b/test/scripts/0000-Basic/0233
@@ -5,6 +5,7 @@ Rhubarb
****
# ACL freezes these two, tell for the second, and third, not for the first
exim -odi -bs
+helo test
mail from:<a@???>
rcpt to:<userz@???>
data
diff --git a/test/scripts/0000-Basic/0234 b/test/scripts/0000-Basic/0234
index 41eaafa..0184213 100644
--- a/test/scripts/0000-Basic/0234
+++ b/test/scripts/0000-Basic/0234
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bh V4NET.0.0.0
+helo test
mail from:<a@b>
rcpt to:<c@d>
rcpt to:<e@???>
@@ -9,6 +10,7 @@ rcpt to:<f@???>
quit
****
sudo exim -bs -oMa V4NET.0.0.0
+helo test
mail from:<a@b>
rcpt to:<c@d>
rcpt to:<e@???>
diff --git a/test/scripts/0000-Basic/0251 b/test/scripts/0000-Basic/0251
index 4571543..dad25e3 100644
--- a/test/scripts/0000-Basic/0251
+++ b/test/scripts/0000-Basic/0251
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bh V4NET.0.0.0
+helo test
mail from:<ok@sender>
rcpt to:<oklist@???>
rset
@@ -13,6 +14,8 @@ exim -DSERVER=server -bd -oX PORT_D
****
client HOSTIPV4 PORT_D
??? 220
+helo test
+??? 250
mail from:<ok@sender>
??? 250
rcpt to:<oklist@???>
diff --git a/test/scripts/0000-Basic/0256 b/test/scripts/0000-Basic/0256
index bdab73b..b29dabf 100644
--- a/test/scripts/0000-Basic/0256
+++ b/test/scripts/0000-Basic/0256
@@ -3,6 +3,7 @@ exim -odi unknown
.
****
exim -odi -bs
+helo test
mail from:<"abc@???>
rcpt to:<unknown@???>
data
diff --git a/test/scripts/0000-Basic/0281 b/test/scripts/0000-Basic/0281
index ae56247..f8de7f7 100644
--- a/test/scripts/0000-Basic/0281
+++ b/test/scripts/0000-Basic/0281
@@ -1,5 +1,6 @@
# @ items in domain lists and host lists
exim -bh V4NET.1.1.1
+helo test
mail from:<x@y>
rcpt to:<1@???>
rcpt to:<1@???>
@@ -21,16 +22,19 @@ rcpt to:<5@???>
quit
****
exim -bh V4NET.10.10.10
+helo test
mail from:<x@y>
rcpt to:<5@???>
quit
****
exim -bh 127.0.0.1
+helo test
mail from:<x@y>
rcpt to:<5@???>
quit
****
exim -bh V4NET.1.1.1
+helo test
mail from:<x@y>
rcpt to:<2@???>
rcpt to:<3@???>
diff --git a/test/scripts/0000-Basic/0293 b/test/scripts/0000-Basic/0293
index 1593535..2e50aad 100644
--- a/test/scripts/0000-Basic/0293
+++ b/test/scripts/0000-Basic/0293
@@ -1,17 +1,19 @@
# smtp_accept_{max,queue}_per_connection
exim -odi -v -bs
-mail from:<x@y>
+helo test
+mail from:<x1@y>
rcpt to:<one@z>
data
.
-mail from:<x@y>
+mail from:<x2@y>
rcpt to:<two@z>
data
.
-mail from:<x@y>
+mail from:<x3@y>
quit
****
exim -odi -v -bs
+helo test
mail from:<x@y>
rset
mail from:<x@y>
diff --git a/test/scripts/0000-Basic/0294 b/test/scripts/0000-Basic/0294
index bbb595d..62f8ae2 100644
--- a/test/scripts/0000-Basic/0294
+++ b/test/scripts/0000-Basic/0294
@@ -1,5 +1,6 @@
# SMTP rate limiting using smtp_ratelimit_xxx settings
exim -d-all+receive -odq -bs
+helo test
mail from:<x@y>
rcpt to:<one@z>
rcpt to:<one@z>
@@ -16,18 +17,21 @@ mail from:<x@y>
quit
****
exim -d-all+receive -bh 1.2.3.4
+helo test
mail from:<x@y>
rcpt to:<one@z>
rcpt to:<one@z>
quit
****
exim -d-all+receive -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<one@z>
rcpt to:<one@z>
quit
****
exim -d-all+receive -odq -bs
+helo test
mail from:<x@y>
rcpt to:<reject@z>
rcpt to:<reject@z>
diff --git a/test/scripts/0000-Basic/0304 b/test/scripts/0000-Basic/0304
index 8b1c39d..3de6907 100644
--- a/test/scripts/0000-Basic/0304
+++ b/test/scripts/0000-Basic/0304
@@ -1,5 +1,6 @@
# address lists
exim -bh 1.2.3.4
+helo test
mail from:<>
rcpt to:<b1@x>
rcpt to:<b2@x>
diff --git a/test/scripts/0000-Basic/0305 b/test/scripts/0000-Basic/0305
index e6b7523..191470c 100644
--- a/test/scripts/0000-Basic/0305
+++ b/test/scripts/0000-Basic/0305
@@ -1,5 +1,6 @@
# expansion in domain lists
exim -bh V4NET.2.3.4
+helo test
mail from:<x@y>
rcpt to:<x@???>
rcpt to:<x@???>
diff --git a/test/scripts/0000-Basic/0306 b/test/scripts/0000-Basic/0306
index 8a2dc91..9aeb02b 100644
--- a/test/scripts/0000-Basic/0306
+++ b/test/scripts/0000-Basic/0306
@@ -8,6 +8,7 @@ exim -odi -f anyone@anywhere list1@???
exim -odi -f anyone@anywhere nonlist@???
****
exim -bh 1.2.3.4
+helo test
mail from:<anyone@anywhere>
rcpt to:<list1-request@???>
rset
diff --git a/test/scripts/0000-Basic/0308 b/test/scripts/0000-Basic/0308
index 39b9ba2..4e0a204 100644
--- a/test/scripts/0000-Basic/0308
+++ b/test/scripts/0000-Basic/0308
@@ -1,10 +1,12 @@
# host lists and unknown host names - maximal checking
exim -bh V4NET.0.0.97
+helo test
mail from:<x@y>
rcpt to:<z@z>
quit
****
exim -bh V4NET.0.0.1
+helo test
mail from:<x@y>
rcpt to:<z@z>
quit
diff --git a/test/scripts/0000-Basic/0312 b/test/scripts/0000-Basic/0312
index 19cab2c..757aab2 100644
--- a/test/scripts/0000-Basic/0312
+++ b/test/scripts/0000-Basic/0312
@@ -1,5 +1,6 @@
# RBL timeout logging
exim -bh V4NET.0.0.1
+helo test
mail from:<userx@x>
rcpt to:<userx@y>
quit
diff --git a/test/scripts/0000-Basic/0320 b/test/scripts/0000-Basic/0320
index c031567..0da9837 100644
--- a/test/scripts/0000-Basic/0320
+++ b/test/scripts/0000-Basic/0320
@@ -1,5 +1,6 @@
# comments and +caseful in local part lists
exim -odq -bs
+helo test
mail from:<x@y>
rcpt to:<lp1@z>
rcpt to:<LP1@z>
diff --git a/test/scripts/0000-Basic/0325 b/test/scripts/0000-Basic/0325
index a81abd6..76577f5 100644
--- a/test/scripts/0000-Basic/0325
+++ b/test/scripts/0000-Basic/0325
@@ -2,6 +2,7 @@
exim -v -bt xxx@???
****
exim -bh V4NET.0.0.0
+helo test
mail from:a@???
rcpt to:xxx@???
quit
diff --git a/test/scripts/0000-Basic/0340 b/test/scripts/0000-Basic/0340
index a4ee6ad..c6e36ce 100644
--- a/test/scripts/0000-Basic/0340
+++ b/test/scripts/0000-Basic/0340
@@ -1,5 +1,6 @@
# dnslist when no host address
exim -bs
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
quit
diff --git a/test/scripts/0000-Basic/0342 b/test/scripts/0000-Basic/0342
index 0b40162..e3332e7 100644
--- a/test/scripts/0000-Basic/0342
+++ b/test/scripts/0000-Basic/0342
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bh 1.2.3.4
+helo test
mail from:<x@y>
rcpt to:<x@ten-1>
quit
diff --git a/test/scripts/0000-Basic/0362 b/test/scripts/0000-Basic/0362
index 60d5155..904e4c9 100644
--- a/test/scripts/0000-Basic/0362
+++ b/test/scripts/0000-Basic/0362
@@ -2,6 +2,7 @@
need_ipv4
#
exim -d -bh V4NET.0.0.0
+helo test
mail from:<x@y>
rcpt to:<x@???>
quit
diff --git a/test/scripts/0000-Basic/0365 b/test/scripts/0000-Basic/0365
index 0697f1e..81cef22 100644
--- a/test/scripts/0000-Basic/0365
+++ b/test/scripts/0000-Basic/0365
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bs
+helo test
mail from:<>
rcpt to:<x@y>
data
@@ -37,6 +38,7 @@ rset
quit
****
exim -DDETAILS=true -DSELECTOR=-rejected_header -bs
+helo test
mail from:<>
rcpt to:<x@y>
data
diff --git a/test/scripts/0000-Basic/0372 b/test/scripts/0000-Basic/0372
index 1bd39c7..4c77759 100644
--- a/test/scripts/0000-Basic/0372
+++ b/test/scripts/0000-Basic/0372
@@ -1,5 +1,6 @@
# Preservation of ACL variables
exim -v -odi -bs -oMa 1.2.3.4 -oMs host.name
+helo test
mail from:<>
rcpt to:<x@y>
data
@@ -11,6 +12,7 @@ data
quit
****
exim -DSTRICT=strict_acl_vars -odi -bs -oMa 4.3.2.1 -oMs host2.name
+helo test
mail from:<>
rcpt to:<a@b>
data
diff --git a/test/scripts/0000-Basic/0376 b/test/scripts/0000-Basic/0376
index 88eec49..d6107e0 100644
--- a/test/scripts/0000-Basic/0376
+++ b/test/scripts/0000-Basic/0376
@@ -13,11 +13,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
@@ -26,6 +28,7 @@ QUIT
sleep 2
# Should want to connect, but fail
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
@@ -43,11 +46,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<bad@localhost>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<bad@localhost>
RCPT TO:<z@???>
QUIT
@@ -63,11 +68,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
@@ -91,11 +98,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost>
RCPT TO:<z@???>
QUIT
@@ -119,11 +128,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost2>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost2>
RCPT TO:<z@???>
QUIT
@@ -141,11 +152,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<ok@otherhost3>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<otherok@otherhost3>
RCPT TO:<z@???>
QUIT
@@ -163,11 +176,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<ok@otherhost4>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<ok@otherhost4>
RCPT TO:<z@???>
QUIT
@@ -197,11 +212,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<ok@otherhost41>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<ok@otherhost41>
RCPT TO:<z@???>
QUIT
@@ -226,6 +243,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost21>
RCPT TO:<z@???>
QUIT
@@ -242,6 +260,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok2@otherhost21>
RCPT TO:<z@???>
QUIT
@@ -265,6 +284,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<ok@otherhost31>
RCPT TO:<z@???>
QUIT
@@ -281,6 +301,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<okok@otherhost31>
RCPT TO:<z@???>
QUIT
@@ -305,6 +326,7 @@ QUIT
250 OK
****
sudo exim -DPEX=1s -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<okokok@otherhost31>
RCPT TO:<z@???>
QUIT
@@ -320,6 +342,7 @@ RCPT TO
*sleep 2
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.5
+HELO test
MAIL FROM:<okok@otherhost51>
RCPT TO:<z@???>
QUIT
@@ -343,6 +366,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.6
+HELO test
MAIL FROM:<okokok@otherhost52>
RCPT TO:<z@???>
QUIT
@@ -360,6 +384,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.7
+HELO test
MAIL FROM:<ok7@otherhost53>
RCPT TO:<z@???>
DATA
@@ -378,6 +403,7 @@ RCPT TO
*sleep 2
****
sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.8
+HELO test
MAIL FROM:<ok7@otherhost53>
RCPT TO:<z@???>
DATA
@@ -406,6 +432,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.9
+HELO test
MAIL FROM:<ok@otherhost9>
RCPT TO:<z@???>
QUIT
@@ -435,6 +462,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.10
+HELO test
MAIL FROM:<ok@otherhost10>
RCPT TO:<z@???>
QUIT
diff --git a/test/scripts/0000-Basic/0381 b/test/scripts/0000-Basic/0381
index 738b066..28dfbcd 100644
--- a/test/scripts/0000-Basic/0381
+++ b/test/scripts/0000-Basic/0381
@@ -1,6 +1,7 @@
# negatives with wildcard hosts when host has multiple names
munge dnssec
exim -d -bs -oMa V4NET.99.99.97
+helo test
mail from:<notgov@???>
rcpt to:<x@???>
quit
diff --git a/test/scripts/0000-Basic/0386 b/test/scripts/0000-Basic/0386
index 7adc4fb..6c34263 100644
--- a/test/scripts/0000-Basic/0386
+++ b/test/scripts/0000-Basic/0386
@@ -1,5 +1,6 @@
# ACLs and multiple messages
exim -d -bh V4NET.9.8.7
+helo test
mail from:<x@y>
rcpt to:<1@b>
rset
@@ -8,6 +9,7 @@ rcpt to:<1@b>
quit
****
exim -d -odi -bs -oMa V4NET.11.12.13 userx
+helo test
mail from:<x@y>
rcpt to:<2@b>
data
diff --git a/test/scripts/0000-Basic/0387 b/test/scripts/0000-Basic/0387
index 155ad02..24cb0ed 100644
--- a/test/scripts/0000-Basic/0387
+++ b/test/scripts/0000-Basic/0387
@@ -1,5 +1,6 @@
# Partial matching and lookup name decoding
exim -bs
+helo test
mail from:<x@???>
rcpt to:<x@y>
rset
@@ -8,16 +9,19 @@ rcpt to:<x@y>
quit
****
exim -bs -oMa 10.9.8.7
+helo test
mail from:<x@???>
rcpt to:<x@y>
quit
****
exim -bs -oMa 192.168.4.5
+helo test
mail from:<x@???>
rcpt to:<x@y>
quit
****
exim -bs -oMa 1.2.3.4
+helo test
mail from:<x@???>
rcpt to:<x@y>
quit
diff --git a/test/scripts/0000-Basic/0389 b/test/scripts/0000-Basic/0389
index d23af20..85855d6 100644
--- a/test/scripts/0000-Basic/0389
+++ b/test/scripts/0000-Basic/0389
@@ -1,5 +1,6 @@
# warn with log_message but no message
exim -bs
+helo test
mail from:x@y
rcpt to:x@y
data
diff --git a/test/scripts/0000-Basic/0391 b/test/scripts/0000-Basic/0391
index bbb0fb5..5d459eb 100644
--- a/test/scripts/0000-Basic/0391
+++ b/test/scripts/0000-Basic/0391
@@ -1,5 +1,6 @@
# Sender verify rewrite and $sender_address
exim -d -bh 1.2.3.4
+helo test
mail from:<U@???>
rcpt to:<B@???>
quit
diff --git a/test/scripts/0000-Basic/0395 b/test/scripts/0000-Basic/0395
index 01afebd..51dc6ba 100644
--- a/test/scripts/0000-Basic/0395
+++ b/test/scripts/0000-Basic/0395
@@ -23,6 +23,7 @@ To: userx
# Same tests for BSMTP
2
exim -odi -bnq -bS
+helo test
mail from: userx
rcpt to: userx
data
@@ -33,6 +34,7 @@ quit
****
2
exim -odi -bnq -bS
+helo test
mail from: userx@???
rcpt to: userx
data
@@ -42,6 +44,7 @@ To: userx
quit
****
exim -odi -bnq -bS
+helo test
mail from: userx@???
rcpt to: userx@???
data
@@ -51,6 +54,7 @@ To: userx
quit
****
exim -odi -bS
+helo test
mail from: userx@???
rcpt to: userx@???
data
@@ -60,6 +64,7 @@ To: userx
quit
****
exim -odi -bnq -bs
+helo test
mail from: userx@???
rcpt to: userx
data
@@ -69,6 +74,7 @@ To: userx
quit
****
exim -odi -bnq -bs
+helo test
mail from: userx@???
rcpt to: userx@???
data
@@ -78,6 +84,7 @@ To: userx
quit
****
exim -odi -bs
+helo test
mail from: userx@???
rcpt to: userx@???
data
diff --git a/test/scripts/0000-Basic/0396 b/test/scripts/0000-Basic/0396
index 356021a..da9afce 100644
--- a/test/scripts/0000-Basic/0396
+++ b/test/scripts/0000-Basic/0396
@@ -1,5 +1,6 @@
# forced failure in named list
exim -d -bs
+helo test
mail from:<x@y>
rcpt to:<x@y>
quit
diff --git a/test/scripts/0000-Basic/0398 b/test/scripts/0000-Basic/0398
index 3465e26..023515d 100644
--- a/test/scripts/0000-Basic/0398
+++ b/test/scripts/0000-Basic/0398
@@ -13,6 +13,7 @@ QUIT
250 OK
****
exim -odi -bs
+helo test
mail from:<x@remote>
rcpt to:<x@local>
data
@@ -32,6 +33,7 @@ QUIT
250 OK
****
exim -odi -bs
+helo test
mail from:<z@remote>
rcpt to:<deny@local>
quit
@@ -48,12 +50,14 @@ QUIT
250 OK
****
exim -d -odi -bs
+helo test
mail from:<qq@remote>
rcpt to:<abc@local>
rcpt to:<xyz@local>
quit
****
exim -odi -bs
+helo test
mail from:<>
rcpt to:<abc@local>
rcpt to:<xyz@local>
diff --git a/test/scripts/0000-Basic/0407 b/test/scripts/0000-Basic/0407
index 0d8e7ca..1fecef5 100644
--- a/test/scripts/0000-Basic/0407
+++ b/test/scripts/0000-Basic/0407
@@ -15,6 +15,7 @@ exim -DHEADER_MAXSIZE=header_maxsize=2M x@y <DIR/test-data
exim -DHEADER_MAXSIZE=header_maxsize=2M -DHEADER_LINE_MAXSIZE=header_line_maxsize=1024 x@y <DIR/test-data
****
exim -DHEADER_LINE_MAXSIZE=header_line_maxsize=20 -bs
+helo test
mail from:<x@y>
rcpt to:<x@y>
data
diff --git a/test/scripts/0000-Basic/0410 b/test/scripts/0000-Basic/0410
index 8d9c240..1b3cf0f 100644
--- a/test/scripts/0000-Basic/0410
+++ b/test/scripts/0000-Basic/0410
@@ -1,5 +1,6 @@
# address_data and router_name in ACLs after verification
exim -bs
+helo test
MAIL FROM:<oksender@y>
rcpt to:<child@???>
rcpt to:<orig@???>
diff --git a/test/scripts/0000-Basic/0413 b/test/scripts/0000-Basic/0413
index eb80580..d72a32b 100644
--- a/test/scripts/0000-Basic/0413
+++ b/test/scripts/0000-Basic/0413
@@ -33,6 +33,7 @@ QUIT
250 OK
****
exim -odi -bs
+helo test
mail from:<r1@domain1>
rset
mail from:<r2@domain2>
diff --git a/test/scripts/0000-Basic/0417 b/test/scripts/0000-Basic/0417
index ac3da7d..70d9b80 100644
--- a/test/scripts/0000-Basic/0417
+++ b/test/scripts/0000-Basic/0417
@@ -2,12 +2,14 @@
need_ipv4
#
exim -bs
+helo test
mail from:<x@???>
rcpt to:<x@y>
rcpt to:<a@b>
quit
****
exim -DRETURN_ERROR_DETAILS=true -bs
+helo test
mail from:<x@???>
rcpt to:<x@y>
rcpt to:<a@b>
diff --git a/test/scripts/0000-Basic/0418 b/test/scripts/0000-Basic/0418
index 147ae55..4a9e260 100644
--- a/test/scripts/0000-Basic/0418
+++ b/test/scripts/0000-Basic/0418
@@ -1,5 +1,6 @@
# Continuations in file ACL
exim -odq -bs
+helo test
mail from:<>
rcpt to:<x@y>
quit
diff --git a/test/scripts/0000-Basic/0425 b/test/scripts/0000-Basic/0425
index 725900a..3969215 100644
--- a/test/scripts/0000-Basic/0425
+++ b/test/scripts/0000-Basic/0425
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bs
+helo test
mail from:<BAD@y>
rcpt to:<OK@x>
rcpt to:<BAD@x>
diff --git a/test/scripts/0000-Basic/0432 b/test/scripts/0000-Basic/0432
index e83626c..c4a2330 100644
--- a/test/scripts/0000-Basic/0432
+++ b/test/scripts/0000-Basic/0432
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bh 1.2.3.4
+helo test
mail from:<x@y>
quit
****
@@ -17,14 +18,17 @@ QUIT
220 OK
****
exim -d -bhc 1.2.3.4
+helo test
mail from:<x@y>
quit
****
exim -d -bhc 1.2.3.4
+helo test
mail from:<x@y>
quit
****
exim -bhc 1.2.3.4
+helo test
mail from:<x@y>
quit
****
@@ -40,6 +44,7 @@ QUIT
220 OK
****
exim -bhc 1.2.3.4
+helo test
mail from:<a@b>
quit
****
@@ -51,6 +56,7 @@ EHLO
*eof
****
exim -bhc 1.2.3.4
+helo test
mail from:<p1@q>
quit
****
diff --git a/test/scripts/0000-Basic/0443 b/test/scripts/0000-Basic/0443
index 8e3b037..bc39dab 100644
--- a/test/scripts/0000-Basic/0443
+++ b/test/scripts/0000-Basic/0443
@@ -1,5 +1,6 @@
# verify callout with no transport
exim -bhc V4NET.0.0.1
+helo test
Mail from: x@???
rcpt to: x@y
quit
diff --git a/test/scripts/0000-Basic/0445 b/test/scripts/0000-Basic/0445
index fd38f85..54bfcc1 100644
--- a/test/scripts/0000-Basic/0445
+++ b/test/scripts/0000-Basic/0445
@@ -1,5 +1,6 @@
# :fail: with looked up empty string
exim -bh 1.2.3.4
+helo test
mail from:<lp1@???>
rcpt to:<zz@???>
rset
diff --git a/test/scripts/0000-Basic/0446 b/test/scripts/0000-Basic/0446
index 00e7ec6..57451cf 100644
--- a/test/scripts/0000-Basic/0446
+++ b/test/scripts/0000-Basic/0446
@@ -4,6 +4,7 @@ Received: the first received: line
Received: the second received: line
****
exim -odi -bs
+helo test
mail from:<>
rcpt to:userx@???
data
diff --git a/test/scripts/0000-Basic/0453 b/test/scripts/0000-Basic/0453
index b07a712..c5445b2 100644
--- a/test/scripts/0000-Basic/0453
+++ b/test/scripts/0000-Basic/0453
@@ -10,6 +10,7 @@ helo
****
1
exim -DERROR_DETAILS=smtp_max_synprot_errors=1 -bs
+helo test
mail from:<>
mail from:<>
mail from:<>
diff --git a/test/scripts/0000-Basic/0459 b/test/scripts/0000-Basic/0459
index 873c5d8..feac5cf 100644
--- a/test/scripts/0000-Basic/0459
+++ b/test/scripts/0000-Basic/0459
@@ -1,5 +1,6 @@
# unwanted search error messages in ACLs
exim -bs
+helo test
mail from:<>
rcpt to:outer@xx
quit
diff --git a/test/scripts/0000-Basic/0462 b/test/scripts/0000-Basic/0462
index da7b714..fa6f386 100644
--- a/test/scripts/0000-Basic/0462
+++ b/test/scripts/0000-Basic/0462
@@ -19,6 +19,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<Ok@localhost>
RCPT TO:<checkpm@???>
RCPT TO:<nocheckpm@???>
@@ -37,6 +38,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<NOTok@elsewhere>
RCPT TO:<nocheckpm@???>
QUIT
@@ -54,6 +56,7 @@ QUIT
250 OK
****
sudo exim -DSELECTOR=-sender_verify_fail -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<NOTok2@elsewhere>
RCPT TO:<nocheckpm@???>
QUIT
diff --git a/test/scripts/0000-Basic/0464 b/test/scripts/0000-Basic/0464
index d2e231c..a81fcf9 100644
--- a/test/scripts/0000-Basic/0464
+++ b/test/scripts/0000-Basic/0464
@@ -2,6 +2,7 @@
need_ipv4
#
exim -d -bs
+helo test
mail from:<>
rcpt to:<abc@domain1>
quit
diff --git a/test/scripts/0000-Basic/0465 b/test/scripts/0000-Basic/0465
index de8b6cb..3b2e54c 100644
--- a/test/scripts/0000-Basic/0465
+++ b/test/scripts/0000-Basic/0465
@@ -1,5 +1,6 @@
# strip_trailing_dot
exim -d -bs
+helo test
mail from:<>
rcpt to:<abc@domain.>
quit
@@ -8,6 +9,7 @@ quit
exim -f abc@somewhere. xxx
****
exim -DOPT=strip_trailing_dot -d -bs
+helo test
mail from:<>
rcpt to:<abc@domain.>
data
@@ -18,6 +20,7 @@ quit
exim -DOPT=strip_trailing_dot -f abc@somewhere. xxx@yyy.
****
exim -d -bs
+helo test
mail from:<>
rcpt to:<abc@xyz>
data
diff --git a/test/scripts/0000-Basic/0468 b/test/scripts/0000-Basic/0468
index 7c07905..c30503c 100644
--- a/test/scripts/0000-Basic/0468
+++ b/test/scripts/0000-Basic/0468
@@ -1,5 +1,6 @@
# $message_body in multiple SMTP messages
exim -bs
+helo test
mail from:<>
rcpt to:<x@y>
data
diff --git a/test/scripts/0000-Basic/0475 b/test/scripts/0000-Basic/0475
index 1571f4e..5008c87 100644
--- a/test/scripts/0000-Basic/0475
+++ b/test/scripts/0000-Basic/0475
@@ -1,5 +1,6 @@
# malformed item in host list
exim -bh V4NET.0.0.0
+helo test
mail from:<>
rcpt to:<a1@b>
rcpt to:<a2@b>
diff --git a/test/scripts/0000-Basic/0483 b/test/scripts/0000-Basic/0483
index 14e42e3..23a8a58 100644
--- a/test/scripts/0000-Basic/0483
+++ b/test/scripts/0000-Basic/0483
@@ -1,5 +1,6 @@
# $sender_data and $recipient_data
exim -bs -d-all+route
+helo test
mail from:<sender@domain1>
rcpt to:<recip@domain2>
rcpt to:<other@domain2>
diff --git a/test/scripts/0000-Basic/0488 b/test/scripts/0000-Basic/0488
index e4b96b7..7baa884 100644
--- a/test/scripts/0000-Basic/0488
+++ b/test/scripts/0000-Basic/0488
@@ -1,5 +1,6 @@
# Multiple headers in one warn message
exim -odq -bs
+HELO test
MAIL FROM:<>
RCPT TO:<userx@???>
DATA
diff --git a/test/scripts/0000-Basic/0490 b/test/scripts/0000-Basic/0490
index 060e270..28c2de0 100644
Binary files a/test/scripts/0000-Basic/0490 and b/test/scripts/0000-Basic/0490 differ
diff --git a/test/scripts/0000-Basic/0496 b/test/scripts/0000-Basic/0496
index ba96dc7..7b38ba6 100644
--- a/test/scripts/0000-Basic/0496
+++ b/test/scripts/0000-Basic/0496
@@ -1,5 +1,6 @@
# acl adding positioned headers
exim -odi -bs
+helo test
Mail From:<some@ne>
rcpt To: <someone@???>
data
diff --git a/test/scripts/0000-Basic/0500 b/test/scripts/0000-Basic/0500
index 75bffe4..6886716 100644
--- a/test/scripts/0000-Basic/0500
+++ b/test/scripts/0000-Basic/0500
@@ -1,11 +1,13 @@
# predata ACL
exim -odi -bs
+helo test
mail from:<x@y>
rcpt to:<userx@y>
data
quit
****
exim -odi -bs
+helo test
mail from:<postmaster@y>
rcpt to:<userx@y>
data
diff --git a/test/scripts/0000-Basic/0501 b/test/scripts/0000-Basic/0501
index c173255..9f9fbdf 100644
--- a/test/scripts/0000-Basic/0501
+++ b/test/scripts/0000-Basic/0501
@@ -1,5 +1,6 @@
# control = case{ful,less}_local_part
exim -odi -bs
+helo test
mail from:<x@y>
rcpt to:<Phil.Hazel@y>
quit
diff --git a/test/scripts/0000-Basic/0502 b/test/scripts/0000-Basic/0502
index c22205c..1c0bc6a 100644
--- a/test/scripts/0000-Basic/0502
+++ b/test/scripts/0000-Basic/0502
@@ -1,5 +1,6 @@
# ACL for QUIT
exim -bs
+helo test
mail from:<x@y>
rcpt to:<a@y>
rcpt to:<b@y>
@@ -20,6 +21,7 @@ exim -bs -DLAST='deny message = Your message here'
quit
****
exim -bs -DLAST=''
+helo test
mail from:<a@b>
quit
****
diff --git a/test/scripts/0000-Basic/0505 b/test/scripts/0000-Basic/0505
index 7059a93..5b73ae4 100644
--- a/test/scripts/0000-Basic/0505
+++ b/test/scripts/0000-Basic/0505
@@ -1,5 +1,6 @@
# check illegally placed ACL control modifiers
exim -DACL=smtp_data -DCONTROL=submission -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -8,6 +9,7 @@ Rhubarb
quit
****
exim -DACL=smtp_predata -DCONTROL=submission -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0507 b/test/scripts/0000-Basic/0507
index ce8d71e..86f8a10 100644
--- a/test/scripts/0000-Basic/0507
+++ b/test/scripts/0000-Basic/0507
@@ -1,5 +1,6 @@
# verify = not_blind
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -8,6 +9,7 @@ To: a@???, himself <userx@???>
quit
****
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -16,6 +18,7 @@ To: a@???, himself <usery@???>, HIMSELF <USERX@???>
quit
****
exim -DERROR_DETAILS=smtp_return_error_details -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -24,6 +27,7 @@ To: a@???, himself <usery@???>
quit
****
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
rcpt to:<usery@???>
@@ -34,6 +38,7 @@ Cc: unqualified, userx@???, x@???
quit
****
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
rcpt to:<usery@???>
@@ -45,6 +50,7 @@ Cc: unqualified, userx@???, x@???
quit
****
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
rcpt to:<usery@???>
diff --git a/test/scripts/0000-Basic/0517 b/test/scripts/0000-Basic/0517
index 44e0c76..629d5ef 100644
--- a/test/scripts/0000-Basic/0517
+++ b/test/scripts/0000-Basic/0517
@@ -1,5 +1,6 @@
# control = suppress_local_fixups
exim -odi -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -7,6 +8,7 @@ data
quit
****
exim -odi -bs
+helo test
mail from:<>
rcpt to:<usery@???>
data
diff --git a/test/scripts/0000-Basic/0518 b/test/scripts/0000-Basic/0518
index 6b09217..6ee234d 100644
--- a/test/scripts/0000-Basic/0518
+++ b/test/scripts/0000-Basic/0518
@@ -83,6 +83,7 @@ QUIT
250 OK
****
exim -odq -bs
+helo test
mail from:<>
RCPT TO:<abc@include>
RCPT TO:<abc@exclude>
diff --git a/test/scripts/0000-Basic/0525 b/test/scripts/0000-Basic/0525
index 3e5a9ac..ad9a358 100644
--- a/test/scripts/0000-Basic/0525
+++ b/test/scripts/0000-Basic/0525
@@ -14,6 +14,7 @@ DATA
*sleep 3
****
write test-data 200000x80
+helo test
mail from:<abc@xyz>
RCPT TO:<def@pqr>
DATA
diff --git a/test/scripts/0000-Basic/0527 b/test/scripts/0000-Basic/0527
index 9c880d6..5c5cf69 100644
--- a/test/scripts/0000-Basic/0527
+++ b/test/scripts/0000-Basic/0527
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bs
+helo test
mail from:<unknown@???>
rcpt to:<unknown@???>
quit
diff --git a/test/scripts/0000-Basic/0530 b/test/scripts/0000-Basic/0530
index 6c57868..093d61e 100644
--- a/test/scripts/0000-Basic/0530
+++ b/test/scripts/0000-Basic/0530
@@ -33,6 +33,7 @@ In-Reply-To: <i1@b>
# an SMTP interface.
#
exim -odi -bs
+helo test
mail from:<CALLER@???>
rcpt to:<userx@???>
data
@@ -41,6 +42,7 @@ Subject: no Message-id, no References, no In-Reply-to
quit
****
exim -odi -bs
+helo test
mail from:<CALLER@???>
rcpt to:<userx@???>
data
@@ -50,6 +52,7 @@ In-Reply-To: <i1@b>
quit
****
exim -odi -bs
+helo test
mail from:<CALLER@???>
rcpt to:<userx@???>
data
@@ -60,6 +63,7 @@ In-Reply-To: <i1@b>
quit
****
exim -odi -bs
+helo test
mail from:<CALLER@???>
rcpt to:<userx@???>
data
@@ -69,6 +73,7 @@ References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
quit
****
exim -odi -bs
+helo test
mail from:<CALLER@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0532 b/test/scripts/0000-Basic/0532
index 80124ce..23a60e2 100644
--- a/test/scripts/0000-Basic/0532
+++ b/test/scripts/0000-Basic/0532
@@ -1,5 +1,6 @@
# add_header modifier in ACLs
exim -bs -odi
+helo test
mail from:<mailok@???>
rcpt to:<rcptok@???>
rcpt to:<notok@???>
diff --git a/test/scripts/0000-Basic/0538 b/test/scripts/0000-Basic/0538
index ccabcfb..51daa9a 100644
--- a/test/scripts/0000-Basic/0538
+++ b/test/scripts/0000-Basic/0538
@@ -12,6 +12,7 @@ QUIT
221 Bye
****
exim -bs
+helo test
mail from:<userx@???>
quit
****
@@ -28,12 +29,14 @@ QUIT
221 Bye
****
exim -bs
+helo test
mail from:<userx@???>
rcpt to:<usery@???>
quit
****
# A final check that the cache works for sender address
exim -bs
+helo test
mail from:<userx@???>
quit
****
diff --git a/test/scripts/0000-Basic/0539 b/test/scripts/0000-Basic/0539
index 193047a..559c633 100644
--- a/test/scripts/0000-Basic/0539
+++ b/test/scripts/0000-Basic/0539
@@ -1,5 +1,6 @@
# log_reject_target
exim -bs
+helo test
mail from:<main@???>
mail from:<reject@???>
mail from:<both@???>
diff --git a/test/scripts/0000-Basic/0540 b/test/scripts/0000-Basic/0540
index 0866eef..2137978 100644
--- a/test/scripts/0000-Basic/0540
+++ b/test/scripts/0000-Basic/0540
@@ -43,6 +43,7 @@ QUIT
250 OK
****
exim -odq -bs
+helo test
mail from:<>
RCPT TO:<abc@yes1>
RCPT TO:<def@yes2>
diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542
index 1c8c03b..8d03846 100644
--- a/test/scripts/0000-Basic/0542
+++ b/test/scripts/0000-Basic/0542
@@ -18,6 +18,7 @@ TESTING_MACROS=$recipients
(TESTING_MACROS)
****
exim -bs
+helo test
mail from:<userz@???>
rcpt to:<userx@???>
rcpt to:<usery@???>
diff --git a/test/scripts/0000-Basic/0555 b/test/scripts/0000-Basic/0555
index c351136..d5aa2e2 100644
--- a/test/scripts/0000-Basic/0555
+++ b/test/scripts/0000-Basic/0555
@@ -1,5 +1,6 @@
# Long response lines for fakedefer/fakereject
exim -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -10,6 +11,7 @@ quit
exim -bs -DFAKE='fakedefer/This is a rather long customised message that \
should get automatically split up into more than one \
response line.'
+helo test
mail from:<>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0561 b/test/scripts/0000-Basic/0561
index 1f55f8d..a7a6df5 100644
--- a/test/scripts/0000-Basic/0561
+++ b/test/scripts/0000-Basic/0561
@@ -2,6 +2,7 @@
need_ipv4
#
exim -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -28,6 +29,7 @@ sleep 1
killdaemon
#
exim -bs -DQOLL=false
+helo test
mail from:<>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0565 b/test/scripts/0000-Basic/0565
index 8596233..9c06c57 100644
--- a/test/scripts/0000-Basic/0565
+++ b/test/scripts/0000-Basic/0565
@@ -17,6 +17,7 @@ QUIT
221 bye
****
exim -odf -bs
+helo test
mail from:<postmaster@y>
rcpt to:<x@y>
data
@@ -45,6 +46,7 @@ QUIT
221 bye
****
exim -odf -bs
+helo test
mail from:<postmaster@y>
rcpt to:<x@???>
data
diff --git a/test/scripts/0000-Basic/0567 b/test/scripts/0000-Basic/0567
index 5abd06f..a7a4348 100644
--- a/test/scripts/0000-Basic/0567
+++ b/test/scripts/0000-Basic/0567
@@ -1,5 +1,6 @@
# remove_header modifier in ACLs
exim -bs -odi
+helo test
mail from:<mailok@???>
rcpt to:<rcptok@???>
rcpt to:<notok@???>
diff --git a/test/scripts/0000-Basic/0569 b/test/scripts/0000-Basic/0569
index 41cdb87..a744590 100644
--- a/test/scripts/0000-Basic/0569
+++ b/test/scripts/0000-Basic/0569
@@ -1,6 +1,7 @@
# verify = header_names_ascii
# 1. Headers are good, make sure no misfires.
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -24,6 +25,7 @@ QUIT
****
# 2. A non-ASCII in header name, uses default rejection message
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -48,6 +50,7 @@ QUIT
# 3. A non-ASCII character in header name, different from sets an acl variable
# causing custom log message
exim -bh V4NET.10.10.10
+helo test
mail from:<usery@???>
rcpt to:<userx@???>
data
@@ -71,6 +74,7 @@ QUIT
****
# 4. A non-ASCII character in header name, uses default rejection message
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -94,6 +98,7 @@ QUIT
****
# 5. Headers are good, Unicode in message body, make sure no misfires.
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -120,6 +125,7 @@ QUIT
# 6. Headers are good, Unicode in a header content *and* message body,
# make sure no misfires.
exim -bh V4NET.10.10.10
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0575 b/test/scripts/0000-Basic/0575
index 302b67f..9d1e3ed 100644
--- a/test/scripts/0000-Basic/0575
+++ b/test/scripts/0000-Basic/0575
@@ -1,6 +1,7 @@
# -bh and msglog
# no logfiles, says the docs
exim -d -bh V4NET.0.0.0
+helo test
mail from:<x@y>
rcpt to:<x@y>
data
diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576
index 0f9a8c7..5d6e8fc 100644
--- a/test/scripts/0000-Basic/0576
+++ b/test/scripts/0000-Basic/0576
@@ -4,6 +4,7 @@
no_msglog_check
#
exim -bs
+HELO test
MAIL FROM:<CALLER@???>
RCPT TO: <normal@???>
DATA
@@ -44,6 +45,7 @@ exim -DSERVER=server -qGlowpri/3s
****
sleep 1
exim -bs
+HELO test
MAIL FROM:<CALLER@???>
RCPT TO: <lowpri@???>
DATA
@@ -58,6 +60,7 @@ killdaemon
#
# third-party queue transfer
exim -bs
+HELO test
MAIL FROM:<CALLER@???>
RCPT TO: <alternate@???>
DATA
@@ -76,6 +79,7 @@ exim -q
# Native queue transfer
### load messages
exim -bs
+HELO test
MAIL FROM:<CALLER@???>
RCPT TO: <normal@???>
DATA
diff --git a/test/scripts/0000-Basic/0578 b/test/scripts/0000-Basic/0578
index 4267b0c..5660a53 100644
--- a/test/scripts/0000-Basic/0578
+++ b/test/scripts/0000-Basic/0578
@@ -16,11 +16,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
@@ -29,6 +31,7 @@ QUIT
sleep 2
# Should want to connect, but fail
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
@@ -48,11 +51,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<bad@localhost>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<bad@localhost>
RCPT TO:<z@???>
QUIT
@@ -72,11 +77,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
MAIL FROM:<ok@localhost>
RCPT TO:<z@???>
QUIT
@@ -102,11 +109,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost>
RCPT TO:<z@???>
QUIT
@@ -132,11 +141,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost2>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost2>
RCPT TO:<z@???>
QUIT
@@ -156,11 +167,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<ok@otherhost3>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<otherok@otherhost3>
RCPT TO:<z@???>
QUIT
@@ -180,11 +193,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<ok@otherhost4>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<ok@otherhost4>
RCPT TO:<z@???>
QUIT
@@ -216,11 +231,13 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<ok@otherhost41>
RCPT TO:<z@???>
QUIT
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
+HELO test
MAIL FROM:<ok@otherhost41>
RCPT TO:<z@???>
QUIT
@@ -247,6 +264,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok@otherhost21>
RCPT TO:<z@???>
QUIT
@@ -265,6 +283,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
MAIL FROM:<ok2@otherhost21>
RCPT TO:<z@???>
QUIT
@@ -290,6 +309,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<ok@otherhost31>
RCPT TO:<z@???>
QUIT
@@ -308,6 +328,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<okok@otherhost31>
RCPT TO:<z@???>
QUIT
@@ -334,6 +355,7 @@ QUIT
250 OK
****
sudo exim -DPEX=1s -d-all+verify -v -bs -oMa V4NET.0.0.3
+HELO test
MAIL FROM:<okokok@otherhost31>
RCPT TO:<z@???>
QUIT
@@ -351,6 +373,7 @@ RCPT TO
*sleep 2
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.5
+HELO test
MAIL FROM:<okok@otherhost51>
RCPT TO:<z@???>
QUIT
@@ -376,6 +399,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.6
+HELO test
MAIL FROM:<okokok@otherhost52>
RCPT TO:<z@???>
QUIT
@@ -395,6 +419,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.7
+HELO test
MAIL FROM:<ok7@otherhost53>
RCPT TO:<z@???>
DATA
@@ -415,6 +440,7 @@ RCPT TO
*sleep 2
****
sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.8
+HELO test
MAIL FROM:<ok7@otherhost53>
RCPT TO:<z@???>
DATA
@@ -445,6 +471,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.9
+HELO test
MAIL FROM:<ok@otherhost9>
RCPT TO:<z@???>
QUIT
@@ -476,6 +503,7 @@ QUIT
250 OK
****
sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.10
+HELO test
MAIL FROM:<ok@otherhost10>
RCPT TO:<z@???>
QUIT
diff --git a/test/scripts/0000-Basic/0580 b/test/scripts/0000-Basic/0580
index 5cce3e8..4d21667 100644
--- a/test/scripts/0000-Basic/0580
+++ b/test/scripts/0000-Basic/0580
@@ -20,6 +20,7 @@ QUIT
****
#
exim -bs -odi
+helo test
mail from:<userx@???>
rcpt to:<usery@???>
data
@@ -62,6 +63,7 @@ QUIT
****
#
exim -bs -odi
+helo test
mail from:<userx@???>
rcpt to:<usery@???>
rcpt to:<usery2@???>
@@ -104,6 +106,7 @@ QUIT
****
#
exim -bs -odi
+helo test
mail from:<userx@???>
rcpt to:<usery3@???>
rcpt to:<usery@???>
@@ -136,6 +139,7 @@ QUIT
****
#
exim -bs -odi
+helo test
mail from:<userx@???>
rcpt to:<usery4@???>
rcpt to:<usery5@???>
@@ -164,6 +168,7 @@ QUIT
221 bye
****
exim -bs -odi
+helo test
mail from:<useri@???>
rcpt to:<remote@???>
rcpt to:<local@???>
diff --git a/test/scripts/0000-Basic/0582 b/test/scripts/0000-Basic/0582
index 6da2023..da93d1a 100644
--- a/test/scripts/0000-Basic/0582
+++ b/test/scripts/0000-Basic/0582
@@ -16,6 +16,7 @@ QUIT
****
#
exim -bs -odi
+helo test
mail from:<userg@???>
rcpt to:<userg@???>
quit
@@ -39,6 +40,7 @@ QUIT
****
#
exim -bs -odi
+helo test
mail from:<userh@???>
rcpt to:<userh@???>
data
diff --git a/test/scripts/0000-Basic/0584 b/test/scripts/0000-Basic/0584
index c7f543d..8c629a1 100644
--- a/test/scripts/0000-Basic/0584
+++ b/test/scripts/0000-Basic/0584
@@ -2,6 +2,7 @@
#
# pass
exim -DOPT=userx@??? -bh 127.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
@@ -12,12 +13,14 @@ QUIT
****
# fail
exim -DOPT=fail@??? -bh 127.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
QUIT
****
# check can use tainted data
exim -DOPT='$sender_address/defer_ok' -bh 127.0.0.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
data
diff --git a/test/scripts/0000-Basic/0585 b/test/scripts/0000-Basic/0585
index c4ae477..b4d8258 100644
--- a/test/scripts/0000-Basic/0585
+++ b/test/scripts/0000-Basic/0585
@@ -2,6 +2,7 @@
#
# Accept: the env rcpt matches a header To:
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -11,6 +12,7 @@ quit
****
### Reject: no match
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -20,6 +22,7 @@ quit
****
### Reject, with specific SMTP message
exim -DERROR_DETAILS=smtp_return_error_details -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
data
@@ -29,6 +32,7 @@ quit
****
### Accept, matches in header CC:
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
rcpt to:<usery@???>
@@ -40,6 +44,7 @@ quit
****
### Reject: To: & CC: combo, an env rcpt missing
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
rcpt to:<usery@???>
@@ -52,6 +57,7 @@ quit
****
### Accept: Resent-To: & Resent-CC: combo
exim -odq -bs
+helo test
mail from:<>
rcpt to:<userx@???>
rcpt to:<usery@???>
diff --git a/test/scripts/0000-Basic/0593 b/test/scripts/0000-Basic/0593
index 81a1b4c..00790ff 100644
--- a/test/scripts/0000-Basic/0593
+++ b/test/scripts/0000-Basic/0593
@@ -2,6 +2,7 @@
#
# This should trap
exim -bs -odi
+helo test
mail from:someone@???
rcpt to:fred@HOSTNAME
data
@@ -12,6 +13,7 @@ quit
# taint trap defated by using create_file
# goes on to fail on perms
exim -bs -odi -DOPT=DIR/test-mail
+helo test
mail from:someone@???
rcpt to:bill@HOSTNAME
data
diff --git a/test/scripts/0000-Basic/0596 b/test/scripts/0000-Basic/0596
index 038254e..72d2b14 100644
--- a/test/scripts/0000-Basic/0596
+++ b/test/scripts/0000-Basic/0596
@@ -1,6 +1,7 @@
# $local_part_data, multi-rcpt message
#
exim -bs -odi
+helo test
mail from:<someone@???>
rcpt to:<CALLER@HOSTNAME>
rcpt to:<b@remote>
@@ -9,6 +10,7 @@ data
quit
****
exim -bs -odi
+helo test
mail from:<someone@???>
rcpt to:<a@remote>
rcpt to:<CALLER@HOSTNAME>
diff --git a/test/scripts/0000-Basic/0599 b/test/scripts/0000-Basic/0599
index 360d536..b5aca88 100644
--- a/test/scripts/0000-Basic/0599
+++ b/test/scripts/0000-Basic/0599
@@ -6,6 +6,7 @@ perl aux-fixed/0601.udpserver
****
#
exim -bs -odi
+helo test
mail from:someone@???
rcpt to:CALLER@HOSTNAME
data
diff --git a/test/scripts/0000-Basic/0600 b/test/scripts/0000-Basic/0600
index 43f7288..eadbcb7 100644
--- a/test/scripts/0000-Basic/0600
+++ b/test/scripts/0000-Basic/0600
@@ -2,6 +2,7 @@
#
# -bs to simple local delivery
exim -bs -odi
+helo test
mail from:CALLER@HOSTNAME
rcpt to:CALLER@HOSTNAME
data
@@ -20,6 +21,7 @@ This is the last line.
quit
****
exim -bs -odi
+helo test
mail from:CALLER@HOSTNAME
rcpt to:CALLER@HOSTNAME
data
diff --git a/test/scripts/0000-Basic/0607 b/test/scripts/0000-Basic/0607
index 83c83b3..42dc1ca 100644
--- a/test/scripts/0000-Basic/0607
+++ b/test/scripts/0000-Basic/0607
@@ -7,6 +7,7 @@ exim -DSERVER=server -bd -oX PORT_D
****
#
exim -bs
+HELO test
MAIL FROM:<CALLER@???>
RCPT TO: <testx@???>
DATA
diff --git a/test/scripts/0000-Basic/0609 b/test/scripts/0000-Basic/0609
index 86f7532..79f214b 100644
--- a/test/scripts/0000-Basic/0609
+++ b/test/scripts/0000-Basic/0609
@@ -12,6 +12,8 @@ exim -d-all+acl -DSERVER=server -odq -bd -oX PORT_D
# Server delays 4s before accepting RCPT
client 127.0.0.1 PORT_D
??? 220
+helo test
+??? 250
mail from:<x@???>
??? 250
rcpt to:<delay4_accept@???>
@@ -24,6 +26,8 @@ quit
# but client closes connection
client 127.0.0.1 PORT_D
??? 220
+helo test
+??? 250
mail from:<x@???>
??? 250
rcpt to:<delay4_accept@???>
diff --git a/test/scripts/0000-Basic/0610 b/test/scripts/0000-Basic/0610
index ff690f6..758e7fb 100644
--- a/test/scripts/0000-Basic/0610
+++ b/test/scripts/0000-Basic/0610
@@ -5,6 +5,7 @@ exim -DSERVER=server -bd -oX PORT_D
****
#
exim -bs
+HELO test
MAIL FROM:<t1@???>
RCPT TO:<fred@???>
DATA
diff --git a/test/scripts/0000-Basic/0614 b/test/scripts/0000-Basic/0614
index 38e374a..0d23186 100644
--- a/test/scripts/0000-Basic/0614
+++ b/test/scripts/0000-Basic/0614
@@ -8,6 +8,7 @@ exim -DSERVER=server -bd -oX PORT_D
****
#
exim -bs
+helo test
mail from:ralph@???
rcpt to:bob@???
data
diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615
index a24d194..1712c88 100644
--- a/test/scripts/0000-Basic/0615
+++ b/test/scripts/0000-Basic/0615
@@ -7,6 +7,7 @@ exim -DSERVER=server -bd -oX PORT_D
****
#
exim -bs
+helo test
mail from:ralph@???
rcpt to:bob@???
data
diff --git a/test/scripts/0999-EXP-Queue-Ramp/0999 b/test/scripts/0999-EXP-Queue-Ramp/0999
index 529fa16..3fb8df9 100644
--- a/test/scripts/0999-EXP-Queue-Ramp/0999
+++ b/test/scripts/0999-EXP-Queue-Ramp/0999
@@ -15,6 +15,7 @@ exim -DSERVER=server -bd -q30m -odd -oX PORT_D
****
#
exim -bs
+helo test
mail from:ralph@???
rcpt to:bob@???
data
diff --git a/test/scripts/1000-Basic-ipv6/1002 b/test/scripts/1000-Basic-ipv6/1002
index c9a8b3f..f5f9523 100644
--- a/test/scripts/1000-Basic-ipv6/1002
+++ b/test/scripts/1000-Basic-ipv6/1002
@@ -1,5 +1,6 @@
# @ items in domain lists and host lists
exim -bh V4NET.1.1.1
+helo test
mail from:<x@y>
rcpt to:<1@[::1]>
rcpt to:<6@???>
diff --git a/test/scripts/1100-Basic-TLS/1103 b/test/scripts/1100-Basic-TLS/1103
index d8441dc..734780f 100644
--- a/test/scripts/1100-Basic-TLS/1103
+++ b/test/scripts/1100-Basic-TLS/1103
@@ -13,6 +13,12 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+ehlo test
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/1100-Basic-TLS/1105 b/test/scripts/1100-Basic-TLS/1105
index fe06d2c..01f9113 100644
--- a/test/scripts/1100-Basic-TLS/1105
+++ b/test/scripts/1100-Basic-TLS/1105
@@ -4,6 +4,8 @@ exim -DSERVER=server -bd -oX PORT_D
****
client-anytls 127.0.0.1 PORT_D
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -17,6 +19,12 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/1100-Basic-TLS/1108 b/test/scripts/1100-Basic-TLS/1108
index 7da4f44..4e85dc5 100644
--- a/test/scripts/1100-Basic-TLS/1108
+++ b/test/scripts/1100-Basic-TLS/1108
@@ -13,6 +13,12 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/1100-Basic-TLS/1110 b/test/scripts/1100-Basic-TLS/1110
index effc750..f81b7d8 100644
--- a/test/scripts/1100-Basic-TLS/1110
+++ b/test/scripts/1100-Basic-TLS/1110
@@ -24,6 +24,8 @@ quit
****
client-anytls -tls-on-connect HOSTIPV4 PORT_D aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/2000-GnuTLS/2002 b/test/scripts/2000-GnuTLS/2002
index c96ffa1..2cf6b33 100644
--- a/test/scripts/2000-GnuTLS/2002
+++ b/test/scripts/2000-GnuTLS/2002
@@ -24,6 +24,12 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
mail from:<CALLER@???>
??? 250
rcpt to:<CALLER@???>
@@ -47,6 +53,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<"name with spaces"@???>
??? 250
rcpt to:<CALLER@???>
@@ -94,6 +102,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<CALLER@???>
??? 250
rcpt to:<CALLER@???>
@@ -124,6 +134,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<CALLER@???>
??? 250
rcpt to:<CALLER@???>
@@ -151,6 +163,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<CALLER@???>
??? 250
rcpt to:<CALLER@???>
diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014
index 5bd5858..16bcbe4 100644
--- a/test/scripts/2000-GnuTLS/2014
+++ b/test/scripts/2000-GnuTLS/2014
@@ -51,6 +51,8 @@ ehlo rhu3.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -70,6 +72,8 @@ ehlo rhu4.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -107,6 +111,8 @@ ehlo rhu6.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -134,7 +140,7 @@ ehlo rhu7.barb
??? 250
starttls
??? 220
-mail from:<userx@???>
+helo test
??? 554
****
### Revoked certificate, certificate optional at TLS time, reject at ACL time
@@ -149,6 +155,8 @@ ehlo rhu8.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -168,6 +176,8 @@ ehlo rhu9.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/2000-GnuTLS/2029 b/test/scripts/2000-GnuTLS/2029
index ab4f949..bc59e22 100644
--- a/test/scripts/2000-GnuTLS/2029
+++ b/test/scripts/2000-GnuTLS/2029
@@ -17,6 +17,8 @@ ehlo abcd
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/2000-GnuTLS/2035 b/test/scripts/2000-GnuTLS/2035
index 94923aa..fd76f8c 100644
--- a/test/scripts/2000-GnuTLS/2035
+++ b/test/scripts/2000-GnuTLS/2035
@@ -10,6 +10,7 @@ exim -bd -DSERVER=server -oX PORT_D
# "proxied TLS", and the DATA smtp command only done by the transport process.
# cmdline -bs send
exim -d-all+transport -bs
+helo test
mail from:<usera@???>
rcpt to:<userb@???>
data
diff --git a/test/scripts/2000-GnuTLS/2037 b/test/scripts/2000-GnuTLS/2037
index ad13a3f..7060df0 100644
--- a/test/scripts/2000-GnuTLS/2037
+++ b/test/scripts/2000-GnuTLS/2037
@@ -6,6 +6,7 @@ exim -bd -DSERVER=server -oX PORT_D
****
# cmdline -bs send, rcpt-time defer
exim -bs
+helo test
mail from:<>
rcpt to:<rcpt_defer@???>
quit
@@ -14,6 +15,7 @@ sleep 3
#
# cmdline -bs send, data-time defer
exim -bs
+helo test
mail from:<>
rcpt to:<data_defer@???>
data
diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index 9a9f4d7..290db16 100644
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -22,6 +22,12 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
mail from:<a@???>
??? 250
rcpt to:<CALLER@???>
@@ -45,6 +51,12 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
mail from:<"name with spaces"@???>
??? 250
rcpt to:<CALLER@???>
@@ -84,6 +96,12 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
mail from:<b@???>
??? 250
rcpt to:<CALLER@???>
@@ -115,6 +133,12 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
mail from:<c@???>
??? 250
rcpt to:<CALLER@???>
diff --git a/test/scripts/2100-OpenSSL/2114 b/test/scripts/2100-OpenSSL/2114
index edf3b6c..b5245fd 100644
--- a/test/scripts/2100-OpenSSL/2114
+++ b/test/scripts/2100-OpenSSL/2114
@@ -55,6 +55,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -74,6 +76,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -110,6 +114,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -153,6 +159,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
@@ -172,6 +180,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/2100-OpenSSL/2132 b/test/scripts/2100-OpenSSL/2132
index cdf4ed2..9aa4c1a 100644
--- a/test/scripts/2100-OpenSSL/2132
+++ b/test/scripts/2100-OpenSSL/2132
@@ -14,6 +14,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<CALLER@???>
??? 250
rcpt to:<CALLER@???>
@@ -38,6 +40,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<"name with spaces"@???>
??? 250
rcpt to:<CALLER@???>
@@ -79,6 +83,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<CALLER@???>
??? 250
rcpt to:<CALLER@???>
diff --git a/test/scripts/2100-OpenSSL/2135 b/test/scripts/2100-OpenSSL/2135
index ff460c6..fe7447c 100644
--- a/test/scripts/2100-OpenSSL/2135
+++ b/test/scripts/2100-OpenSSL/2135
@@ -9,6 +9,7 @@ exim -bd -DSERVER=server -oX PORT_D
# "proxied TLS", and the DATA smtp command only done by the transport process.
# cmdline -bs send
exim -d-all+transport -bs
+helo test
mail from:<usera@???>
rcpt to:<userb@???>
data
diff --git a/test/scripts/2100-OpenSSL/2137 b/test/scripts/2100-OpenSSL/2137
index 36c36fe..1cce83d 100644
--- a/test/scripts/2100-OpenSSL/2137
+++ b/test/scripts/2100-OpenSSL/2137
@@ -5,6 +5,7 @@ exim -bd -DSERVER=server -oX PORT_D
****
# cmdline -bs send, rcpt-time defer
exim -bs
+helo test
mail from:<>
rcpt to:<rcpt_defer@???>
quit
@@ -13,6 +14,7 @@ sleep 3
#
# cmdline -bs send, data-time defer
exim -bs
+helo test
mail from:<>
rcpt to:<data_defer@???>
data
diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150
index 9ee9eb1..162436e 100644
--- a/test/scripts/2100-OpenSSL/2150
+++ b/test/scripts/2100-OpenSSL/2150
@@ -15,6 +15,8 @@ ehlo abcd
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/2200-dnsdb/2202 b/test/scripts/2200-dnsdb/2202
index e55fbc3..e87087b 100644
--- a/test/scripts/2200-dnsdb/2202
+++ b/test/scripts/2200-dnsdb/2202
@@ -1,6 +1,7 @@
# dns_again_means_nonexist
munge dnssec
exim -d -bh HOSTIPV4
+helo test
mail from:<xx@???>
rcpt to:<a@b>
quit
diff --git a/test/scripts/2600-SQLite/2600 b/test/scripts/2600-SQLite/2600
index a11d46e..27e4ab6 100644
--- a/test/scripts/2600-SQLite/2600
+++ b/test/scripts/2600-SQLite/2600
@@ -14,18 +14,21 @@ ${lookup sqlite,file=DIR/aux-fixed/sqlitedb{select * from them where id='its';}}
${lookup sqlite,file=DIR/aux-fixed/sqlitedb{select * from them where name='${quote_sqlite:it's}';}}
****
exim -d -DOPT=y -bh 10.0.0.0
+helo test
mail from:<a@b>
rcpt to:<c@d>
rcpt to:<c@d>
quit
****
exim -d -bh 10.0.0.0
+helo test
mail from:<a@b>
rcpt to:<c@d>
rcpt to:<c@d>
quit
****
exim -d -bh 10.10.10.10
+helo test
mail from:<a@b>
rcpt to:<c@d>
rcpt to:<c@d>
diff --git a/test/scripts/2610-MySQL/2610 b/test/scripts/2610-MySQL/2610
index ec7b454..3065eac 100644
--- a/test/scripts/2610-MySQL/2610
+++ b/test/scripts/2610-MySQL/2610
@@ -82,6 +82,7 @@ ${lookup mysql {SELECT * FROM them WHERE id IN ('ph10', 'aaaa');}}
${lookup mysql {delete from them where id='aaaa'}}
****
exim -d -bh 10.0.0.0
+helo test
mail from:<a@b>
rcpt to:<c@d>
quit
diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620
index a96b719..5d16077 100644
--- a/test/scripts/2620-Postgresql/2620
+++ b/test/scripts/2620-Postgresql/2620
@@ -52,6 +52,7 @@ ${lookup pgsql {SELECT * FROM them WHERE id IN ('ph10', 'aaaa');}}
${lookup pgsql {delete from them where id='aaaa'}}
****
exim -d -bh 10.0.0.0
+helo test
mail from:<a@b>
rcpt to:<c@d>
rcpt to:<c@d>
diff --git a/test/scripts/3200-testdb/3202 b/test/scripts/3200-testdb/3202
index 7b72063..2d971cf 100644
--- a/test/scripts/3200-testdb/3202
+++ b/test/scripts/3200-testdb/3202
@@ -1,15 +1,18 @@
# ACL defer tests
exim -bh 1.1.1.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
quit
****
exim -bh 1.1.2.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
quit
****
exim -bh 1.1.3.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
quit
diff --git a/test/scripts/3200-testdb/3204 b/test/scripts/3200-testdb/3204
index d4a24fe..652deb3 100644
--- a/test/scripts/3200-testdb/3204
+++ b/test/scripts/3200-testdb/3204
@@ -1,5 +1,6 @@
# Lookup defer (sender_reject)
exim -bh 1.2.3.4
+helo test
mail from:<userx@???>
rcpt to:<x@y>
quit
diff --git a/test/scripts/3200-testdb/3205 b/test/scripts/3200-testdb/3205
index adb8be6..9b4ee52 100644
--- a/test/scripts/3200-testdb/3205
+++ b/test/scripts/3200-testdb/3205
@@ -1,10 +1,12 @@
# lookup defer (senders and hosts conditions in ACL)
exim -bh 1.2.3.4
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
quit
****
exim -bh 4.3.2.1
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
quit
diff --git a/test/scripts/3200-testdb/3211 b/test/scripts/3200-testdb/3211
index 44ab872..42da0ce 100644
--- a/test/scripts/3200-testdb/3211
+++ b/test/scripts/3200-testdb/3211
@@ -1,15 +1,18 @@
# reset search_error_message for next router
exim -bs
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
quit
****
exim -bh 1.2.3.4
+helo test
mail from:<userx@???>
rcpt to:<userx@???>
quit
****
exim -bh 1.2.3.4
+helo test
mail from:<userx@???>
rcpt to:<r1-userx@???>
quit
diff --git a/test/scripts/3400-plaintext/3400 b/test/scripts/3400-plaintext/3400
index 164ace5..815dd39 100644
--- a/test/scripts/3400-plaintext/3400
+++ b/test/scripts/3400-plaintext/3400
@@ -1,5 +1,6 @@
# plaintext server tests
exim -bh 10.0.0.2
+helo test
mail from:<junk@???>
rset
vrfy userx@???
diff --git a/test/scripts/3400-plaintext/3410 b/test/scripts/3400-plaintext/3410
index 20b5e06..2a6df25 100644
--- a/test/scripts/3400-plaintext/3410
+++ b/test/scripts/3400-plaintext/3410
@@ -1,5 +1,6 @@
# ACL basic auth tests
exim -bh 5.6.9.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
rset
@@ -10,6 +11,7 @@ rcpt to:<x@y>
quit
****
exim -bh 5.6.10.1
+helo test
mail from:<x@y>
rcpt to:<x@y>
rset
diff --git a/test/scripts/5300-ipliteral/5300 b/test/scripts/5300-ipliteral/5300
index fba34c4..d7f156b 100644
--- a/test/scripts/5300-ipliteral/5300
+++ b/test/scripts/5300-ipliteral/5300
@@ -14,6 +14,7 @@ exim -bp
****
0
exim -odq -bs
+HELO test
MAIL FROM:<>
RCPT TO:<x@???>
RCPT TO:<x@[ipv4:1.2.3.4]>
diff --git a/test/scripts/5300-ipliteral/5301 b/test/scripts/5300-ipliteral/5301
index 300b4f0..188e4fe 100644
--- a/test/scripts/5300-ipliteral/5301
+++ b/test/scripts/5300-ipliteral/5301
@@ -7,6 +7,7 @@ exim -DD6=disable_ipv6 -bt x@[abcd::dcba] x@[IPv6:cba::abc]
****
0
exim -odq -bs
+HELO test
MAIL FROM:<>
RCPT TO:<x@[3ffe:ffff:836f:0a00:000a:0800:200a:c031]>
RCPT TO:<x@[ipv6:3ffe:ffff:836f:0a00:000a:0800:200a:c031]>
diff --git a/test/scripts/5600-OCSP-OpenSSL/5600 b/test/scripts/5600-OCSP-OpenSSL/5600
index 72fa478..7dfaa60 100644
--- a/test/scripts/5600-OCSP-OpenSSL/5600
+++ b/test/scripts/5600-OCSP-OpenSSL/5600
@@ -20,6 +20,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/5600-OCSP-OpenSSL/5610 b/test/scripts/5600-OCSP-OpenSSL/5610
index fccd944..cd135f5 100644
--- a/test/scripts/5600-OCSP-OpenSSL/5610
+++ b/test/scripts/5600-OCSP-OpenSSL/5610
@@ -20,6 +20,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/5650-OCSP-GnuTLS/5650 b/test/scripts/5650-OCSP-GnuTLS/5650
index bbea625..ee4b4f0 100644
--- a/test/scripts/5650-OCSP-GnuTLS/5650
+++ b/test/scripts/5650-OCSP-GnuTLS/5650
@@ -21,6 +21,8 @@ ehlo rhu.barb
??? 250
starttls
??? 220
+helo test
+??? 250
mail from:<userx@???>
??? 250
rcpt to:<userx@???>
diff --git a/test/scripts/5820-DANE-GnuTLS/5820 b/test/scripts/5820-DANE-GnuTLS/5820
index 0101a0c..f663e1a 100644
--- a/test/scripts/5820-DANE-GnuTLS/5820
+++ b/test/scripts/5820-DANE-GnuTLS/5820
@@ -16,6 +16,7 @@ exim -qf
#
### Recipient callout
exim -DOPT=callout -bhc 127.0.0.1
+HELO test
MAIL FROM: <t3@???>
RCPT TO: <rcptuser@???>
****
diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840
index 8038654..f968930 100644
--- a/test/scripts/5840-DANE-OpenSSL/5840
+++ b/test/scripts/5840-DANE-OpenSSL/5840
@@ -16,6 +16,7 @@ exim -qf
#
### Recipient callout
exim -DOPT=callout -bhc 127.0.0.1
+HELO test
MAIL FROM: <t3@???>
RCPT TO: <rcptuser@???>
****
diff --git a/test/stderr/0002 b/test/stderr/0002
index bd2d806..0c34e84 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -395,6 +395,7 @@ search_tidyup called
>>> processing "accept" (TESTSUITE/test-config 42)
>>> accept: condition test succeeded in ACL "connect0"
>>> end of ACL "connect0": ACCEPT
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 70)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -408,7 +409,7 @@ LOG: 10HmaX-0005vi-00 Subject is: ""
>>> message: reply_address=<$reply_address>
>>> deny: condition test succeeded in ACL "check_data"
>>> end of ACL "check_data": DENY
-LOG: 10HmaX-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmaX-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
>>> processing "accept" (TESTSUITE/test-config 70)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -423,7 +424,7 @@ LOG: 10HmaY-0005vi-00 Subject is: ""
>>> message: reply_address=<$reply_address>
>>> deny: condition test succeeded in ACL "check_data"
>>> end of ACL "check_data": DENY
-LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b>
+LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b>
>>> processing "accept" (TESTSUITE/test-config 70)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -438,7 +439,7 @@ LOG: 10HmaZ-0005vi-00 Subject is: ""
>>> message: reply_address=<$reply_address>
>>> deny: condition test succeeded in ACL "check_data"
>>> end of ACL "check_data": DENY
-LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d>
+LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d>
>>> processing "accept" (TESTSUITE/test-config 70)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -453,7 +454,7 @@ LOG: 10HmbA-0005vi-00 Subject is: ""
>>> message: reply_address=<$reply_address>
>>> deny: condition test succeeded in ACL "check_data"
>>> end of ACL "check_data": DENY
-LOG: 10HmbA-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
>>> processing "accept" (TESTSUITE/test-config 70)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -468,7 +469,7 @@ LOG: 10HmbB-0005vi-00 Subject is: ""
>>> message: reply_address=<$reply_address>
>>> deny: condition test succeeded in ACL "check_data"
>>> end of ACL "check_data": DENY
-LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y>
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -481,6 +482,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x
>>> processing "accept" (TESTSUITE/test-config 42)
>>> accept: condition test succeeded in ACL "connect0"
>>> end of ACL "connect0": ACCEPT
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 70)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -495,7 +497,7 @@ LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_i
>>> message: reply_address=<$reply_address>
>>> deny: condition test succeeded in ACL "check_data"
>>> end of ACL "check_data": DENY
-LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -508,6 +510,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
>>> processing "accept" (TESTSUITE/test-config 42)
>>> accept: condition test succeeded in ACL "connect0"
>>> end of ACL "connect0": ACCEPT
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 70)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -522,7 +525,7 @@ LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be enc
>>> message: reply_address=<$reply_address>
>>> deny: condition test succeeded in ACL "check_data"
>>> end of ACL "check_data": DENY
-LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbD-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
Exim version x.yz ....
changed uid/gid: -C, -D, -be or -bf forces real uid
uid=CALLER_UID gid=CALLER_GID pid=pppp
diff --git a/test/stderr/0003 b/test/stderr/0003
index 88fcb98..b94b975 100644
--- a/test/stderr/0003
+++ b/test/stderr/0003
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -17,7 +18,7 @@
>>> a@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<a@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<a@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -29,7 +30,7 @@ LOG: H=[1.1.1.1] F=<a@???> rejected RCPT <x@???>
>>> a@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<a@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<a@???> rejected RCPT <x@???>
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
@@ -42,7 +43,7 @@ LOG: H=[1.1.1.1] F=<a@???> rejected RCPT <x@???>
>>> A@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<A@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<A@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -54,7 +55,7 @@ LOG: H=[1.1.1.1] F=<A@???> rejected RCPT <x@???>
>>> A@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<A@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<A@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -66,7 +67,7 @@ LOG: H=[1.1.1.1] F=<A@???> rejected RCPT <x@???>
>>> x@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<x@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<x@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -78,7 +79,7 @@ LOG: H=[1.1.1.1] F=<x@???> rejected RCPT <x@???>
>>> x@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<x@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<x@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -90,7 +91,7 @@ LOG: H=[1.1.1.1] F=<x@???> rejected RCPT <x@???>
>>> X@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<X@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<X@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -102,7 +103,7 @@ LOG: H=[1.1.1.1] F=<X@???> rejected RCPT <x@???>
>>> X@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<X@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<X@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -113,7 +114,7 @@ LOG: H=[1.1.1.1] F=<X@???> rejected RCPT <x@???>
>>> ax@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<ax@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<ax@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -124,7 +125,7 @@ LOG: H=[1.1.1.1] F=<ax@???> rejected RCPT <x@???>
>>> ay@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\DY@G\.H")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<ay@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<ay@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -135,7 +136,7 @@ LOG: H=[1.1.1.1] F=<ay@???> rejected RCPT <x@???>
>>> bX@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<bX@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<bX@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -146,7 +147,7 @@ LOG: H=[1.1.1.1] F=<bX@???> rejected RCPT <x@???>
>>> bY@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\DY@G\.H")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<bY@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<bY@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -187,7 +188,7 @@ LOG: H=[1.1.1.1] F=<bY@???> rejected RCPT <x@???>
>>> q@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -198,7 +199,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> q@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -209,7 +210,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> Q@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -220,7 +221,7 @@ LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> Q@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -231,7 +232,7 @@ LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> cc@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<cc@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<cc@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -242,7 +243,7 @@ LOG: H=[1.1.1.1] F=<cc@???> rejected RCPT <x@???>
>>> CC@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<CC@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<CC@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -268,7 +269,7 @@ LOG: H=[1.1.1.1] F=<CC@???> rejected RCPT <x@???>
>>> q@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -279,7 +280,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> Q@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -290,7 +291,7 @@ LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> q@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -301,7 +302,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> Pp@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Pp@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Pp@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -312,7 +313,7 @@ LOG: H=[1.1.1.1] F=<Pp@???> rejected RCPT <x@???>
>>> abcd@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<abcd@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<abcd@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -323,7 +324,7 @@ LOG: H=[1.1.1.1] F=<abcd@???> rejected RCPT <x@???>
>>> ABCD@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<ABCD@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<ABCD@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -334,7 +335,7 @@ LOG: H=[1.1.1.1] F=<ABCD@???> rejected RCPT <x@???>
>>> ax@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<ax@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<ax@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -345,7 +346,7 @@ LOG: H=[1.1.1.1] F=<ax@???> rejected RCPT <x@???>
>>> bX@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<bX@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<bX@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -356,7 +357,7 @@ LOG: H=[1.1.1.1] F=<bX@???> rejected RCPT <x@???>
>>> Ay@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Ay@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Ay@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -367,7 +368,7 @@ LOG: H=[1.1.1.1] F=<Ay@???> rejected RCPT <x@???>
>>> BY@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<BY@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<BY@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -378,7 +379,7 @@ LOG: H=[1.1.1.1] F=<BY@???> rejected RCPT <x@???>
>>> blocked@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<blocked@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<blocked@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -389,4 +390,4 @@ LOG: H=[1.1.1.1] F=<blocked@???> rejected RCPT <x@???>
>>> BLOCKED@??? in "a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<BLOCKED@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<BLOCKED@???> rejected RCPT <x@???>
diff --git a/test/stderr/0004 b/test/stderr/0004
index 6353e8e..6945d31 100644
--- a/test/stderr/0004
+++ b/test/stderr/0004
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -17,7 +18,7 @@
>>> a@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<a@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<a@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -29,7 +30,7 @@ LOG: H=[1.1.1.1] F=<a@???> rejected RCPT <x@???>
>>> a@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<a@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<a@???> rejected RCPT <x@???>
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
@@ -133,7 +134,7 @@ LOG: H=[1.1.1.1] F=<a@???> rejected RCPT <x@???>
>>> ax@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<ax@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<ax@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -219,7 +220,7 @@ LOG: H=[1.1.1.1] F=<ax@???> rejected RCPT <x@???>
>>> q@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -230,7 +231,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> q@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -241,7 +242,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> Q@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -252,7 +253,7 @@ LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> Q@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -263,7 +264,7 @@ LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> cc@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<cc@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<cc@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -274,7 +275,7 @@ LOG: H=[1.1.1.1] F=<cc@???> rejected RCPT <x@???>
>>> CC@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<CC@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<CC@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -300,7 +301,7 @@ LOG: H=[1.1.1.1] F=<CC@???> rejected RCPT <x@???>
>>> q@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -311,7 +312,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> Q@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -322,7 +323,7 @@ LOG: H=[1.1.1.1] F=<Q@???> rejected RCPT <x@???>
>>> q@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -333,7 +334,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> q@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -344,7 +345,7 @@ LOG: H=[1.1.1.1] F=<q@???> rejected RCPT <x@???>
>>> Pp@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<Pp@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<Pp@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -385,7 +386,7 @@ LOG: H=[1.1.1.1] F=<Pp@???> rejected RCPT <x@???>
>>> AbCd@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<AbCd@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<AbCd@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -396,7 +397,7 @@ LOG: H=[1.1.1.1] F=<AbCd@???> rejected RCPT <x@???>
>>> ax@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<ax@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<ax@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -437,7 +438,7 @@ LOG: H=[1.1.1.1] F=<ax@???> rejected RCPT <x@???>
>>> BY@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<BY@???> rejected RCPT <x@???>
+LOG: H=(test) [1.1.1.1] F=<BY@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 16)
>>> check hosts = :
@@ -478,5 +479,5 @@ LOG: H=[1.1.1.1] F=<BY@???> rejected RCPT <x@???>
>>> BlOcKeD@??? in "+caseful: a@??? : X@??? : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.1.1.1] F=<BlOcKeD@???> rejected RCPT <x@???>
-LOG: unexpected disconnection while reading SMTP command from [1.1.1.1] D=qqs
+LOG: H=(test) [1.1.1.1] F=<BlOcKeD@???> rejected RCPT <x@???>
+LOG: unexpected disconnection while reading SMTP command from (test) [1.1.1.1] D=qqs
diff --git a/test/stderr/0021 b/test/stderr/0021
index b9104e1..b476c03 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -13,30 +13,31 @@ host in helo_verify_hosts? no (option unset)
host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
using ACL "connect"
-processing "deny" (TESTSUITE/test-config 50)
+processing "deny" (TESTSUITE/test-config 52)
check hosts = : 10.9.8.7
host in ": 10.9.8.7"? no (end of list)
deny: condition test failed in ACL "connect"
-processing "drop" (TESTSUITE/test-config 51)
+processing "drop" (TESTSUITE/test-config 53)
l_message: forcibly dropped
check hosts = 10.9.8.9
host in "10.9.8.9"? no (end of list)
drop: condition test failed in ACL "connect"
-processing "accept" (TESTSUITE/test-config 53)
+processing "accept" (TESTSUITE/test-config 55)
check logwrite = $sender_host_address accepted by connect ACL
= 10.9.8.8 accepted by connect ACL
LOG: MAIN
10.9.8.8 accepted by connect ACL
accept: condition test succeeded in ACL "connect"
end of ACL "connect": ACCEPT
+host in hosts_require_helo? no (end of list)
using ACL "mail"
-processing "warn" (TESTSUITE/test-config 61)
+processing "warn" (TESTSUITE/test-config 63)
message: added header line
check senders = ok@test3
address match test: subject=bad@test1 pattern=ok@test3
bad@test1 in "ok@test3"? no (end of list)
warn: condition test failed in ACL "mail"
-processing "accept" (TESTSUITE/test-config 63)
+processing "accept" (TESTSUITE/test-config 65)
check senders = ok@test1 : ok@test3
address match test: subject=bad@test1 pattern=ok@test1
address match test: subject=bad@test1 pattern=ok@test3
@@ -45,15 +46,16 @@ accept: condition test failed in ACL "mail"
end of ACL "mail": implicit DENY
LOG: MAIN REJECT
H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
+host in hosts_require_helo? no (end of list)
using ACL "mail"
-processing "warn" (TESTSUITE/test-config 61)
+processing "warn" (TESTSUITE/test-config 63)
message: added header line
check senders = ok@test3
address match test: subject=ok@test1 pattern=ok@test3
test1 in "test3"? no (end of list)
ok@test1 in "ok@test3"? no (end of list)
warn: condition test failed in ACL "mail"
-processing "accept" (TESTSUITE/test-config 63)
+processing "accept" (TESTSUITE/test-config 65)
check senders = ok@test1 : ok@test3
address match test: subject=ok@test1 pattern=ok@test1
test1 in "test1"? yes (matched "test1")
@@ -69,7 +71,7 @@ LOG: MAIN REJECT
accept: condition test succeeded in ACL "mail"
end of ACL "mail": ACCEPT
using ACL "rcpt"
-processing "accept" (TESTSUITE/test-config 68)
+processing "accept" (TESTSUITE/test-config 70)
check senders = +ok_senders
address match test: subject=ok@test1 pattern=ok@somewhere
test1 in "somewhere"? no (end of list)
@@ -88,7 +90,7 @@ LOG: PANIC
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
using ACL "rcpt"
-processing "accept" (TESTSUITE/test-config 68)
+processing "accept" (TESTSUITE/test-config 70)
check senders = +ok_senders
cached yes match for +ok_senders
cached lookup data = test1
@@ -121,31 +123,32 @@ host in helo_verify_hosts? no (option unset)
host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
using ACL "connect"
-processing "deny" (TESTSUITE/test-config 50)
+processing "deny" (TESTSUITE/test-config 52)
check hosts = : 10.9.8.7
host in ": 10.9.8.7"? no (end of list)
deny: condition test failed in ACL "connect"
-processing "drop" (TESTSUITE/test-config 51)
+processing "drop" (TESTSUITE/test-config 53)
l_message: forcibly dropped
check hosts = 10.9.8.9
host in "10.9.8.9"? no (end of list)
drop: condition test failed in ACL "connect"
-processing "accept" (TESTSUITE/test-config 53)
+processing "accept" (TESTSUITE/test-config 55)
check logwrite = $sender_host_address accepted by connect ACL
= 10.9.8.8 accepted by connect ACL
LOG: MAIN
10.9.8.8 accepted by connect ACL
accept: condition test succeeded in ACL "connect"
end of ACL "connect": ACCEPT
+host in hosts_require_helo? no (end of list)
using ACL "mail"
-processing "warn" (TESTSUITE/test-config 61)
+processing "warn" (TESTSUITE/test-config 63)
message: added header line
check senders = ok@test3
address match test: subject=ok@test3 pattern=ok@test3
test3 in "test3"? yes (matched "test3")
ok@test3 in "ok@test3"? yes (matched "ok@test3")
warn: condition test succeeded in ACL "mail"
-processing "accept" (TESTSUITE/test-config 63)
+processing "accept" (TESTSUITE/test-config 65)
check senders = ok@test1 : ok@test3
address match test: subject=ok@test3 pattern=ok@test1
test3 in "test1"? no (end of list)
@@ -163,7 +166,7 @@ LOG: MAIN REJECT
accept: condition test succeeded in ACL "mail"
end of ACL "mail": ACCEPT
using ACL "rcpt"
-processing "accept" (TESTSUITE/test-config 68)
+processing "accept" (TESTSUITE/test-config 70)
check senders = +ok_senders
address match test: subject=ok@test3 pattern=ok@somewhere
test3 in "somewhere"? no (end of list)
diff --git a/test/stderr/0022 b/test/stderr/0022
index dc0e125..c647f73 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -24,6 +24,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.9.8.7]
+sender_rcvhost = [V4NET.9.8.7] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -47,20 +53,20 @@ search_tidyup called
Data file name: TESTSUITE/spool//input//10HmbF-0005vi-00-D
Data file written for message 10HmbF-0005vi-00
>>Generated Received: header line
-P Received: from [V4NET.9.8.7]
+P Received: from [V4NET.9.8.7] (helo=test)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmbF-0005vi-00
for warn_empty@???;
Tue, 2 Mar 1999 09:44:33 +0000
LOG: MAIN
- <= x@y H=[V4NET.9.8.7] P=smtp S=sss
+ <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss
SMTP>> 250 OK id=10HmbF-0005vi-00
smtp_setup_msg entered
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [V4NET.9.8.7] closed by QUIT
+ SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -89,6 +95,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.9.8.7]
+sender_rcvhost = [V4NET.9.8.7] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -99,7 +111,7 @@ processing "warn" (TESTSUITE/test-config 33)
l_message: warn log message
warn: condition test succeeded in ACL "warn_log"
LOG: MAIN
- H=[V4NET.9.8.7] Warning: warn log message
+ H=(test) [V4NET.9.8.7] Warning: warn log message
processing "accept" (TESTSUITE/test-config 34)
accept: condition test succeeded in ACL "warn_log"
end of ACL "warn_log": ACCEPT
@@ -115,20 +127,20 @@ search_tidyup called
Data file name: TESTSUITE/spool//input//10HmbG-0005vi-00-D
Data file written for message 10HmbG-0005vi-00
>>Generated Received: header line
-P Received: from [V4NET.9.8.7]
+P Received: from [V4NET.9.8.7] (helo=test)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmbG-0005vi-00
for warn_log@???;
Tue, 2 Mar 1999 09:44:33 +0000
LOG: MAIN
- <= x@y H=[V4NET.9.8.7] P=smtp S=sss
+ <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss
SMTP>> 250 OK id=10HmbG-0005vi-00
smtp_setup_msg entered
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [V4NET.9.8.7] closed by QUIT
+ SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -157,6 +169,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.9.8.7]
+sender_rcvhost = [V4NET.9.8.7] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -181,7 +199,7 @@ search_tidyup called
Data file name: TESTSUITE/spool//input//10HmbH-0005vi-00-D
Data file written for message 10HmbH-0005vi-00
>>Generated Received: header line
-P Received: from [V4NET.9.8.7]
+P Received: from [V4NET.9.8.7] (helo=test)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmbH-0005vi-00
@@ -191,13 +209,13 @@ P Received: from [V4NET.9.8.7]
X-ACL-Warn: warn user message
>>
LOG: MAIN
- <= x@y H=[V4NET.9.8.7] P=smtp S=sss
+ <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss
SMTP>> 250 OK id=10HmbH-0005vi-00
smtp_setup_msg entered
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [V4NET.9.8.7] closed by QUIT
+ SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
>>> host in hosts_connection_nolog? no (end of list)
@@ -209,12 +227,13 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "defer"
>>> processing "defer" (TESTSUITE/test-config 51)
>>> message: forcibly deferred
>>> defer: condition test succeeded in ACL "defer"
>>> end of ACL "defer": DEFER
-LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
>>> using ACL "accept"
>>> processing "accept" (TESTSUITE/test-config 24)
>>> accept: condition test succeeded in ACL "accept"
@@ -224,8 +243,8 @@ LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly defer
>>> message: forcibly dropped
>>> drop: condition test succeeded in ACL "drop"
>>> end of ACL "drop": DROP
-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
-LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL
>>> host in hosts_connection_nolog? no (end of list)
LOG: SMTP connection from [V4NET.9.8.7]
>>> host in host_lookup? no (option unset)
@@ -235,14 +254,15 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "defer_senders"
>>> processing "defer" (TESTSUITE/test-config 54)
>>> check senders = :
>>> in ":"? yes (matched "")
>>> defer: condition test succeeded in ACL "defer_senders"
>>> end of ACL "defer_senders": DEFER
-LOG: H=[V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y>
-LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
+LOG: H=(test) [V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y>
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
>>> host in hosts_connection_nolog? no (end of list)
LOG: SMTP connection from [V4NET.9.8.7]
>>> host in host_lookup? no (option unset)
@@ -252,6 +272,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "delay_accept"
>>> processing "accept" (TESTSUITE/test-config 57)
>>> check delay = 1s
@@ -268,7 +289,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> processing "accept" (TESTSUITE/test-config 61)
>>> accept: condition test succeeded in ACL "delay_warn"
>>> end of ACL "delay_warn": ACCEPT
-LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
>>> host in hosts_connection_nolog? no (end of list)
LOG: SMTP connection from [V4NET.9.8.7]
>>> host in host_lookup? no (option unset)
@@ -278,6 +299,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "host_check"
>>> processing "deny" (TESTSUITE/test-config 71)
>>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
@@ -285,7 +307,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> message: host data >$host_data<
>>> deny: condition test succeeded in ACL "host_check"
>>> end of ACL "host_check": DENY
-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
>>> using ACL "host_check"
>>> processing "deny" (TESTSUITE/test-config 71)
>>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
@@ -293,7 +315,7 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-spe
>>> message: host data >$host_data<
>>> deny: condition test succeeded in ACL "host_check"
>>> end of ACL "host_check": DENY
-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
>>> using ACL "host_check2"
>>> processing "deny" (TESTSUITE/test-config 75)
>>> message: host data >$host_data<
@@ -302,7 +324,7 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-spe
>>> host in "+some_hosts"? yes (matched "+some_hosts")
>>> deny: condition test succeeded in ACL "host_check2"
>>> end of ACL "host_check2": DENY
-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
>>> using ACL "host_check2"
>>> processing "deny" (TESTSUITE/test-config 75)
>>> message: host data >$host_data<
@@ -310,8 +332,8 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-sp
>>> host in "+some_hosts"? yes (matched "+some_hosts" - cached)
>>> deny: condition test succeeded in ACL "host_check2"
>>> end of ACL "host_check2": DENY
-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
-LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: MAIN
@@ -349,6 +371,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "nested_drop"
>>> processing "accept" (TESTSUITE/test-config 44)
>>> check acl = drop
@@ -359,8 +382,8 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> end of ACL "drop": DROP
>>> accept: condition test yielded "drop" in ACL "nested_drop"
>>> accept: endpass encountered - denying access
-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped
-LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL
>>> host in hosts_connection_nolog? no (end of list)
LOG: SMTP connection from [V4NET.9.8.7]
>>> host in host_lookup? no (option unset)
@@ -370,6 +393,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "nested_drop_require"
>>> processing "require" (TESTSUITE/test-config 48)
>>> check acl = drop
@@ -380,7 +404,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
>>> end of ACL "drop": DROP
>>> require: condition test yielded "drop" in ACL "nested_drop_require"
>>> end of ACL "nested_drop_require": not OK
-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped
-LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL
******** SERVER ********
diff --git a/test/stderr/0023 b/test/stderr/0023
index 4414223..07d8126 100644
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_1_2_3"
>>> processing "require" (TESTSUITE/test-config 44)
>>> check domains = !nopass
@@ -64,7 +65,7 @@
>>> z in "+relay_domains"? no (end of list)
>>> accept: condition test failed in ACL "acl_1_2_3"
>>> end of ACL "acl_1_2_3": implicit DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <z@z>
>>> using ACL "acl_1_2_3"
>>> processing "require" (TESTSUITE/test-config 44)
>>> check domains = !nopass
@@ -161,7 +162,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
>>> deny.test.ex in "deny.test.ex"? yes (matched "deny.test.ex")
>>> deny: condition test succeeded in ACL "acl_1_2_3"
>>> end of ACL "acl_1_2_3": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: DOMAIN EXPLICITLY DENIED
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@???>: DOMAIN EXPLICITLY DENIED
>>> using ACL "acl_1_2_3"
>>> processing "require" (TESTSUITE/test-config 44)
>>> check domains = !nopass
@@ -188,14 +189,14 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: DOMAIN EXPLICITLY DENIE
>>> refuse.test.ex in "!refuse.test.ex"? no (matched "!refuse.test.ex")
>>> accept: condition test failed in ACL "acl_1_2_3"
>>> accept: endpass encountered - denying access
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: refuse.test.ex gets refused
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@???>: refuse.test.ex gets refused
>>> using ACL "acl_1_2_3"
>>> processing "require" (TESTSUITE/test-config 44)
>>> check domains = !nopass
>>> nopass in "!nopass"? no (matched "!nopass")
>>> require: condition test failed in ACL "acl_1_2_3"
>>> end of ACL "acl_1_2_3": not OK
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@nopass>
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@nopass>
>>> using ACL "acl_1_2_3"
>>> processing "require" (TESTSUITE/test-config 44)
>>> check domains = !nopass
@@ -207,7 +208,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@nopass>
>>> wontpass in "!wontpass"? no (matched "!wontpass")
>>> require: condition test failed in ACL "acl_1_2_3"
>>> end of ACL "acl_1_2_3": not OK
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -216,13 +217,14 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_5_6_7"
>>> processing "accept" (TESTSUITE/test-config 64)
>>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms
>>> y in "lsearch;TESTSUITE/aux-fixed/0023.doms"? no (end of list)
>>> accept: condition test failed in ACL "acl_5_6_7"
>>> end of ACL "acl_5_6_7": implicit DENY
-LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@y>
>>> using ACL "acl_5_6_7"
>>> processing "accept" (TESTSUITE/test-config 64)
>>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms
@@ -231,7 +233,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@y>
>>> x in "userx : spqr"? no (end of list)
>>> accept: condition test failed in ACL "acl_5_6_7"
>>> end of ACL "acl_5_6_7": implicit DENY
-LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@???>
+LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@???>
>>> using ACL "acl_5_6_7"
>>> processing "accept" (TESTSUITE/test-config 64)
>>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms
@@ -256,6 +258,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@???>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_9_9_9"
>>> processing "accept" (TESTSUITE/test-config 91)
>>> check hosts = +ok9_hosts
@@ -277,6 +280,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@???>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_9_9_9"
>>> processing "accept" (TESTSUITE/test-config 91)
>>> check hosts = +ok9_hosts
@@ -289,7 +293,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@???>
>>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
>>> deny: condition test succeeded in ACL "acl_9_9_9"
>>> end of ACL "acl_9_9_9": DENY
-LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host
+LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host
>>> using ACL "acl_9_9_9"
>>> processing "accept" (TESTSUITE/test-config 91)
>>> check hosts = +ok9_hosts
@@ -301,7 +305,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host
>>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
>>> deny: condition test succeeded in ACL "acl_9_9_9"
>>> end of ACL "acl_9_9_9": DENY
-LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
+LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -310,6 +314,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_9_9_9"
>>> processing "accept" (TESTSUITE/test-config 91)
>>> check hosts = +ok9_hosts
@@ -349,6 +354,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_5_6_8"
>>> processing "accept" (TESTSUITE/test-config 68)
>>> check senders = user1@domain1 : domain2 : +ok_senders
@@ -357,7 +363,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
>>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
>>> accept: condition test failed in ACL "acl_5_6_8"
>>> end of ACL "acl_5_6_8": implicit DENY
-LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [5.6.8.1] F=<x@y> rejected RCPT <x@y>
>>> using ACL "acl_5_6_8"
>>> processing "accept" (TESTSUITE/test-config 68)
>>> check senders = user1@domain1 : domain2 : +ok_senders
@@ -365,7 +371,7 @@ LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <x@y>
>>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
>>> accept: condition test failed in ACL "acl_5_6_8"
>>> end of ACL "acl_5_6_8": implicit DENY
-LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <y@x>
+LOG: H=(test) [5.6.8.1] F=<x@y> rejected RCPT <y@x>
>>> using ACL "acl_5_6_8"
>>> processing "accept" (TESTSUITE/test-config 68)
>>> check senders = user1@domain1 : domain2 : +ok_senders
@@ -382,7 +388,7 @@ LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <y@x>
>>> user2@domain1 in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
>>> accept: condition test failed in ACL "acl_5_6_8"
>>> end of ACL "acl_5_6_8": implicit DENY
-LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
+LOG: H=(test) [5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
>>> using ACL "acl_5_6_8"
>>> processing "accept" (TESTSUITE/test-config 68)
>>> check senders = user1@domain1 : domain2 : +ok_senders
@@ -415,6 +421,7 @@ LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_5_6_11"
>>> processing "accept" (TESTSUITE/test-config 71)
>>> check condition = ${if match{$local_part}{^x}{yes}{no}}
@@ -436,7 +443,7 @@ LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
>>> message: "local part of wrong type\n(quotes are literal)
>>> deny: condition test succeeded in ACL "acl_5_6_11"
>>> end of ACL "acl_5_6_11": DENY
-LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
+LOG: H=(test) [5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -445,6 +452,7 @@ LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_5_6_12"
>>> processing "accept" (TESTSUITE/test-config 75)
>>> check hosts = 5.6.12.1
@@ -473,7 +481,7 @@ LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
>>> end of ACL "acl_5_6_12A": implicit DENY
>>> accept: condition test failed in ACL "acl_5_6_12"
>>> accept: endpass encountered - denying access
-LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
+LOG: H=(test) [5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -482,6 +490,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_5_6_12"
>>> processing "accept" (TESTSUITE/test-config 75)
>>> check hosts = 5.6.12.1
@@ -506,6 +515,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_8_8_8"
>>> processing "accept" (TESTSUITE/test-config 88)
>>> check acl = acl_8_8_8
@@ -590,7 +600,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
>>> accept: condition test error in ACL "acl_8_8_8"
>>> accept: condition test error in ACL "acl_8_8_8"
>>> accept: condition test error in ACL "acl_8_8_8"
-LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: possible loop
+LOG: H=(test) [8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: possible loop
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -599,6 +609,7 @@ LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: p
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_5_6_13"
>>> processing "accept" (TESTSUITE/test-config 85)
>>> check acl = TESTSUITE/aux-fixed/0023.acl1
@@ -625,7 +636,7 @@ LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: p
>>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY
>>> accept: condition test failed in ACL "acl_5_6_13"
>>> end of ACL "acl_5_6_13": implicit DENY
-LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x1@y>
+LOG: H=(test) [5.6.13.1] F=<x@y> rejected RCPT <x1@y>
>>> using ACL "acl_5_6_13"
>>> processing "accept" (TESTSUITE/test-config 85)
>>> check acl = TESTSUITE/aux-fixed/0023.acl1
@@ -639,7 +650,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x1@y>
>>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY
>>> accept: condition test failed in ACL "acl_5_6_13"
>>> end of ACL "acl_5_6_13": implicit DENY
-LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y>
+LOG: H=(test) [5.6.13.1] F=<x@y> rejected RCPT <x2@y>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -648,6 +659,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_V4NET_11_12"
>>> processing "deny" (TESTSUITE/test-config 105)
>>> message: host in DNS list $dnslist_domain: $dnslist_text
@@ -660,7 +672,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y>
>>> => that means V4NET.11.12.13 is listed at rbl.test.ex
>>> deny: condition test succeeded in ACL "acl_V4NET_11_12"
>>> end of ACL "acl_V4NET_11_12": DENY
-LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
>>> using ACL "acl_V4NET_11_12"
>>> processing "deny" (TESTSUITE/test-config 105)
>>> message: host in DNS list $dnslist_domain: $dnslist_text
@@ -672,7 +684,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This
>>> => that means V4NET.11.12.13 is listed at rbl.test.ex
>>> deny: condition test succeeded in ACL "acl_V4NET_11_12"
>>> end of ACL "acl_V4NET_11_12": DENY
-LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -681,6 +693,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_V4NET_11_12"
>>> processing "deny" (TESTSUITE/test-config 105)
>>> message: host in DNS list $dnslist_domain: $dnslist_text
@@ -716,6 +729,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_20_20_20"
>>> processing "accept" (TESTSUITE/test-config 111)
>>> message: sender verify failure
@@ -729,8 +743,8 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "acl_20_20_20"
>>> accept: endpass encountered - denying access
-LOG: H=[20.20.20.20] sender verify fail for <x@y>: Unrouteable address
-LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
+LOG: H=(test) [20.20.20.20] sender verify fail for <x@y>: Unrouteable address
+LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
>>> using ACL "acl_20_20_20"
>>> processing "accept" (TESTSUITE/test-config 111)
>>> message: sender verify failure
@@ -738,7 +752,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
>>> using cached sender verify result
>>> accept: condition test failed in ACL "acl_20_20_20"
>>> accept: endpass encountered - denying access
-LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
+LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -747,6 +761,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_20_20_20"
>>> processing "accept" (TESTSUITE/test-config 111)
>>> message: sender verify failure
@@ -769,7 +784,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "acl_20_20_20"
>>> accept: endpass encountered - denying access
-LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
+LOG: H=(test) [20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
>>> using ACL "acl_20_20_20"
>>> processing "accept" (TESTSUITE/test-config 111)
>>> message: sender verify failure
@@ -794,6 +809,7 @@ LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_21_21_21"
>>> processing "accept" (TESTSUITE/test-config 118)
>>> check verify = sender
@@ -814,7 +830,7 @@ LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "acl_21_21_21"
>>> end of ACL "acl_21_21_21": implicit DENY
-LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
+LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
>>> using ACL "acl_21_21_21"
>>> processing "accept" (TESTSUITE/test-config 118)
>>> check verify = sender
@@ -844,7 +860,7 @@ LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "acl_21_21_21"
>>> end of ACL "acl_21_21_21": implicit DENY
-LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message
+LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message
>>> using ACL "acl_21_21_21"
>>> processing "accept" (TESTSUITE/test-config 118)
>>> check verify = sender
@@ -857,15 +873,15 @@ LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "acl_21_21_21"
>>> end of ACL "acl_21_21_21": implicit DENY
-LOG: H=[21.21.21.21] sender verify fail for <x@y>: Unrouteable address
-LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
+LOG: H=(test) [21.21.21.21] sender verify fail for <x@y>: Unrouteable address
+LOG: H=(test) [21.21.21.21] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
>>> using ACL "acl_21_21_21"
>>> processing "accept" (TESTSUITE/test-config 118)
>>> check verify = sender
>>> using cached sender verify result
>>> accept: condition test failed in ACL "acl_21_21_21"
>>> end of ACL "acl_21_21_21": implicit DENY
-LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
+LOG: H=(test) [21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "acl_21_21_21"
>>> processing "accept" (TESTSUITE/test-config 118)
@@ -880,8 +896,8 @@ LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "acl_21_21_21"
>>> end of ACL "acl_21_21_21": implicit DENY
-LOG: H=[21.21.21.21] sender verify fail for <fail@y>: here is a fail message
-LOG: H=[21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed
+LOG: H=(test) [21.21.21.21] sender verify fail for <fail@y>: here is a fail message
+LOG: H=(test) [21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -890,13 +906,14 @@ LOG: H=[21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_22_22_22"
>>> processing "accept" (TESTSUITE/test-config 123)
>>> check recipients = x@y
>>> userx@y in "x@y"? no (end of list)
>>> accept: condition test failed in ACL "acl_22_22_22"
>>> end of ACL "acl_22_22_22": implicit DENY
-LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
+LOG: H=(test) [22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
>>> using ACL "acl_22_22_22"
>>> processing "accept" (TESTSUITE/test-config 123)
>>> check recipients = x@y
@@ -912,6 +929,7 @@ LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_23_23_23"
>>> processing "deny" (TESTSUITE/test-config 126)
>>> check hosts = 23.23.23.0
@@ -927,8 +945,8 @@ LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
>>> ----------- end verify ------------
>>> deny: condition test succeeded in ACL "acl_23_23_23"
>>> end of ACL "acl_23_23_23": DENY
-LOG: H=[23.23.23.0] sender verify fail for <x@y>: Unrouteable address
-LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
+LOG: H=(test) [23.23.23.0] sender verify fail for <x@y>: Unrouteable address
+LOG: H=(test) [23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
>>> using ACL "acl_23_23_23"
>>> processing "deny" (TESTSUITE/test-config 126)
>>> check hosts = 23.23.23.0
@@ -954,6 +972,7 @@ LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_23_23_23"
>>> processing "deny" (TESTSUITE/test-config 126)
>>> check hosts = 23.23.23.0
@@ -970,13 +989,14 @@ LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_24_24_24"
>>> processing "warn" (TESTSUITE/test-config 132)
>>> message: X-Warn: sender didn't verify
>>> check condition = yes
>>> warn: condition test succeeded in ACL "acl_24_24_24"
>>> end of ACL "acl_24_24_24": implicit DENY
-LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y>
+LOG: H=(test) [24.24.24.24] F=<x@y> rejected RCPT <userx@y>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -985,6 +1005,7 @@ LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_25_25_25"
>>> processing "deny" (TESTSUITE/test-config 136)
>>> message: denying domains=x
@@ -992,7 +1013,7 @@ LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y>
>>> y in "x"? no (end of list)
>>> deny: condition test failed in ACL "acl_25_25_25"
>>> end of ACL "acl_25_25_25": implicit DENY
-LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [25.25.25.25] F=<x@y> rejected RCPT <x@y>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -1001,6 +1022,7 @@ LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_26_26_26"
>>> processing "deny" (TESTSUITE/test-config 140)
>>> check senders = :
@@ -1021,7 +1043,7 @@ LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y>
>>> = yes
>>> deny: condition test succeeded in ACL "acl_26_26_26"
>>> end of ACL "acl_26_26_26": DENY
-LOG: H=[26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one recipient
+LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one recipient
>>> using ACL "acl_26_26_26"
>>> processing "deny" (TESTSUITE/test-config 140)
>>> check senders = :
@@ -1031,7 +1053,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one
>>> = yes
>>> deny: condition test succeeded in ACL "acl_26_26_26"
>>> end of ACL "acl_26_26_26": DENY
-LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one recipient
+LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one recipient
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -1040,6 +1062,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_27_27_27"
>>> processing "deny" (TESTSUITE/test-config 147)
>>> check hosts = ${if eq {1}{0}{}fail}
@@ -1056,6 +1079,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_28_28_28"
>>> processing "accept" (TESTSUITE/test-config 151)
>>> check sender_domains = : okdomain
@@ -1075,7 +1099,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one
>>> baddomain in ": okdomain"? no (end of list)
>>> accept: condition test failed in ACL "acl_28_28_28"
>>> end of ACL "acl_28_28_28": implicit DENY
-LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
+LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -1084,6 +1108,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_V4NET_0_0"
>>> processing "require" (TESTSUITE/test-config 97)
>>> check verify = reverse_host_lookup
@@ -1107,6 +1132,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_V4NET_0_0"
>>> processing "require" (TESTSUITE/test-config 97)
>>> check verify = reverse_host_lookup
@@ -1115,7 +1141,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
LOG: no host name found for IP address V4NET.0.0.97
>>> require: condition test failed in ACL "acl_V4NET_0_0"
>>> end of ACL "acl_V4NET_0_0": not OK
-LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse lookup check (failed to find host name from IP address)
+LOG: H=(test) [V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse lookup check (failed to find host name from IP address)
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -1124,6 +1150,7 @@ LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse l
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_V4NET_99_99"
>>> processing "accept" (TESTSUITE/test-config 100)
>>> check local_parts = defer_ok
@@ -1137,7 +1164,7 @@ LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse l
>>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
>>> temporary error for host name lookup
>>> accept: condition test deferred in ACL "acl_V4NET_99_99"
-LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferred for reverse lookup check
+LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferred for reverse lookup check
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -1146,6 +1173,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_V4NET_99_99"
>>> processing "accept" (TESTSUITE/test-config 100)
>>> check local_parts = defer_ok
@@ -1166,6 +1194,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_29_29_29"
>>> processing "deny" (TESTSUITE/test-config 154)
>>> check dnslists = test.ex/$sender_address_domain
@@ -1177,7 +1206,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr
>>> => that means localhost is listed at test.ex
>>> deny: condition test succeeded in ACL "acl_29_29_29"
>>> end of ACL "acl_29_29_29": DENY
-LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
+LOG: H=(test) [29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
>>> using ACL "acl_29_29_29"
>>> processing "deny" (TESTSUITE/test-config 154)
>>> check dnslists = test.ex/$sender_address_domain
@@ -1199,6 +1228,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_30_30_30"
>>> processing "deny" (TESTSUITE/test-config 161)
>>> message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"
@@ -1211,7 +1241,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
>>> => that means ten-1 is listed at test.ex
>>> deny: condition test succeeded in ACL "acl_30_30_30"
>>> end of ACL "acl_30_30_30": DENY
-LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex
+LOG: H=(test) [30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex
>>> using ACL "acl_30_30_30"
>>> processing "deny" (TESTSUITE/test-config 161)
>>> message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"
@@ -1240,7 +1270,7 @@ LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex
>>> => that means 13.12.11.V4NET.rbl is listed at test.ex
>>> deny: condition test succeeded in ACL "acl_30_30_30"
>>> end of ACL "acl_30_30_30": DENY
-LOG: H=[30.30.30.30] F=<a@???> rejected RCPT <x@y>: domain=test.ex
+LOG: H=(test) [30.30.30.30] F=<a@???> rejected RCPT <x@y>: domain=test.ex
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -1249,6 +1279,7 @@ LOG: H=[30.30.30.30] F=<a@???> rejected RCPT <x@y>: domain=test.e
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_31_31_31"
>>> processing "deny" (TESTSUITE/test-config 167)
>>> check dnslists = test.ex/$sender_address_domain+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+END
@@ -1267,6 +1298,7 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_33_33_33"
>>> processing "accept" (TESTSUITE/test-config 184)
>>> message: sender verify failure
@@ -1280,7 +1312,7 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "acl_33_33_33"
>>> accept: endpass encountered - denying access
-LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
+LOG: H=(test) [33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
>>> using ACL "acl_33_33_33"
>>> processing "accept" (TESTSUITE/test-config 184)
>>> message: sender verify failure
@@ -1288,7 +1320,7 @@ LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
>>> using cached sender verify result
>>> accept: condition test failed in ACL "acl_33_33_33"
>>> accept: endpass encountered - denying access
-LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
+LOG: H=(test) [33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -1297,6 +1329,7 @@ LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_44_44_44"
>>> processing "warn" (TESTSUITE/test-config 192)
>>> check dnslists = test.again.dns
@@ -1328,7 +1361,7 @@ LOG: DNS list lookup defer (probably timeout) for 1.44.44.44.test.again.dns: ass
>>> dnslists: using result of previous lookup
LOG: DNS list lookup defer (probably timeout) for 1.44.44.44.test.again.dns: returned DEFER
>>> warn: condition test deferred in ACL "acl_44_44_44"
-LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferred
+LOG: H=(test) [44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferred
>>> processing "accept" (TESTSUITE/test-config 196)
>>> accept: condition test succeeded in ACL "acl_44_44_44"
>>> end of ACL "acl_44_44_44": ACCEPT
@@ -1340,6 +1373,7 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_60_60_60"
>>> processing "accept" (TESTSUITE/test-config 226)
>>> check !acl = TESTSUITE/aux-fixed/0023.acl2
@@ -1364,4 +1398,4 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr
>>> end of ACL "TESTSUITE/aux-fixed/0023.acl2": ACCEPT
>>> accept: condition test failed in ACL "acl_60_60_60"
>>> end of ACL "acl_60_60_60": implicit DENY
-LOG: H=[60.60.60.60] F=<x@y> rejected RCPT <a@b>
+LOG: H=(test) [60.60.60.60] F=<x@y> rejected RCPT <a@b>
diff --git a/test/stderr/0026 b/test/stderr/0026
index e1dfdf6..5bd6f01 100644
--- a/test/stderr/0026
+++ b/test/stderr/0026
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 61)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -25,7 +26,7 @@ LOG: 10HmbI-0005vi-00 $h_from: '@'
>>> check verify = header_syntax
>>> require: condition test failed in ACL "acl_data"
>>> end of ACL "acl_data": not OK
-LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
+LOG: 10HmbI-0005vi-00 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -34,6 +35,7 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 61)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -45,4 +47,4 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
>>> = yes
>>> deny: condition test succeeded in ACL "acl_data"
>>> end of ACL "acl_data": DENY
-LOG: 10HmbJ-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: body contains trigger
+LOG: 10HmbJ-0005vi-00 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: body contains trigger
diff --git a/test/stderr/0056 b/test/stderr/0056
index f23ed97..8cb1215 100644
--- a/test/stderr/0056
+++ b/test/stderr/0056
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -37,4 +38,4 @@
>>> 3rdhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.1] P=smtp S=sss
diff --git a/test/stderr/0057 b/test/stderr/0057
index 2f087d7..1ad8703 100644
--- a/test/stderr/0057
+++ b/test/stderr/0057
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> test.ex in percent_hack_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
@@ -30,7 +31,7 @@
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: H=(test) [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
>>> 3rdhost.example.com in percent_hack_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
@@ -47,5 +48,5 @@ LOG: H=[V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@another
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.1] P=smtp S=sss
diff --git a/test/stderr/0058 b/test/stderr/0058
index 326127b..8287969 100644
--- a/test/stderr/0058
+++ b/test/stderr/0058
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check domains = +local_domains
@@ -18,7 +19,7 @@
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.1] P=smtp S=sss
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check domains = +local_domains
@@ -30,4 +31,4 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
>>> host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.1] P=smtp S=sss
diff --git a/test/stderr/0059 b/test/stderr/0059
index b9c3bd9..835a64e 100644
--- a/test/stderr/0059
+++ b/test/stderr/0059
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -33,5 +34,5 @@
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.1] P=smtp S=sss
diff --git a/test/stderr/0060 b/test/stderr/0060
index df969e4..7060ca8 100644
--- a/test/stderr/0060
+++ b/test/stderr/0060
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -33,7 +34,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -42,6 +43,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -76,8 +78,8 @@ MUNGED: ::1 will be omitted in what follows
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.2] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.0.0.2] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.2] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmaY-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.2] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -86,6 +88,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.0.0.2] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -117,7 +120,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaZ-0005vi-00 <= userx@??? H=[V4NET.0.0.5] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.5] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -126,6 +129,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@??? H=[V4NET.0.0.5] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -157,7 +161,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbA-0005vi-00 <= userx@??? H=[V4NET.0.0.6] P=smtp S=sss
+LOG: 10HmbA-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.6] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -166,6 +170,7 @@ LOG: 10HmbA-0005vi-00 <= userx@??? H=[V4NET.0.0.6] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -193,8 +198,8 @@ LOG: 10HmbA-0005vi-00 <= userx@??? H=[V4NET.0.0.6] P=smtp S=sss
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.255.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmbB-0005vi-00 <= userx@??? H=[V4NET.255.0.1] P=smtp S=sss
+LOG: H=(test) [V4NET.255.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmbB-0005vi-00 <= userx@??? H=(test) [V4NET.255.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -203,6 +208,7 @@ LOG: 10HmbB-0005vi-00 <= userx@??? H=[V4NET.255.0.1] P=smtp S=s
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -230,8 +236,8 @@ LOG: 10HmbB-0005vi-00 <= userx@??? H=[V4NET.255.0.1] P=smtp S=s
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.255.0.2] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmbC-0005vi-00 <= userx@??? H=[V4NET.255.0.2] P=smtp S=sss
+LOG: H=(test) [V4NET.255.0.2] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmbC-0005vi-00 <= userx@??? H=(test) [V4NET.255.0.2] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -240,6 +246,7 @@ LOG: 10HmbC-0005vi-00 <= userx@??? H=[V4NET.255.0.2] P=smtp S=s
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -267,8 +274,8 @@ LOG: 10HmbC-0005vi-00 <= userx@??? H=[V4NET.255.0.2] P=smtp S=s
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.255.0.3] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmbD-0005vi-00 <= userx@??? H=[V4NET.255.0.3] P=smtp S=sss
+LOG: H=(test) [V4NET.255.0.3] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmbD-0005vi-00 <= userx@??? H=(test) [V4NET.255.0.3] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -277,6 +284,7 @@ LOG: 10HmbD-0005vi-00 <= userx@??? H=[V4NET.255.0.3] P=smtp S=s
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -304,5 +312,5 @@ LOG: 10HmbD-0005vi-00 <= userx@??? H=[V4NET.255.0.3] P=smtp S=s
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.255.0.4] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmbE-0005vi-00 <= userx@??? H=[V4NET.255.0.4] P=smtp S=sss
+LOG: H=(test) [V4NET.255.0.4] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmbE-0005vi-00 <= userx@??? H=(test) [V4NET.255.0.4] P=smtp S=sss
diff --git a/test/stderr/0061 b/test/stderr/0061
index 7026031..a4ce8be 100644
--- a/test/stderr/0061
+++ b/test/stderr/0061
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -33,7 +34,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -42,6 +43,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.1] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -72,5 +74,5 @@ MUNGED: ::1 will be omitted in what follows
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.2] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.0.0.2] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.2] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmaY-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.2] P=smtp S=sss
diff --git a/test/stderr/0062 b/test/stderr/0062
index 0658dc8..95a1ecf 100644
--- a/test/stderr/0062
+++ b/test/stderr/0062
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -38,12 +39,12 @@
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
>>> using ACL "check_message"
>>> processing "accept" (TESTSUITE/test-config 29)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -52,6 +53,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -85,7 +87,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> processing "accept" (TESTSUITE/test-config 29)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -94,6 +96,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex [V4NET.0.0.2
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -130,4 +133,4 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex [V4NET.0.0.2
>>> processing "accept" (TESTSUITE/test-config 29)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaZ-0005vi-00 <= userx@??? H=ten-3.test.ex [V4NET.0.0.3] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@??? H=ten-3.test.ex (test) [V4NET.0.0.3] P=smtp S=sss
diff --git a/test/stderr/0063 b/test/stderr/0063
index 56929ff..3a34107 100644
--- a/test/stderr/0063
+++ b/test/stderr/0063
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -38,8 +39,8 @@
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -48,6 +49,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 22)
>>> check domains = +local_domains
@@ -77,4 +79,4 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss
diff --git a/test/stderr/0064 b/test/stderr/0064
index b197227..4365563 100644
--- a/test/stderr/0064
+++ b/test/stderr/0064
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check domains = +local_domains
@@ -38,8 +39,8 @@
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -48,6 +49,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check domains = +local_domains
@@ -77,4 +79,4 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss
diff --git a/test/stderr/0065 b/test/stderr/0065
index e12581d..5027614 100644
--- a/test/stderr/0065
+++ b/test/stderr/0065
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -30,7 +31,7 @@
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[1.2.3.4] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [1.2.3.4] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -39,6 +40,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[1.2.3.4] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -66,8 +68,8 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[1.2.3.4] P=smtp S=sss
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.5] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[1.2.3.5] P=smtp S=sss
+LOG: H=(test) [1.2.3.5] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmaY-0005vi-00 <= userx@??? H=(test) [1.2.3.5] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -76,6 +78,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=[1.2.3.5] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -100,7 +103,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=[1.2.3.5] P=smtp S=sss
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaZ-0005vi-00 <= userx@??? H=[1.2.4.5] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@??? H=(test) [1.2.4.5] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -109,6 +112,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@??? H=[1.2.4.5] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -136,8 +140,8 @@ LOG: 10HmaZ-0005vi-00 <= userx@??? H=[1.2.4.5] P=smtp S=sss
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.3.2.4] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmbA-0005vi-00 <= userx@??? H=[1.3.2.4] P=smtp S=sss
+LOG: H=(test) [1.3.2.4] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmbA-0005vi-00 <= userx@??? H=(test) [1.3.2.4] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -146,6 +150,7 @@ LOG: 10HmbA-0005vi-00 <= userx@??? H=[1.3.2.4] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -170,7 +175,7 @@ LOG: 10HmbA-0005vi-00 <= userx@??? H=[1.3.2.4] P=smtp S=sss
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbB-0005vi-00 <= userx@??? H=[131.111.8.2] P=smtp S=sss
+LOG: 10HmbB-0005vi-00 <= userx@??? H=(test) [131.111.8.2] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -179,6 +184,7 @@ LOG: 10HmbB-0005vi-00 <= userx@??? H=[131.111.8.2] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -203,7 +209,7 @@ LOG: 10HmbB-0005vi-00 <= userx@??? H=[131.111.8.2] P=smtp S=sss
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbC-0005vi-00 <= userx@??? H=[192.152.98.3] P=smtp S=sss
+LOG: 10HmbC-0005vi-00 <= userx@??? H=(test) [192.152.98.3] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -212,6 +218,7 @@ LOG: 10HmbC-0005vi-00 <= userx@??? H=[192.152.98.3] P=smtp S=ss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check domains = +local_domains
@@ -236,4 +243,4 @@ LOG: 10HmbC-0005vi-00 <= userx@??? H=[192.152.98.3] P=smtp S=ss
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbD-0005vi-00 <= userx@??? H=[192.153.98.4] P=smtp S=sss
+LOG: 10HmbD-0005vi-00 <= userx@??? H=(test) [192.153.98.4] P=smtp S=sss
diff --git a/test/stderr/0066 b/test/stderr/0066
index 096bd8a..9769c71 100644
--- a/test/stderr/0066
+++ b/test/stderr/0066
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -36,7 +37,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[1.2.3.4] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [1.2.3.4] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -45,6 +46,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[1.2.3.4] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -78,8 +80,8 @@ MUNGED: ::1 will be omitted in what follows
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.5] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[1.2.3.5] P=smtp S=sss
+LOG: H=(test) [1.2.3.5] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmaY-0005vi-00 <= userx@??? H=(test) [1.2.3.5] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -88,6 +90,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=[1.2.3.5] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -118,7 +121,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaZ-0005vi-00 <= userx@??? H=[1.2.4.5] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@??? H=(test) [1.2.4.5] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -127,6 +130,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@??? H=[1.2.4.5] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -163,8 +167,8 @@ LOG: no host name found for IP address 1.3.2.4
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.3.2.4] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmbA-0005vi-00 <= userx@??? H=[1.3.2.4] P=smtp S=sss
+LOG: H=(test) [1.3.2.4] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmbA-0005vi-00 <= userx@??? H=(test) [1.3.2.4] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -173,6 +177,7 @@ LOG: 10HmbA-0005vi-00 <= userx@??? H=[1.3.2.4] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -203,7 +208,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbB-0005vi-00 <= userx@??? H=[131.111.8.2] P=smtp S=sss
+LOG: 10HmbB-0005vi-00 <= userx@??? H=(test) [131.111.8.2] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -212,6 +217,7 @@ LOG: 10HmbB-0005vi-00 <= userx@??? H=[131.111.8.2] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -242,7 +248,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbC-0005vi-00 <= userx@??? H=[192.152.98.3] P=smtp S=sss
+LOG: 10HmbC-0005vi-00 <= userx@??? H=(test) [192.152.98.3] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -251,6 +257,7 @@ LOG: 10HmbC-0005vi-00 <= userx@??? H=[192.152.98.3] P=smtp S=ss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -286,7 +293,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbD-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmbD-0005vi-00 <= userx@??? H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -295,6 +302,7 @@ LOG: 10HmbD-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -325,8 +333,8 @@ MUNGED: ::1 will be omitted in what follows
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.11.12.13] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
-LOG: 10HmbE-0005vi-00 <= userx@??? H=[V4NET.11.12.13] P=smtp S=sss
+LOG: H=(test) [V4NET.11.12.13] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: 10HmbE-0005vi-00 <= userx@??? H=(test) [V4NET.11.12.13] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -335,6 +343,7 @@ LOG: 10HmbE-0005vi-00 <= userx@??? H=[V4NET.11.12.13] P=smtp S=
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check domains = +local_domains
@@ -365,4 +374,4 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "+relay_hosts"? yes (matched "+relay_hosts")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbF-0005vi-00 <= userx@??? H=[V4NET.0.0.3] P=smtp S=sss
+LOG: 10HmbF-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.3] P=smtp S=sss
diff --git a/test/stderr/0067 b/test/stderr/0067
index 95106a8..69d0594 100644
--- a/test/stderr/0067
+++ b/test/stderr/0067
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -72,7 +73,7 @@
>>> y@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@b.c")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<y@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<y@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -88,7 +89,7 @@ LOG: H=[1.2.3.4] F=<y@???> rejected RCPT <x@???>
>>> philip@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<philip@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<philip@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -104,7 +105,7 @@ LOG: H=[1.2.3.4] F=<philip@???> rejected RCPT <x@???>
>>> quilt@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<quilt@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<quilt@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -144,7 +145,7 @@ LOG: H=[1.2.3.4] F=<quilt@???> rejected RCPT <x@???>
>>> xx@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<xx@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<xx@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -160,7 +161,7 @@ LOG: H=[1.2.3.4] F=<xx@???> rejected RCPT <x@???>
>>> abc@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<abc@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<abc@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -227,7 +228,7 @@ LOG: H=[1.2.3.4] F=<abc@???> rejected RCPT <x@???>
>>> abc@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<abc@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<abc@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -269,7 +270,7 @@ LOG: H=[1.2.3.4] F=<abc@???> rejected RCPT <x@???>
>>> xyz@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<xyz@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<xyz@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -285,7 +286,7 @@ LOG: H=[1.2.3.4] F=<xyz@???> rejected RCPT <x@???>
>>> 12345678@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<12345678@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<12345678@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -301,7 +302,7 @@ LOG: H=[1.2.3.4] F=<12345678@???> rejected RCPT <x@???>
>>> 12345678@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<12345678@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<12345678@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -351,7 +352,7 @@ LOG: H=[1.2.3.4] F=<12345678@???> rejected RCPT <x@???>
>>> 1234@??? in "1234@??? : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "1234@???")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<1234@???> rejected RCPT <userx@???>
+LOG: H=(test) [1.2.3.4] F=<1234@???> rejected RCPT <userx@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -396,7 +397,7 @@ LOG: H=[1.2.3.4] F=<1234@???> rejected RCPT <userx@???>
>>> rr01@??? in "1234@??? : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "rr01@???" in TESTSUITE/aux-fixed/0067.rejrec)
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<rr01@???> rejected RCPT <userx@???>
+LOG: H=(test) [1.2.3.4] F=<rr01@???> rejected RCPT <userx@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -444,7 +445,7 @@ LOG: H=[1.2.3.4] F=<rr01@???> rejected RCPT <userx@???>
>>> qq@??? in "1234@??? : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^qq" in TESTSUITE/aux-fixed/0067.rejrec)
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<qq@???> rejected RCPT <userx@???>
+LOG: H=(test) [1.2.3.4] F=<qq@???> rejected RCPT <userx@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -466,7 +467,7 @@ LOG: H=[1.2.3.4] F=<qq@???> rejected RCPT <userx@???>
>>> !excl@??? in "1234@??? : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^!excl" in TESTSUITE/aux-fixed/0067.rejrec)
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<!excl@???> rejected RCPT <userx@???>
+LOG: H=(test) [1.2.3.4] F=<!excl@???> rejected RCPT <userx@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -489,7 +490,7 @@ LOG: H=[1.2.3.4] F=<!excl@???> rejected RCPT <userx@???>
>>> sh#rp@??? in "1234@??? : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "sh#rp@???" in TESTSUITE/aux-fixed/0067.rejrec)
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<sh#rp@???> rejected RCPT <userx@???>
+LOG: H=(test) [1.2.3.4] F=<sh#rp@???> rejected RCPT <userx@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -531,7 +532,7 @@ LOG: H=[1.2.3.4] F=<sh#rp@???> rejected RCPT <userx@???>
>>> xyzbc@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<xyzbc@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<xyzbc@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -547,7 +548,7 @@ LOG: H=[1.2.3.4] F=<xyzbc@???> rejected RCPT <x@???>
>>> aabc@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<aabc@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<aabc@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -590,7 +591,7 @@ LOG: H=[1.2.3.4] F=<aabc@???> rejected RCPT <x@???>
>>> y@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@bb.cc")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<y@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<y@???> rejected RCPT <x@???>
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -662,4 +663,4 @@ LOG: H=[1.2.3.4] F=<y@???> rejected RCPT <x@???>
>>> z@??? in "!x@??? : *@b.c :!^philip@??? : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@??? : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "bbb.ccc")
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[1.2.3.4] F=<z@???> rejected RCPT <x@???>
+LOG: H=(test) [1.2.3.4] F=<z@???> rejected RCPT <x@???>
diff --git a/test/stderr/0068 b/test/stderr/0068
index c65432f..d649cda 100644
--- a/test/stderr/0068
+++ b/test/stderr/0068
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 12)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -21,4 +22,4 @@
>>> processing "accept" (TESTSUITE/test-config 12)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
-LOG: too many recipients: message rejected: sender=<x@y> H=[V4NET.10.10.10]
+LOG: too many recipients: message rejected: sender=<x@y> H=(test) [V4NET.10.10.10]
diff --git a/test/stderr/0069 b/test/stderr/0069
index 619c7f1..f8b0811 100644
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -21,7 +21,7 @@
>>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
>>> deny: condition test succeeded in ACL "check_recipientx"
>>> end of ACL "check_recipientx": DENY
-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<x@y> rejected RCPT <x@???>
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<x@y> rejected RCPT <x@???>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -34,6 +34,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipientx"
>>> processing "accept" (TESTSUITE/test-config 24)
>>> check hosts = :
@@ -46,7 +47,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> deny: condition test succeeded in ACL "check_recipientx"
>>> end of ACL "check_recipientx": DENY
-LOG: H=[V4NET.0.0.13] F=<userx@???> rejected RCPT <x@???>
+LOG: H=(test) [V4NET.0.0.13] F=<userx@???> rejected RCPT <x@???>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -59,18 +60,19 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipienty"
>>> processing "accept" (TESTSUITE/test-config 30)
>>> check hosts = not-exist.test.ex : V4NET.0.0.13
->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
>>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
>>> accept: condition test failed in ACL "check_recipienty"
>>> processing "deny" (TESTSUITE/test-config 31)
>>> message: "Denied"
>>> deny: condition test succeeded in ACL "check_recipienty"
>>> end of ACL "check_recipienty": DENY
-LOG: H=[V4NET.0.0.13] F=<userx@???> rejected RCPT <y@???>: "Denied"
+LOG: H=(test) [V4NET.0.0.13] F=<userx@???> rejected RCPT <y@???>: "Denied"
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -83,11 +85,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipientz"
>>> processing "accept" (TESTSUITE/test-config 34)
>>> check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13
->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
>>> failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
>>> host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
>>> accept: condition test succeeded in ACL "check_recipientz"
@@ -104,11 +107,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipienty"
>>> processing "accept" (TESTSUITE/test-config 30)
>>> check hosts = not-exist.test.ex : V4NET.0.0.13
->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
>>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex
>>> accept: condition test failed in ACL "check_recipienty"
@@ -116,7 +120,7 @@ LOG: list matching forced to fail: failed to find IP address for not-exist.test.
>>> message: "Denied"
>>> deny: condition test succeeded in ACL "check_recipienty"
>>> end of ACL "check_recipienty": DENY
-LOG: H=[V4NET.0.0.13] F=<userx@???> rejected RCPT <y@???>: "Denied"
+LOG: H=(test) [V4NET.0.0.13] F=<userx@???> rejected RCPT <y@???>: "Denied"
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -129,6 +133,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipienta"
>>> processing "accept" (TESTSUITE/test-config 38)
>>> check hosts = :
@@ -137,12 +142,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> processing "deny" (TESTSUITE/test-config 39)
>>> check hosts = +include_defer : test.again.dns
>>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
>>> test.again.dns in dns_again_means_nonexist? no (option unset)
LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
>>> deny: condition test succeeded in ACL "check_recipienta"
>>> end of ACL "check_recipienta": DENY
-LOG: H=[V4NET.0.0.13] F=<userx@???> rejected RCPT <a@???>
+LOG: H=(test) [V4NET.0.0.13] F=<userx@???> rejected RCPT <a@???>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -155,15 +160,16 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipientb"
>>> processing "accept" (TESTSUITE/test-config 44)
>>> check hosts = test.again.dns : V4NET.0.0.13
>>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
>>> test.again.dns in dns_again_means_nonexist? no (option unset)
>>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
>>> accept: condition test deferred in ACL "check_recipientb"
-LOG: H=[V4NET.0.0.13] F=<userx@???> temporarily rejected RCPT <b@???>: DNS lookup of "test.again.dns" deferred
+LOG: H=(test) [V4NET.0.0.13] F=<userx@???> temporarily rejected RCPT <b@???>: DNS lookup of "test.again.dns" deferred
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -176,11 +182,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipientc"
>>> processing "accept" (TESTSUITE/test-config 48)
>>> check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
>>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
>>> test.again.dns in dns_again_means_nonexist? no (option unset)
>>> DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
>>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
diff --git a/test/stderr/0070 b/test/stderr/0070
index b4e0021..8e6d9e5 100644
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -26,8 +26,9 @@ MUNGED: ::1 will be omitted in what follows
>>> name=ten-2.test.ex address=V4NET.0.0.2
>>> host in helo_try_verify_hosts? no (end of list)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> host in hosts_require_helo? no (end of list)
>>> using ACL "rcpt"
->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)
>>> message: helo not verified
>>> check verify = helo
>>> verifying EHLO/HELO argument "NULL"
@@ -56,7 +57,7 @@ MUNGED: ::1 will be omitted in what follows
>>> verifying EHLO/HELO argument "[V4NET.0.0.1]"
>>> HELO verification failed but host is in helo_try_verify_hosts
>>> using ACL "rcpt"
->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)
>>> message: helo not verified
>>> check verify = helo
>>> require: condition test failed in ACL "rcpt"
@@ -83,11 +84,11 @@ MUNGED: ::1 will be omitted in what follows
>>> verifying EHLO/HELO argument "[V4NET.0.0.2]"
>>> matched host address
>>> using ACL "rcpt"
->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)
>>> message: helo not verified
>>> check verify = helo
>>> require: condition test succeeded in ACL "rcpt"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> processing "deny" (TESTSUITE/test-config 26)
>>> message: helo did verify
>>> deny: condition test succeeded in ACL "rcpt"
>>> end of ACL "rcpt": DENY
@@ -201,7 +202,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_accept_junk_hosts? no (option unset)
>>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
>>> using ACL "rcpt"
->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)
>>> message: helo not verified
>>> check verify = helo
>>> verifying EHLO/HELO argument "[V4NET.0.0.99]"
@@ -227,13 +228,13 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_accept_junk_hosts? no (option unset)
>>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
>>> using ACL "rcpt"
->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)
>>> message: helo not verified
>>> check verify = helo
>>> verifying EHLO/HELO argument "[V4NET.0.0.13]"
>>> matched host address
>>> require: condition test succeeded in ACL "rcpt"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> processing "deny" (TESTSUITE/test-config 26)
>>> message: helo did verify
>>> deny: condition test succeeded in ACL "rcpt"
>>> end of ACL "rcpt": DENY
@@ -260,7 +261,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in pipelining_advertise_hosts? yes (matched "*")
>>> host in chunking_advertise_hosts? no (end of list)
>>> using ACL "rcpt"
->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)
>>> message: helo not verified
>>> check verify = helo
>>> verifying EHLO/HELO argument "rhubarb"
diff --git a/test/stderr/0077 b/test/stderr/0077
index c6362a8..a0128bd 100644
--- a/test/stderr/0077
+++ b/test/stderr/0077
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 18)
>>> check hosts = ! @ : ! localhost
@@ -31,6 +32,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 18)
>>> check hosts = ! @ : ! localhost
@@ -53,6 +55,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 18)
>>> check hosts = ! @ : ! localhost
@@ -65,4 +68,4 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "! @ : ! localhost"? yes (end of list)
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.1] F=<x@???> rejected RCPT <x@???>
+LOG: H=(test) [V4NET.0.0.1] F=<x@???> rejected RCPT <x@???>
diff --git a/test/stderr/0086 b/test/stderr/0086
index 577c2b9..77846d8 100644
--- a/test/stderr/0086
+++ b/test/stderr/0086
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 23)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -18,7 +19,7 @@
LOG: 10HmaY-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@???'
>>> deny: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": DENY
-LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@???
+LOG: 10HmaY-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@???
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -27,6 +28,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 23)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -39,7 +41,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
LOG: 10HmaZ-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@???'
>>> deny: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": DENY
-LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@???
+LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@???
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -48,6 +50,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 23)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -60,7 +63,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
LOG: 10HmbA-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Resent-To:" header is: <xyz@???'
>>> deny: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": DENY
-LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA: '>' missing at end of address: failing address in "Resent-To:" header is: <xyz@???
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> rejected after DATA: '>' missing at end of address: failing address in "Resent-To:" header is: <xyz@???
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -69,6 +72,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 23)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -81,7 +85,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
LOG: 10HmbB-0005vi-00 acl_verify_message: 'unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@??? (missing quote),\n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???'
>>> deny: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": DENY
-LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA: unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@??? (missing quote),\n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> rejected after DATA: unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@??? (missing quote),\n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???, \n longlonglonglonglong@???,\n listlistlistlistlist@???,\n ofofofofofofofofofof@???,\n addressesaddresses@???
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -90,6 +94,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 23)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -102,7 +107,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
LOG: 10HmbC-0005vi-00 acl_verify_message: 'unqualified address not permitted: failing address in "Cc:" header is: <abcd>'
>>> deny: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": DENY
-LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA: unqualified address not permitted: failing address in "Cc:" header is: <abcd>
+LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> rejected after DATA: unqualified address not permitted: failing address in "Cc:" header is: <abcd>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -111,6 +116,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 23)
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
@@ -122,4 +128,4 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> processing "accept" (TESTSUITE/test-config 21)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.10.10.9] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.10.10.9] P=smtp S=sss
diff --git a/test/stderr/0087 b/test/stderr/0087
index ec9eeb4..18eaf64 100644
--- a/test/stderr/0087
+++ b/test/stderr/0087
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -37,7 +38,7 @@
>>> processing "accept" (TESTSUITE/test-config 27)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -46,6 +47,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -77,7 +79,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> processing "accept" (TESTSUITE/test-config 27)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@??? H=(test) [V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -86,6 +88,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -119,7 +122,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> no more routers
>>> require: condition test failed in ACL "check_message"
>>> end of ACL "check_message": not OK
-LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA: there is no valid sender in any header line
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> rejected after DATA: there is no valid sender in any header line
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -128,6 +131,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA:
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -165,7 +169,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA:
>>> processing "accept" (TESTSUITE/test-config 27)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaZ-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@??? H=(test) [V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -174,6 +178,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -207,4 +212,4 @@ LOG: 10HmaZ-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> defer router: defer for defer@???
>>> message: this is a forced defer
>>> require: condition test deferred in ACL "check_message"
-LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
diff --git a/test/stderr/0091 b/test/stderr/0091
index 660477a..f105543 100644
--- a/test/stderr/0091
+++ b/test/stderr/0091
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 18)
>>> check hosts = ! V4NET.0.0.1
@@ -28,7 +29,7 @@
>>> no more routers
>>> require: condition test failed in ACL "check_message"
>>> end of ACL "check_message": not OK
-LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@???> rejected after DATA: there is no valid sender in any header line
+LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.1] F=<junk@???> rejected after DATA: there is no valid sender in any header line
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -37,6 +38,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@???> rejected after
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 18)
>>> check hosts = ! V4NET.0.0.1
@@ -49,8 +51,8 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@???> rejected after
>>> ----------- end verify ------------
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.2] sender verify fail for <junk@???>: Unrouteable address
-LOG: H=[V4NET.0.0.2] F=<junk@???> rejected RCPT <root@???>: Sender verify failed
+LOG: H=(test) [V4NET.0.0.2] sender verify fail for <junk@???>: Unrouteable address
+LOG: H=(test) [V4NET.0.0.2] F=<junk@???> rejected RCPT <root@???>: Sender verify failed
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -59,6 +61,7 @@ LOG: H=[V4NET.0.0.2] F=<junk@???> rejected RCPT <root@???>: Se
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 18)
>>> check hosts = ! V4NET.0.0.1
@@ -88,7 +91,7 @@ LOG: H=[V4NET.0.0.2] F=<junk@???> rejected RCPT <root@???>: Se
>>> no more routers
>>> require: condition test failed in ACL "check_message"
>>> end of ACL "check_message": not OK
-LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@???> rejected after DATA: there is no valid sender in any header line
+LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.2] F=<userx@???> rejected after DATA: there is no valid sender in any header line
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -97,6 +100,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@???> rejected after DATA: the
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 18)
>>> check hosts = ! V4NET.0.0.1
@@ -129,4 +133,4 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@???> rejected after DATA: the
>>> processing "accept" (TESTSUITE/test-config 25)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.0.0.2] P=smtp S=sss
diff --git a/test/stderr/0092 b/test/stderr/0092
index b97eed8..2d6b02a 100644
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -15,6 +15,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 27)
>>> check hosts = :
@@ -31,7 +32,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@???>
+LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@???>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -78,6 +79,12 @@ host in helo_accept_junk_hosts? no (option unset)
╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.0.0.1]
+sender_rcvhost = [V4NET.0.0.1] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.1]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.0.0.1]
SMTP<< mail from:userx@???
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -106,7 +113,7 @@ SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
LOG: lost_incoming_connection MAIN
- SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@???>
+ SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@???>
SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection.
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
@@ -120,6 +127,7 @@ exim: timed out while reading - message abandoned
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 27)
>>> check hosts = :
@@ -141,8 +149,8 @@ exim: timed out while reading - message abandoned
>>> ----------- end verify ------------
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.1] F=<userx@???> rejected RCPT verify@???: Unrouteable address
-LOG: SMTP command timeout on connection from [V4NET.0.0.1]
+LOG: H=(test) [V4NET.0.0.1] F=<userx@???> rejected RCPT verify@???: Unrouteable address
+LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1]
An error was detected while processing a file of BSMTP input.
The error message was:
diff --git a/test/stderr/0094 b/test/stderr/0094
index d2b8cc4..86569ec 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -8,6 +8,7 @@ LOG: no host name found for IP address V4NET.11.12.13
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check hosts = :
@@ -28,7 +29,7 @@ LOG: no host name found for IP address V4NET.11.12.13
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.11.12.13] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: H=(test) [V4NET.11.12.13] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? yes (matched "0.0.0.0/0")
>>> looking up host name for V4NET.0.0.1
@@ -60,7 +61,7 @@ LOG: H=[V4NET.11.12.13] F=<userx@???> rejected RCPT <userx@???>: rel
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -107,6 +108,11 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+sender_fullhost = oneback.test.ex (test) [V4NET.99.99.90]
+sender_rcvhost = oneback.test.ex ([V4NET.99.99.90] helo=test)
+set_process_info: pppp handling incoming connection from oneback.test.ex (test) [V4NET.99.99.90]
+SMTP>> 250 the.local.host.name Hello oneback.test.ex [V4NET.99.99.90]
SMTP<< mail from:<userx@???>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -147,10 +153,10 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=oneback.test.ex [V4NET.99.99.90] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+ H=oneback.test.ex (test) [V4NET.99.99.90] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
SMTP<< quit
SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
- SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT
+ SMTP connection from oneback.test.ex (test) [V4NET.99.99.90] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0121 b/test/stderr/0121
index f874949..d967328 100644
--- a/test/stderr/0121
+++ b/test/stderr/0121
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 21)
>>> check verify = sender
@@ -19,8 +20,8 @@
>>> ----------- end verify ------------
>>> require: condition test failed in ACL "check_recipient"
>>> end of ACL "check_recipient": not OK
-LOG: H=[127.0.0.1] sender verify fail for <unknown@???>: Unrouteable address
-LOG: H=[127.0.0.1] F=<unknown@???> rejected RCPT <userx@???>: Sender verify failed
+LOG: H=(test) [127.0.0.1] sender verify fail for <unknown@???>: Unrouteable address
+LOG: H=(test) [127.0.0.1] F=<unknown@???> rejected RCPT <userx@???>: Sender verify failed
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 21)
>>> check verify = sender
@@ -33,8 +34,8 @@ LOG: H=[127.0.0.1] F=<unknown@???> rejected RCPT <userx@???>: Sender ver
>>> ----------- end verify ------------
>>> require: condition test failed in ACL "check_recipient"
>>> end of ACL "check_recipient": not OK
-LOG: H=[127.0.0.1] sender verify fail for <userx@???>: unrouteable mail domain "unknown.dom.ain"
-LOG: H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Sender verify failed
+LOG: H=(test) [127.0.0.1] sender verify fail for <userx@???>: unrouteable mail domain "unknown.dom.ain"
+LOG: H=(test) [127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Sender verify failed
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 21)
@@ -49,8 +50,8 @@ LOG: H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Send
>>> ----------- end verify ------------
>>> require: condition test failed in ACL "check_recipient"
>>> end of ACL "check_recipient": not OK
-LOG: H=[127.0.0.1] sender verify fail for <"unknown with spaces"@???>: Unrouteable address
-LOG: H=[127.0.0.1] F=<"unknown with spaces"@???> rejected RCPT <userx@???>: Sender verify failed
+LOG: H=(test) [127.0.0.1] sender verify fail for <"unknown with spaces"@???>: Unrouteable address
+LOG: H=(test) [127.0.0.1] F=<"unknown with spaces"@???> rejected RCPT <userx@???>: Sender verify failed
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 21)
>>> check verify = sender
@@ -84,7 +85,7 @@ LOG: H=[127.0.0.1] F=<"unknown with spaces"@???> rejected RCPT <userx@???
>>> no more routers
>>> require: condition test failed in ACL "check_message"
>>> end of ACL "check_message": not OK
-LOG: 10HmaX-0005vi-00 H=[127.0.0.1] F=<userx@???> rejected after DATA: there is no valid sender in any header line
+LOG: 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<userx@???> rejected after DATA: there is no valid sender in any header line
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 21)
>>> check verify = sender
@@ -111,7 +112,7 @@ LOG: 10HmaX-0005vi-00 H=[127.0.0.1] F=<userx@???> rejected after DATA: there
>>> verifying From: header address <>
>>> require: condition test failed in ACL "check_message"
>>> end of ACL "check_message": not OK
-LOG: 10HmaY-0005vi-00 H=[127.0.0.1] F=<userx@???> rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>"
+LOG: 10HmaY-0005vi-00 H=(test) [127.0.0.1] F=<userx@???> rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>"
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 21)
>>> check verify = sender
@@ -125,8 +126,8 @@ LOG: 10HmaY-0005vi-00 H=[127.0.0.1] F=<userx@???> rejected after DATA: synta
>>> message: forced defer
>>> ----------- end verify ------------
>>> require: condition test deferred in ACL "check_recipient"
-LOG: H=[127.0.0.1] sender verify defer for <defer@???>: forced defer
-LOG: H=[127.0.0.1] F=<defer@???> temporarily rejected RCPT <userx@???>: Could not complete sender verify
+LOG: H=(test) [127.0.0.1] sender verify defer for <defer@???>: forced defer
+LOG: H=(test) [127.0.0.1] F=<defer@???> temporarily rejected RCPT <userx@???>: Could not complete sender verify
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 21)
>>> check verify = sender
@@ -160,7 +161,7 @@ LOG: H=[127.0.0.1] F=<defer@???> temporarily rejected RCPT <userx@???>:
>>> defer router: defer for defer@???
>>> message: forced defer
>>> require: condition test deferred in ACL "check_message"
-LOG: 10HmaZ-0005vi-00 H=[127.0.0.1] F=<userx@???> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
+LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F=<userx@???> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
diff --git a/test/stderr/0124 b/test/stderr/0124
index 82c1e47..a1d3cdb 100644
--- a/test/stderr/0124
+++ b/test/stderr/0124
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -28,7 +29,7 @@ LOG: no host name found for IP address V4NET.0.0.97
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.97] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: H=(test) [V4NET.0.0.97] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check hosts = :
@@ -47,4 +48,4 @@ LOG: H=[V4NET.0.0.97] F=<userx@???> rejected RCPT <userx@???>:
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.97] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
+LOG: H=(test) [V4NET.0.0.97] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
diff --git a/test/stderr/0130 b/test/stderr/0130
index c07f850..8ddb23e 100644
--- a/test/stderr/0130
+++ b/test/stderr/0130
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 21)
>>> message: unrouteable address
@@ -21,11 +22,11 @@
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=localhost address=127.0.0.1
-LOG: remote host address is the local host: not.test.ex (while verifying <userx@???> from host [V4NET.0.0.0])
+LOG: remote host address is the local host: not.test.ex (while verifying <userx@???> from host (test) [V4NET.0.0.0])
>>> islocal router: defer for userx@???
>>> message: remote host address is the local host
>>> ----------- end verify ------------
>>> deny: condition test deferred in ACL "check_recipient"
-LOG: H=[V4NET.0.0.0] F=<userx@???> temporarily rejected RCPT <userx@???>: remote host address is the local host
+LOG: H=(test) [V4NET.0.0.0] F=<userx@???> temporarily rejected RCPT <userx@???>: remote host address is the local host
LOG: MAIN
remote host address is the local host: not.test.ex (while routing <userx@???>)
diff --git a/test/stderr/0139 b/test/stderr/0139
index eb73157..6633132 100644
--- a/test/stderr/0139
+++ b/test/stderr/0139
@@ -6,8 +6,9 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> host in hosts_require_helo? no (end of list)
>>> using ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)
>>> check dnslists = rbl4.test.ex&0.0.0.6
>>> dnslists check: rbl4.test.ex&0.0.0.6
>>> new DNS lookup for 14.12.11.V4NET.rbl4.test.ex
@@ -15,32 +16,32 @@
>>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)
>>> check dnslists = rbl4.test.ex&127.0.0.3
>>> dnslists check: rbl4.test.ex&127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)
>>> check dnslists = rbl4.test.ex!&0.0.0.7
>>> dnslists check: rbl4.test.ex!&0.0.0.7
>>> dnslists: using result of previous lookup
>>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)
>>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
>>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
>>> dnslists: using result of previous lookup
>>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)
>>> accept: condition test succeeded in ACL "check_mail"
>>> end of ACL "check_mail": ACCEPT
>>> using ACL "check_recipient"
->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)
>>> message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n $dnslist_text}}
>>> check dnslists = rbl3.test.ex!=127.0.0.3
>>> dnslists check: rbl3.test.ex!=127.0.0.3
@@ -49,7 +50,7 @@
>>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
>>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
>>> warn: condition test succeeded in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)
>>> message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
>>> check dnslists = rbl3.test.ex=127.0.0.3
>>> dnslists check: rbl3.test.ex=127.0.0.3
@@ -58,7 +59,7 @@
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.3
>>> deny: condition test failed in ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 52)
+>>> processing "require" (TESTSUITE/test-config 53)
>>> check verify = sender
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing postmaster@???
@@ -73,7 +74,7 @@
>>> routed by localuser router
>>> ----------- end verify ------------
>>> require: condition test succeeded in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 53)
+>>> processing "deny" (TESTSUITE/test-config 54)
>>> message: unrouteable address
>>> check !verify = recipient
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -85,14 +86,14 @@
>>> routed by localuser router
>>> ----------- end verify ------------
>>> deny: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 55)
+>>> processing "accept" (TESTSUITE/test-config 56)
>>> check domains = +local_domains
>>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
>>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
>>> using ACL "check_recipient"
->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)
>>> message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n $dnslist_text}}
>>> check dnslists = rbl3.test.ex!=127.0.0.3
>>> dnslists check: rbl3.test.ex!=127.0.0.3
@@ -100,7 +101,7 @@
>>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
>>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
>>> warn: condition test succeeded in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)
>>> message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
>>> check dnslists = rbl3.test.ex=127.0.0.3
>>> dnslists check: rbl3.test.ex=127.0.0.3
@@ -109,11 +110,11 @@
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.3
>>> deny: condition test failed in ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 52)
+>>> processing "require" (TESTSUITE/test-config 53)
>>> check verify = sender
>>> using cached sender verify result
>>> require: condition test succeeded in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 53)
+>>> processing "deny" (TESTSUITE/test-config 54)
>>> message: unrouteable address
>>> check !verify = recipient
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -122,7 +123,7 @@
>>> routed by system_aliases router
>>> ----------- end verify ------------
>>> deny: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 55)
+>>> processing "accept" (TESTSUITE/test-config 56)
>>> check domains = +local_domains
>>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
>>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
@@ -138,8 +139,9 @@ LOG: 10HmaY-0005vi-00 <= postmaster@??? H=[V4NET.11.12.14] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> host in hosts_require_helo? no (end of list)
>>> using ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)
>>> check dnslists = rbl4.test.ex&0.0.0.6
>>> dnslists check: rbl4.test.ex&0.0.0.6
>>> new DNS lookup for 15.12.11.V4NET.rbl4.test.ex
@@ -147,32 +149,32 @@ LOG: 10HmaY-0005vi-00 <= postmaster@??? H=[V4NET.11.12.14] P=smtp S=sss
>>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)
>>> check dnslists = rbl4.test.ex&127.0.0.3
>>> dnslists check: rbl4.test.ex&127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)
>>> check dnslists = rbl4.test.ex!&0.0.0.7
>>> dnslists check: rbl4.test.ex!&0.0.0.7
>>> dnslists: using result of previous lookup
>>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)
>>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
>>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
>>> dnslists: using result of previous lookup
>>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)
>>> accept: condition test succeeded in ACL "check_mail"
>>> end of ACL "check_mail": ACCEPT
>>> using ACL "check_recipient"
->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)
>>> message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n $dnslist_text}}
>>> check dnslists = rbl3.test.ex!=127.0.0.3
>>> dnslists check: rbl3.test.ex!=127.0.0.3
@@ -182,7 +184,7 @@ LOG: 10HmaY-0005vi-00 <= postmaster@??? H=[V4NET.11.12.14] P=smtp S=sss
>>> => but we are not accepting this block class because
>>> => there was an exclude match for =127.0.0.3
>>> warn: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)
>>> message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
>>> check dnslists = rbl3.test.ex=127.0.0.3
>>> dnslists check: rbl3.test.ex=127.0.0.3
@@ -200,8 +202,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> host in hosts_require_helo? no (end of list)
>>> using ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)
>>> check dnslists = rbl4.test.ex&0.0.0.6
>>> dnslists check: rbl4.test.ex&0.0.0.6
>>> new DNS lookup for 20.12.11.V4NET.rbl4.test.ex
@@ -209,7 +212,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> DNS lookup for 20.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.6)
>>> => that means V4NET.11.12.20 is listed at rbl4.test.ex
>>> warn: condition test succeeded in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)
>>> check dnslists = rbl4.test.ex&127.0.0.3
>>> dnslists check: rbl4.test.ex&127.0.0.3
>>> dnslists: using result of previous lookup
@@ -217,7 +220,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> => but we are not accepting this block class because
>>> => there was no match for &127.0.0.3
>>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)
>>> check dnslists = rbl4.test.ex!&0.0.0.7
>>> dnslists check: rbl4.test.ex!&0.0.0.7
>>> dnslists: using result of previous lookup
@@ -226,7 +229,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> check add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched
>>> = DNSlist: rbl4.test.ex V4NET.11.12.20
>>> warn: condition test succeeded in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)
>>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
>>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
>>> dnslists: using result of previous lookup
@@ -234,7 +237,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.128
>>> warn: condition test failed in ACL "check_mail"
->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)
>>> accept: condition test succeeded in ACL "check_mail"
>>> end of ACL "check_mail": ACCEPT
>>> host in hosts_connection_nolog? no (option unset)
@@ -245,8 +248,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> host in hosts_require_helo? no (end of list)
>>> using ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)
>>> check dnslists = rbl4.test.ex&0.0.0.6
>>> dnslists check: rbl4.test.ex&0.0.0.6
>>> new DNS lookup for 21.12.11.V4NET.rbl4.test.ex
@@ -254,14 +258,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7)
>>> => that means V4NET.11.12.21 is listed at rbl4.test.ex
>>> warn: condition test succeeded in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)
>>> check dnslists = rbl4.test.ex&127.0.0.3
>>> dnslists check: rbl4.test.ex&127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7)
>>> => that means V4NET.11.12.21 is listed at rbl4.test.ex
>>> warn: condition test succeeded in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)
>>> check dnslists = rbl4.test.ex!&0.0.0.7
>>> dnslists check: rbl4.test.ex!&0.0.0.7
>>> dnslists: using result of previous lookup
@@ -269,7 +273,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> => but we are not accepting this block class because
>>> => there was an exclude match for &0.0.0.7
>>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)
>>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
>>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
>>> dnslists: using result of previous lookup
@@ -277,7 +281,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.128
>>> warn: condition test failed in ACL "check_mail"
->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)
>>> accept: condition test succeeded in ACL "check_mail"
>>> end of ACL "check_mail": ACCEPT
>>> host in hosts_connection_nolog? no (option unset)
@@ -290,7 +294,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> host in helo_accept_junk_hosts? no (option unset)
>>> a.b in helo_lookup_domains? no (end of list)
>>> using ACL "check_helo"
->>> processing "warn" (TESTSUITE/test-config 21)
+>>> processing "warn" (TESTSUITE/test-config 22)
>>> check dnslists = rbl2.test.ex!=127.0.0.3 : rbl3.test.ex=127.0.0.3
>>> dnslists check: rbl2.test.ex!=127.0.0.3
>>> new DNS lookup for 15.12.11.V4NET.rbl2.test.ex
@@ -303,7 +307,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> DNS lookup for 15.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.3)
>>> => that means V4NET.11.12.15 is listed at rbl3.test.ex
>>> warn: condition test succeeded in ACL "check_helo"
->>> processing "accept" (TESTSUITE/test-config 22)
+>>> processing "accept" (TESTSUITE/test-config 23)
>>> accept: condition test succeeded in ACL "check_helo"
>>> end of ACL "check_helo": ACCEPT
>>> host in hosts_connection_nolog? no (option unset)
@@ -316,7 +320,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> host in helo_accept_junk_hosts? no (option unset)
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
>>> check dnslists = rbl.test.ex=127.0.0.1
>>> dnslists check: rbl.test.ex=127.0.0.1
>>> new DNS lookup for 2.13.13.V4NET.rbl.test.ex
@@ -324,7 +328,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
>>> => that means V4NET.13.13.2 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
>>> check dnslists = rbl.test.ex!=127.0.0.1
>>> dnslists check: rbl.test.ex!=127.0.0.1
>>> dnslists: using result of previous lookup
@@ -332,14 +336,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> => but we are not accepting this block class because
>>> => there was an exclude match for =127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
>>> check dnslists = rbl.test.ex!=127.0.0.3
>>> dnslists check: rbl.test.ex!=127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
>>> => that means V4NET.13.13.2 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
>>> check dnslists = rbl.test.ex==127.0.0.1
>>> dnslists check: rbl.test.ex==127.0.0.1
>>> dnslists: using result of previous lookup
@@ -347,28 +351,28 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
>>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
>>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
>>> => that means V4NET.13.13.2 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
>>> check dnslists = rbl.test.ex!==127.0.0.1
>>> dnslists check: rbl.test.ex!==127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
>>> => that means V4NET.13.13.2 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
>>> check dnslists = rbl.test.ex!==127.0.0.3
>>> dnslists check: rbl.test.ex!==127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
>>> => that means V4NET.13.13.2 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
>>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
@@ -376,14 +380,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> => but we are not accepting this block class because
>>> => there were no IP addresses that did not match for ==127.0.0.1,127.0.0.2
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
>>> check dnslists = rbl.test.ex
>>> dnslists check: rbl.test.ex
>>> dnslists: using result of previous lookup
>>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
>>> => that means V4NET.13.13.2 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
>>> accept: condition test succeeded in ACL "check_vrfy"
>>> end of ACL "check_vrfy": ACCEPT
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -403,7 +407,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
>>> host in helo_accept_junk_hosts? no (option unset)
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
>>> check dnslists = rbl.test.ex=127.0.0.1
>>> dnslists check: rbl.test.ex=127.0.0.1
>>> new DNS lookup for 100.13.13.V4NET.rbl.test.ex
@@ -412,21 +416,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
>>> check dnslists = rbl.test.ex!=127.0.0.1
>>> dnslists check: rbl.test.ex!=127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
>>> => that means V4NET.13.13.100 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
>>> check dnslists = rbl.test.ex!=127.0.0.3
>>> dnslists check: rbl.test.ex!=127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
>>> => that means V4NET.13.13.100 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
>>> check dnslists = rbl.test.ex==127.0.0.1
>>> dnslists check: rbl.test.ex==127.0.0.1
>>> dnslists: using result of previous lookup
@@ -434,7 +438,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
>>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
@@ -442,35 +446,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
>>> check dnslists = rbl.test.ex!==127.0.0.1
>>> dnslists check: rbl.test.ex!==127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
>>> => that means V4NET.13.13.100 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
>>> check dnslists = rbl.test.ex!==127.0.0.3
>>> dnslists check: rbl.test.ex!==127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
>>> => that means V4NET.13.13.100 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
>>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
>>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
>>> => that means V4NET.13.13.100 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
>>> check dnslists = rbl.test.ex
>>> dnslists check: rbl.test.ex
>>> dnslists: using result of previous lookup
>>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
LOG: DNS list lookup for V4NET.13.13.100 at rbl.test.ex returned 0.0.0.0; not in 127.0/8 and discarded
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
>>> accept: condition test succeeded in ACL "check_vrfy"
>>> end of ACL "check_vrfy": ACCEPT
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -490,7 +494,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
>>> host in helo_accept_junk_hosts? no (option unset)
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
>>> check dnslists = rbl.test.ex=127.0.0.1
>>> dnslists check: rbl.test.ex=127.0.0.1
>>> new DNS lookup for 101.13.13.V4NET.rbl.test.ex
@@ -499,21 +503,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
>>> check dnslists = rbl.test.ex!=127.0.0.1
>>> dnslists check: rbl.test.ex!=127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
>>> => that means V4NET.13.13.101 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
>>> check dnslists = rbl.test.ex!=127.0.0.3
>>> dnslists check: rbl.test.ex!=127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
>>> => that means V4NET.13.13.101 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
>>> check dnslists = rbl.test.ex==127.0.0.1
>>> dnslists check: rbl.test.ex==127.0.0.1
>>> dnslists: using result of previous lookup
@@ -521,7 +525,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
>>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
@@ -529,35 +533,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
>>> check dnslists = rbl.test.ex!==127.0.0.1
>>> dnslists check: rbl.test.ex!==127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
>>> => that means V4NET.13.13.101 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
>>> check dnslists = rbl.test.ex!==127.0.0.3
>>> dnslists check: rbl.test.ex!==127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
>>> => that means V4NET.13.13.101 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
>>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
>>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
>>> => that means V4NET.13.13.101 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
>>> check dnslists = rbl.test.ex
>>> dnslists check: rbl.test.ex
>>> dnslists: using result of previous lookup
>>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
LOG: DNS list lookup for V4NET.13.13.101 at rbl.test.ex returned 126.255.255.255; not in 127.0/8 and discarded
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
>>> accept: condition test succeeded in ACL "check_vrfy"
>>> end of ACL "check_vrfy": ACCEPT
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -577,7 +581,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
>>> host in helo_accept_junk_hosts? no (option unset)
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
>>> check dnslists = rbl.test.ex=127.0.0.1
>>> dnslists check: rbl.test.ex=127.0.0.1
>>> new DNS lookup for 102.13.13.V4NET.rbl.test.ex
@@ -586,21 +590,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
>>> check dnslists = rbl.test.ex!=127.0.0.1
>>> dnslists check: rbl.test.ex!=127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
>>> => that means V4NET.13.13.102 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
>>> check dnslists = rbl.test.ex!=127.0.0.3
>>> dnslists check: rbl.test.ex!=127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
>>> => that means V4NET.13.13.102 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
>>> check dnslists = rbl.test.ex==127.0.0.1
>>> dnslists check: rbl.test.ex==127.0.0.1
>>> dnslists: using result of previous lookup
@@ -608,7 +612,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
>>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
@@ -616,35 +620,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
>>> check dnslists = rbl.test.ex!==127.0.0.1
>>> dnslists check: rbl.test.ex!==127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
>>> => that means V4NET.13.13.102 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
>>> check dnslists = rbl.test.ex!==127.0.0.3
>>> dnslists check: rbl.test.ex!==127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
>>> => that means V4NET.13.13.102 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
>>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
>>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
>>> => that means V4NET.13.13.102 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
>>> check dnslists = rbl.test.ex
>>> dnslists check: rbl.test.ex
>>> dnslists: using result of previous lookup
>>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
LOG: DNS list lookup for V4NET.13.13.102 at rbl.test.ex returned 128.0.0.0; not in 127.0/8 and discarded
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
>>> accept: condition test succeeded in ACL "check_vrfy"
>>> end of ACL "check_vrfy": ACCEPT
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -664,7 +668,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
>>> host in helo_accept_junk_hosts? no (option unset)
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
>>> check dnslists = rbl.test.ex=127.0.0.1
>>> dnslists check: rbl.test.ex=127.0.0.1
>>> new DNS lookup for 103.13.13.V4NET.rbl.test.ex
@@ -673,21 +677,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
>>> check dnslists = rbl.test.ex!=127.0.0.1
>>> dnslists check: rbl.test.ex!=127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
>>> => that means V4NET.13.13.103 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
>>> check dnslists = rbl.test.ex!=127.0.0.3
>>> dnslists check: rbl.test.ex!=127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
>>> => that means V4NET.13.13.103 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
>>> check dnslists = rbl.test.ex==127.0.0.1
>>> dnslists check: rbl.test.ex==127.0.0.1
>>> dnslists: using result of previous lookup
@@ -695,7 +699,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
>>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
@@ -703,35 +707,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
>>> check dnslists = rbl.test.ex!==127.0.0.1
>>> dnslists check: rbl.test.ex!==127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
>>> => that means V4NET.13.13.103 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
>>> check dnslists = rbl.test.ex!==127.0.0.3
>>> dnslists check: rbl.test.ex!==127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
>>> => that means V4NET.13.13.103 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
>>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
>>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
>>> => that means V4NET.13.13.103 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
>>> check dnslists = rbl.test.ex
>>> dnslists check: rbl.test.ex
>>> dnslists: using result of previous lookup
>>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
LOG: DNS list lookup for V4NET.13.13.103 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
>>> accept: condition test succeeded in ACL "check_vrfy"
>>> end of ACL "check_vrfy": ACCEPT
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -751,7 +755,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
>>> host in helo_accept_junk_hosts? no (option unset)
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
>>> check dnslists = rbl.test.ex=127.0.0.1
>>> dnslists check: rbl.test.ex=127.0.0.1
>>> new DNS lookup for 104.13.13.V4NET.rbl.test.ex
@@ -760,21 +764,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
>>> check dnslists = rbl.test.ex!=127.0.0.1
>>> dnslists check: rbl.test.ex!=127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
>>> => that means V4NET.13.13.104 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
>>> check dnslists = rbl.test.ex!=127.0.0.3
>>> dnslists check: rbl.test.ex!=127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
>>> => that means V4NET.13.13.104 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
>>> check dnslists = rbl.test.ex==127.0.0.1
>>> dnslists check: rbl.test.ex==127.0.0.1
>>> dnslists: using result of previous lookup
@@ -782,7 +786,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
>>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
@@ -790,28 +794,28 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
>>> check dnslists = rbl.test.ex!==127.0.0.1
>>> dnslists check: rbl.test.ex!==127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
>>> => that means V4NET.13.13.104 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
>>> check dnslists = rbl.test.ex!==127.0.0.3
>>> dnslists check: rbl.test.ex!==127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
>>> => that means V4NET.13.13.104 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
>>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
>>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
>>> => that means V4NET.13.13.104 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
>>> check dnslists = rbl.test.ex
>>> dnslists check: rbl.test.ex
>>> dnslists: using result of previous lookup
@@ -819,7 +823,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
LOG: DNS list lookup for V4NET.13.13.104 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
>>> => that means V4NET.13.13.104 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
>>> accept: condition test succeeded in ACL "check_vrfy"
>>> end of ACL "check_vrfy": ACCEPT
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -839,7 +843,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
>>> host in helo_accept_junk_hosts? no (option unset)
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
>>> check dnslists = rbl.test.ex=127.0.0.1
>>> dnslists check: rbl.test.ex=127.0.0.1
>>> new DNS lookup for 105.13.13.V4NET.rbl.test.ex
@@ -848,21 +852,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
>>> => but we are not accepting this block class because
>>> => there was no match for =127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
>>> check dnslists = rbl.test.ex!=127.0.0.1
>>> dnslists check: rbl.test.ex!=127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
>>> => that means V4NET.13.13.105 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
>>> check dnslists = rbl.test.ex!=127.0.0.3
>>> dnslists check: rbl.test.ex!=127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
>>> => that means V4NET.13.13.105 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
>>> check dnslists = rbl.test.ex==127.0.0.1
>>> dnslists check: rbl.test.ex==127.0.0.1
>>> dnslists: using result of previous lookup
@@ -870,7 +874,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
>>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
@@ -878,28 +882,28 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
>>> => but we are not accepting this block class because
>>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
>>> check dnslists = rbl.test.ex!==127.0.0.1
>>> dnslists check: rbl.test.ex!==127.0.0.1
>>> dnslists: using result of previous lookup
>>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
>>> => that means V4NET.13.13.105 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
>>> check dnslists = rbl.test.ex!==127.0.0.3
>>> dnslists check: rbl.test.ex!==127.0.0.3
>>> dnslists: using result of previous lookup
>>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
>>> => that means V4NET.13.13.105 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
>>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
>>> dnslists: using result of previous lookup
>>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
>>> => that means V4NET.13.13.105 is listed at rbl.test.ex
>>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
>>> check dnslists = rbl.test.ex
>>> dnslists check: rbl.test.ex
>>> dnslists: using result of previous lookup
@@ -907,7 +911,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.254; not in 127.0/8 and discarded
>>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
>>> accept: condition test succeeded in ACL "check_vrfy"
>>> end of ACL "check_vrfy": ACCEPT
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/test/stderr/0145 b/test/stderr/0145
index 79a6f4a..a117057 100644
--- a/test/stderr/0145
+++ b/test/stderr/0145
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 18)
>>> check verify = sender
@@ -19,8 +20,8 @@
>>> ----------- end verify ------------
>>> require: condition test failed in ACL "check_recipient"
>>> end of ACL "check_recipient": not OK
-LOG: H=[V4NET.9.8.7] sender verify fail for <x@???>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
-LOG: H=[V4NET.9.8.7] F=<x@???> rejected RCPT <x@y>: Sender verify failed
+LOG: H=(test) [V4NET.9.8.7] sender verify fail for <x@???>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
+LOG: H=(test) [V4NET.9.8.7] F=<x@???> rejected RCPT <x@y>: Sender verify failed
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -29,6 +30,7 @@ LOG: H=[V4NET.9.8.7] F=<x@???> rejected RCPT <x@y>: Sender verify fail
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 18)
>>> check verify = sender
@@ -51,4 +53,4 @@ LOG: H=[V4NET.9.8.7] F=<x@???> rejected RCPT <x@y>: Sender verify fail
>>> ----------- end verify ------------
>>> require: condition test failed in ACL "check_recipient"
>>> end of ACL "check_recipient": not OK
-LOG: H=[V4NET.9.8.7] F=<x@???> rejected RCPT <x@???>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
+LOG: H=(test) [V4NET.9.8.7] F=<x@???> rejected RCPT <x@???>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
diff --git a/test/stderr/0157 b/test/stderr/0157
index df37ced..f4565c7 100644
--- a/test/stderr/0157
+++ b/test/stderr/0157
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check hosts = :
@@ -24,7 +25,7 @@
>>> x@??? in "userx@???"? no (end of list)
>>> accept: condition test failed in ACL "check_recipient"
>>> accept: endpass encountered - denying access
-LOG: H=[V4NET.0.0.1] F=<x@???> rejected RCPT <a@???>: invalid sender
+LOG: H=(test) [V4NET.0.0.1] F=<x@???> rejected RCPT <a@???>: invalid sender
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check hosts = :
@@ -52,6 +53,7 @@ LOG: H=[V4NET.0.0.1] F=<x@???> rejected RCPT <a@???>: invalid sender
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check hosts = :
@@ -99,6 +101,7 @@ LOG: H=[V4NET.0.0.1] F=<x@???> rejected RCPT <a@???>: invalid sender
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check hosts = :
@@ -122,7 +125,7 @@ LOG: H=[V4NET.0.0.1] F=<x@???> rejected RCPT <a@???>: invalid sender
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.3] F=<x@???> rejected RCPT <a@???>: relay not permitted
+LOG: H=(test) [V4NET.0.0.3] F=<x@???> rejected RCPT <a@???>: relay not permitted
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check hosts = :
@@ -145,4 +148,4 @@ LOG: H=[V4NET.0.0.3] F=<x@???> rejected RCPT <a@???>: relay not permitted
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.3] F=<userx@???> rejected RCPT <a@???>: relay not permitted
+LOG: H=(test) [V4NET.0.0.3] F=<userx@???> rejected RCPT <a@???>: relay not permitted
diff --git a/test/stderr/0175 b/test/stderr/0175
index 684b2b4..014979a 100644
--- a/test/stderr/0175
+++ b/test/stderr/0175
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 18)
>>> check verify = sender
@@ -24,8 +25,8 @@ MUNGED: ::1 will be omitted in what follows
>>> ----------- end verify ------------
>>> require: condition test failed in ACL "check_recipient"
>>> end of ACL "check_recipient": not OK
-LOG: H=[V4NET.0.0.0] sender verify fail for <user@???>: remote host address is the local host
-LOG: H=[V4NET.0.0.0] F=<user@???> rejected RCPT <userx@???>: Sender verify failed
+LOG: H=(test) [V4NET.0.0.0] sender verify fail for <user@???>: remote host address is the local host
+LOG: H=(test) [V4NET.0.0.0] F=<user@???> rejected RCPT <userx@???>: Sender verify failed
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -34,6 +35,7 @@ LOG: H=[V4NET.0.0.0] F=<user@???> rejected RCPT <userx@???>: Sender v
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 18)
>>> check verify = sender
@@ -55,8 +57,8 @@ MUNGED: ::1 will be omitted in what follows
>>> ----------- end verify ------------
>>> require: condition test failed in ACL "check_recipient"
>>> end of ACL "check_recipient": not OK
-LOG: H=[V4NET.0.0.0] sender verify fail for <user@???>: fail_sender2 router forced verify failure
-LOG: H=[V4NET.0.0.0] F=<user@???> rejected RCPT <userx@???>: Sender verify failed
+LOG: H=(test) [V4NET.0.0.0] sender verify fail for <user@???>: fail_sender2 router forced verify failure
+LOG: H=(test) [V4NET.0.0.0] F=<user@???> rejected RCPT <userx@???>: Sender verify failed
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -65,6 +67,7 @@ LOG: H=[V4NET.0.0.0] F=<user@???> rejected RCPT <userx@???>: Sender
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 18)
>>> check verify = sender
@@ -91,4 +94,4 @@ LOG: H=[V4NET.0.0.0] F=<user@???> rejected RCPT <userx@???>: Sender
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= user@??? H=[V4NET.0.0.0] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= user@??? H=(test) [V4NET.0.0.0] P=smtp S=sss
diff --git a/test/stderr/0227 b/test/stderr/0227
index 36e6ee7..71b9637 100644
--- a/test/stderr/0227
+++ b/test/stderr/0227
@@ -31,9 +31,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -50,9 +50,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
+ H=(test) [V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+ H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -67,9 +67,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -85,9 +85,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -102,9 +102,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -121,7 +121,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
+ H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -139,7 +139,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550-Recipient not liked on two lines\n550 Here's the second
+ H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550-Recipient not liked on two lines\n550 Here's the second
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -156,7 +156,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked, with bad char:\200\377\377
+ H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked, with bad char:\200\377\377
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -164,7 +164,7 @@ LOG: smtp_connection MAIN
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@???>: Could not complete recipient verify callout
+ H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete recipient verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -181,7 +181,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+ H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -198,7 +198,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+ H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -222,7 +222,7 @@ Cutthrough cancelled by presence of postmaster verify
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
+ H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -246,9 +246,9 @@ Cutthrough cancelled by presence of postmaster verify
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
+ H=(test) [V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
LOG: MAIN REJECT
- H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -345,7 +345,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 250 OK
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
+ H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -354,17 +354,17 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP(closed)<<
SMTP(close)>>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
+ H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+ H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
SMTP connection from root
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+ H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+ H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
diff --git a/test/stderr/0234 b/test/stderr/0234
index ffc4406..5455bb8 100644
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check domains = +relay_domains
@@ -16,7 +17,7 @@
>>> message: relay not permitted
>>> deny: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check domains = +relay_domains
diff --git a/test/stderr/0251 b/test/stderr/0251
index a118e5c..87595bc 100644
--- a/test/stderr/0251
+++ b/test/stderr/0251
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 20)
>>> message: unrouteable address
diff --git a/test/stderr/0281 b/test/stderr/0281
index 5c58bd3..ccdf4f3 100644
--- a/test/stderr/0281
+++ b/test/stderr/0281
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_rcpt_1"
>>> processing "require" (TESTSUITE/test-config 19)
>>> message: domain doesn't match @ or @[]
@@ -31,7 +32,7 @@
>>> else.where in "@ : @[]"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_1"
>>> end of ACL "acl_rcpt_1": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@???>: domain doesn't match @ or @[]
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@???>: domain doesn't match @ or @[]
>>> using ACL "acl_rcpt_2"
>>> processing "require" (TESTSUITE/test-config 24)
>>> message: domain doesn't match @mx_any
@@ -78,7 +79,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@???>: domain doesn't match
>>> mxt9.test.ex in "@mx_any"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_2"
>>> end of ACL "acl_rcpt_2": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@???>: domain doesn't match @mx_any
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@???>: domain doesn't match @mx_any
>>> using ACL "acl_rcpt_2"
>>> processing "require" (TESTSUITE/test-config 24)
>>> message: domain doesn't match @mx_any
@@ -86,7 +87,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@???>: domain doesn't matc
>>> mxnone.test.ex in "@mx_any"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_2"
>>> end of ACL "acl_rcpt_2": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@???>: domain doesn't match @mx_any
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@???>: domain doesn't match @mx_any
>>> using ACL "acl_rcpt_3"
>>> processing "require" (TESTSUITE/test-config 29)
>>> message: domain doesn't match @mx_primary
@@ -112,7 +113,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@???>: domain doesn't ma
>>> mxt6.test.ex in "@mx_primary"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_3"
>>> end of ACL "acl_rcpt_3": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't match @mx_primary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't match @mx_primary
>>> using ACL "acl_rcpt_3"
>>> processing "require" (TESTSUITE/test-config 29)
>>> message: domain doesn't match @mx_primary
@@ -123,7 +124,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't matc
>>> mxt9.test.ex in "@mx_primary"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_3"
>>> end of ACL "acl_rcpt_3": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't match @mx_primary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't match @mx_primary
>>> using ACL "acl_rcpt_3"
>>> processing "require" (TESTSUITE/test-config 29)
>>> message: domain doesn't match @mx_primary
@@ -131,7 +132,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't matc
>>> mxnone.test.ex in "@mx_primary"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_3"
>>> end of ACL "acl_rcpt_3": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't match @mx_primary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't match @mx_primary
>>> using ACL "acl_rcpt_4"
>>> processing "require" (TESTSUITE/test-config 34)
>>> message: domain doesn't match @mx_secondary
@@ -141,7 +142,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't ma
>>> mxt5.test.ex in "@mx_secondary"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_4"
>>> end of ACL "acl_rcpt_4": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@???>: domain doesn't match @mx_secondary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@???>: domain doesn't match @mx_secondary
>>> using ACL "acl_rcpt_4"
>>> processing "require" (TESTSUITE/test-config 34)
>>> message: domain doesn't match @mx_secondary
@@ -167,7 +168,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@???>: domain doesn't matc
>>> mxt9.test.ex in "@mx_secondary"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_4"
>>> end of ACL "acl_rcpt_4": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@???>: domain doesn't match @mx_secondary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@???>: domain doesn't match @mx_secondary
>>> using ACL "acl_rcpt_4"
>>> processing "require" (TESTSUITE/test-config 34)
>>> message: domain doesn't match @mx_secondary
@@ -175,7 +176,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@???>: domain doesn't matc
>>> mxnone.test.ex in "@mx_secondary"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_4"
>>> end of ACL "acl_rcpt_4": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@???>: domain doesn't match @mx_secondary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@???>: domain doesn't match @mx_secondary
>>> using ACL "acl_rcpt_5"
>>> processing "require" (TESTSUITE/test-config 39)
>>> message: host doesn't match @ or @[]
@@ -186,7 +187,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "@ : @[]"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_5"
>>> end of ACL "acl_rcpt_5": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@???>: host doesn't match @ or @[]
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <5@???>: host doesn't match @ or @[]
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -195,6 +196,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@???>: host doesn't matc
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_rcpt_5"
>>> processing "require" (TESTSUITE/test-config 39)
>>> message: host doesn't match @ or @[]
@@ -215,6 +217,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_rcpt_5"
>>> processing "require" (TESTSUITE/test-config 39)
>>> message: host doesn't match @ or @[]
@@ -235,6 +238,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_rcpt_2"
>>> processing "require" (TESTSUITE/test-config 24)
>>> message: domain doesn't match @mx_any
@@ -259,7 +263,7 @@ MUNGED: ::1 will be omitted in what follows
>>> mxt3.test.ex in "@mx_primary"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_3"
>>> end of ACL "acl_rcpt_3": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't match @mx_primary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@???>: domain doesn't match @mx_primary
>>> using ACL "acl_rcpt_4"
>>> processing "require" (TESTSUITE/test-config 34)
>>> message: domain doesn't match @mx_secondary
diff --git a/test/stderr/0293 b/test/stderr/0293
index a89c4b8..f12b837 100644
--- a/test/stderr/0293
+++ b/test/stderr/0293
@@ -1,14 +1,14 @@
LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: MAIN
- <= x@y U=CALLER P=local-smtp S=sss
+ <= x1@y U=CALLER P=local-smtp S=sss
delivering 10HmaX-0005vi-00
LOG: MAIN
=> one <one@z> R=r1 T=t1
LOG: MAIN
Completed
LOG: MAIN
- <= x@y U=CALLER P=local-smtp S=sss
+ <= x2@y U=CALLER P=local-smtp S=sss
LOG: delay_delivery MAIN
no immediate delivery: more than 1 messages received in one connection
LOG: MAIN REJECT
diff --git a/test/stderr/0294 b/test/stderr/0294
index c2ffd2d..8bd1e8c 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -8,6 +8,8 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -38,7 +40,8 @@ F From: x@y
Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaX-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -69,7 +72,8 @@ F From: x@y
Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaY-0005vi-00
for two@z;
@@ -109,6 +113,9 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -135,7 +142,7 @@ SMTP>> 250 Accepted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [1.2.3.4] closed by QUIT
+ SMTP connection from (test) [1.2.3.4] closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -155,6 +162,9 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -182,7 +192,7 @@ SMTP>> 250 Accepted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [V4NET.9.8.7] closed by QUIT
+ SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -194,6 +204,8 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
diff --git a/test/stderr/0304 b/test/stderr/0304
index bd33dd7..3760ef7 100644
--- a/test/stderr/0304
+++ b/test/stderr/0304
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -48,7 +49,7 @@
>>> b1@x in "b1@x"? yes (matched "b1@x")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
+LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -98,7 +99,7 @@ LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
>>> b2@x in "b2@x"? yes (matched "b2@x")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
+LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -172,7 +173,7 @@ LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
>>> abc@??? in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@???>: failed 1
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@???>: failed 1
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -180,7 +181,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@???>: failed 1
>>> abcdef@??? in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@???>: failed 1
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcdef@???>: failed 1
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -189,7 +190,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@???>: failed 1
>>> a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -265,7 +266,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
>>> x@??? in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 2
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 2
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -278,7 +279,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 2
>>> abc@??? in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@???>: failed 2
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@???>: failed 2
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -359,7 +360,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@???>: failed 2
>>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -377,7 +378,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
>>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -395,7 +396,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
>>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -482,7 +483,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
>>> x@??? in "domain.only : *.domain2.only"? yes (matched "domain.only")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 4
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 4
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -507,7 +508,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 4
>>> x@??? in "domain.only : *.domain2.only"? yes (matched "*.domain2.only")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 4
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 4
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -601,7 +602,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@???>: failed 4
>>> abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -632,7 +633,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
>>> xyz@??? in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@???>: failed 5
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@???>: failed 5
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -797,7 +798,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@???>: failed 5
>>> pqr@??? in "pqr@@"? yes (matched "pqr@@")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@???>: failed 6
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@???>: failed 6
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -913,7 +914,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@???>: failed 6
>>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -972,7 +973,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
>>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
>>> using ACL "acl1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> message: failed 1
@@ -1098,4 +1099,4 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
>>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5")
>>> deny: condition test succeeded in ACL "acl1"
>>> end of ACL "acl1": DENY
-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain7>: failed 11
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain7>: failed 11
diff --git a/test/stderr/0305 b/test/stderr/0305
index 4576166..9eaa813 100644
--- a/test/stderr/0305
+++ b/test/stderr/0305
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl1"
>>> processing "accept" (TESTSUITE/test-config 18)
>>> check domains = +ok_domains
@@ -20,4 +21,4 @@
>>> junk.junk in "+ok_domains"? no (end of list)
>>> accept: condition test failed in ACL "acl1"
>>> end of ACL "acl1": implicit DENY
-LOG: H=[V4NET.2.3.4] F=<x@y> rejected RCPT <x@???>
+LOG: H=(test) [V4NET.2.3.4] F=<x@y> rejected RCPT <x@???>
diff --git a/test/stderr/0306 b/test/stderr/0306
index e8e7d46..ff95f97 100644
--- a/test/stderr/0306
+++ b/test/stderr/0306
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "rcpt"
>>> processing "accept" (TESTSUITE/test-config 18)
>>> check verify = recipient
@@ -51,7 +52,7 @@
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "rcpt"
>>> accept: endpass encountered - denying access
-LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@???>: list1@??? is a closed mailing list
+LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@???>: list1@??? is a closed mailing list
>>> using ACL "rcpt"
>>> processing "accept" (TESTSUITE/test-config 18)
>>> check verify = recipient
@@ -68,4 +69,4 @@ LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@???>: list1@
>>> ----------- end verify ------------
>>> accept: condition test failed in ACL "rcpt"
>>> accept: endpass encountered - denying access
-LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@???>: nonlist@??? is a closed mailing list
+LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@???>: nonlist@??? is a closed mailing list
diff --git a/test/stderr/0308 b/test/stderr/0308
index 091b395..130c028 100644
--- a/test/stderr/0308
+++ b/test/stderr/0308
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_V4NET_0_0"
>>> processing "accept" (TESTSUITE/test-config 17)
>>> check hosts = *.test.ex
@@ -27,6 +28,7 @@ LOG: no host name found for IP address V4NET.0.0.97
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_V4NET_0_0"
>>> processing "accept" (TESTSUITE/test-config 17)
>>> check hosts = *.test.ex
diff --git a/test/stderr/0312 b/test/stderr/0312
index 9b14715..22055ad 100644
--- a/test/stderr/0312
+++ b/test/stderr/0312
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_rcpt"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> check dnslists = +defer_unknown : test.again.dns
@@ -16,4 +17,4 @@
>>> dnslists: wrote cache entry, ttl=3600
LOG: DNS list lookup defer (probably timeout) for 1.0.0.V4NET.test.again.dns: returned DEFER
>>> deny: condition test deferred in ACL "check_rcpt"
-LOG: H=[V4NET.0.0.1] F=<userx@x> temporarily rejected RCPT <userx@y>
+LOG: H=(test) [V4NET.0.0.1] F=<userx@x> temporarily rejected RCPT <userx@y>
diff --git a/test/stderr/0325 b/test/stderr/0325
index a9d8eb1..8ebefff 100644
--- a/test/stderr/0325
+++ b/test/stderr/0325
@@ -14,6 +14,7 @@ r4: $local_part_data = LOCAL PART DATA
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "a1"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> check domains = +test_domains
@@ -33,4 +34,4 @@ r4: $local_part_data = LOCAL PART DATA
>>> message: \$domain_data=$domain_data \$local_part_data=$local_part_data
>>> deny: condition test succeeded in ACL "a1"
>>> end of ACL "a1": DENY
-LOG: H=[V4NET.0.0.0] F=<a@???> rejected RCPT xxx@???: $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA
+LOG: H=(test) [V4NET.0.0.0] F=<a@???> rejected RCPT xxx@???: $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA
diff --git a/test/stderr/0342 b/test/stderr/0342
index 3f9891c..3739f79 100644
--- a/test/stderr/0342
+++ b/test/stderr/0342
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_rcpt"
>>> processing "deny" (TESTSUITE/test-config 17)
>>> message: unverifiable
diff --git a/test/stderr/0362 b/test/stderr/0362
index 3c6259b..39fe096 100644
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -24,6 +24,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.0.0.0]
+sender_rcvhost = [V4NET.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.0]
+SMTP>> 250 the.local.host.name Hello test [V4NET.0.0.0]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -82,6 +88,6 @@ SMTP>> 250 Accepted
SMTP<< quit
SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
- SMTP connection from [V4NET.0.0.0] closed by QUIT
+ SMTP connection from (test) [V4NET.0.0.0] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0372 b/test/stderr/0372
index 096049e..abec969 100644
--- a/test/stderr/0372
+++ b/test/stderr/0372
@@ -1,7 +1,7 @@
LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: MAIN
- <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+ <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss
delivering 10HmaY-0005vi-00
----- System filter -----
acl_c0="value for c0 is ip: 1.2.3.4"
@@ -62,7 +62,7 @@ LOG: MAIN
LOG: MAIN
Completed
LOG: MAIN
- <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+ <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss
delivering 10HmaZ-0005vi-00
----- System filter -----
acl_c0="value for c0 is ip: 1.2.3.4"
diff --git a/test/stderr/0376 b/test/stderr/0376
index 7315bec..96c8347 100644
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -62,10 +62,10 @@ callout cache: address record expired for ok@localhost
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 complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+ H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 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 F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+ H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -98,9 +98,9 @@ wrote callout cache domain record for localhost:
result=1 postmaster=0 random=0
wrote negative callout cache address record for bad@localhost
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -119,9 +119,9 @@ callout cache: found domain record for localhost
callout cache: found address record for bad@localhost
callout cache: address record is negative
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -151,9 +151,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
wrote callout cache domain record for localhost:
result=3 postmaster=0 random=0
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -171,9 +171,9 @@ Attempting full verification using callout
callout cache: found domain record for localhost
callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -213,9 +213,9 @@ wrote callout cache domain record for otherhost:
result=1 postmaster=2 random=0
wrote positive callout cache address record for ok@otherhost
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
+ H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -233,9 +233,9 @@ Attempting full verification using callout
callout cache: found domain record for otherhost
callout cache: domain does not accept RCPT TO:<postmaster@domain>
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+ H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -661,9 +661,9 @@ SMTP timeout
wrote callout cache domain record for otherhost51:
result=1 postmaster=0 random=0
LOG: MAIN REJECT
- H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+ H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
LOG: MAIN REJECT
- H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+ H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -735,7 +735,7 @@ wrote callout cache domain record for x.y.z:
result=1 postmaster=0 random=0
wrote positive callout cache address record for abcd@???/<somesender@???>
LOG: MAIN
- <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
+ <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -767,7 +767,7 @@ SMTP timeout
wrote callout cache domain record for x.y.z:
result=1 postmaster=0 random=0
LOG: MAIN
- <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+ <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0381 b/test/stderr/0381
index 0edf18c..19c4e8a 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -27,6 +27,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.99.99.97]
+sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER)
+set_process_info: pppp handling incoming connection from (test) [V4NET.99.99.97] U=CALLER
+SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.99.99.97]
SMTP<< mail from:<notgov@???>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -53,8 +59,9 @@ x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx
checking addresses for x.co.uk.test.ex
Forward DNS security status: unverified
V4NET.99.99.97 OK
-sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
-sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
+sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
+sender_rcvhost = x.gov.uk.test.ex
+ ([V4NET.99.99.97] helo=test ident=CALLER)
host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
warn: condition test succeeded in ACL "check_rcpt"
processing "warn" (TESTSUITE/test-config 18)
diff --git a/test/stderr/0386 b/test/stderr/0386
index 8b0ca46..a94214b 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -27,6 +27,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.9.8.7]
+sender_rcvhost = [V4NET.9.8.7] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -80,7 +86,7 @@ accept: condition test failed in ACL "chk_rcpt"
accept: endpass encountered - denying access
SMTP>> 550 No such user here
LOG: MAIN REJECT
- H=[V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here
+ H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here
SMTP<< rset
SMTP>> 250 Reset OK
SMTP<< mail from:<x@y>
@@ -135,11 +141,11 @@ accept: condition test failed in ACL "chk_rcpt"
accept: endpass encountered - denying access
SMTP>> 550 No such user here
LOG: MAIN REJECT
- H=[V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here
+ H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [V4NET.9.8.7] closed by QUIT
+ SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -173,6 +179,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.11.12.13]
+sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER)
+set_process_info: pppp handling incoming connection from (test) [V4NET.11.12.13] U=CALLER
+SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.11.12.13]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -203,7 +215,7 @@ DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded
=> that means V4NET.11.12.13 is listed at rbl.test.ex
warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
LOG: MAIN
- H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
+ H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
created log directory TESTSUITE/spool/log
processing "accept" (TESTSUITE/test-config 44)
accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
@@ -222,7 +234,7 @@ search_tidyup called
Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
-P Received: from [V4NET.11.12.13] (ident=CALLER)
+P Received: from [V4NET.11.12.13] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaX-0005vi-00
@@ -237,7 +249,7 @@ DSN: **** SPOOL_OUT - address: <2@b> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0
Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
LOG: MAIN
- <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+ <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss
SMTP>> 250 OK id=10HmaX-0005vi-00
search_tidyup called
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
@@ -257,8 +269,8 @@ set_process_info: pppp delivering 10HmaX-0005vi-00
Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
reading spool file 10HmaX-0005vi-00-H
user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
-sender_fullhost = [V4NET.11.12.13]
-sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
+sender_fullhost = (test) [V4NET.11.12.13]
+sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER)
sender_local=0 ident=CALLER
Non-recipients:
Empty Tree
@@ -394,7 +406,7 @@ DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
=> that means V4NET.11.12.13 is listed at rbl.test.ex
warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
LOG: MAIN
- H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
+ H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
processing "accept" (TESTSUITE/test-config 44)
accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT
@@ -412,7 +424,7 @@ search_tidyup called
Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
-P Received: from [V4NET.11.12.13] (ident=CALLER)
+P Received: from [V4NET.11.12.13] (helo=test ident=CALLER)
by myhost.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaY-0005vi-00
@@ -427,7 +439,7 @@ DSN: **** SPOOL_OUT - address: <2@b> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0
Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
LOG: MAIN
- <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+ <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss
SMTP>> 250 OK id=10HmaY-0005vi-00
search_tidyup called
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
@@ -447,8 +459,8 @@ set_process_info: pppp delivering 10HmaY-0005vi-00
Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D
reading spool file 10HmaY-0005vi-00-H
user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
-sender_fullhost = [V4NET.11.12.13]
-sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
+sender_fullhost = (test) [V4NET.11.12.13]
+sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER)
sender_local=0 ident=CALLER
Non-recipients:
Empty Tree
diff --git a/test/stderr/0391 b/test/stderr/0391
index 8bfb228..8c76173 100644
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]
SMTP<< mail from:<U@???>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -62,6 +68,6 @@ SMTP>> 250 Accepted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [1.2.3.4] closed by QUIT
+ SMTP connection from (test) [1.2.3.4] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0395 b/test/stderr/0395
index 503b963..964ce92 100644
--- a/test/stderr/0395
+++ b/test/stderr/0395
@@ -3,8 +3,8 @@ The error message was:
501 sender address must contain a domain
-The SMTP transaction started in line 0.
-The error was detected in line 1.
+The SMTP transaction started in line 1.
+The error was detected in line 2.
The SMTP command at fault was:
mail from: userx
@@ -16,8 +16,8 @@ The error message was:
501 recipient address must contain a domain
-The SMTP transaction started in line 0.
-The error was detected in line 2.
+The SMTP transaction started in line 1.
+The error was detected in line 3.
The SMTP command at fault was:
rcpt to: userx
diff --git a/test/stderr/0396 b/test/stderr/0396
index 6afac4c..60661f8 100644
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -13,6 +13,8 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 the.local.host.name Hello CALLER at test
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
diff --git a/test/stderr/0398 b/test/stderr/0398
index d4f6a1c..d14f105 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -15,6 +15,8 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 mail.test.ex Hello CALLER at test
SMTP<< mail from:<qq@remote>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
diff --git a/test/stderr/0432 b/test/stderr/0432
index da8c0b5..2f55fa2 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "mail"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check verify = sender/callout=1s,maxwait=1s
@@ -47,6 +48,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -130,7 +137,7 @@ SMTP>> 250 OK
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [1.2.3.4] closed by QUIT
+ SMTP connection from (test) [1.2.3.4] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -157,6 +164,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -208,7 +221,7 @@ SMTP>> 250 OK
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [1.2.3.4] closed by QUIT
+ SMTP connection from (test) [1.2.3.4] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
>>> host in hosts_connection_nolog? no (option unset)
@@ -219,6 +232,7 @@ search_tidyup called
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "mail"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check verify = sender/callout=1s,maxwait=1s
@@ -245,6 +259,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "mail"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check verify = sender/callout=1s,maxwait=1s
@@ -291,6 +306,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "mail"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check verify = sender/callout=1s,maxwait=1s
@@ -315,5 +331,5 @@ MUNGED: ::1 will be omitted in what follows
>>> SMTP timeout
>>> ----------- end verify ------------
>>> accept: condition test deferred in ACL "mail"
-LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex
-LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout
+LOG: H=(test) [1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex
+LOG: H=(test) [1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout
diff --git a/test/stderr/0443 b/test/stderr/0443
index 2911efa..974eb9a 100644
--- a/test/stderr/0443
+++ b/test/stderr/0443
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "rcpt"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check verify = sender/callout=1s
@@ -20,5 +21,5 @@
>>> cannot callout via null transport
>>> ----------- end verify ------------
>>> accept: condition test deferred in ACL "rcpt"
-LOG: H=[V4NET.0.0.1] sender verify defer for <x@???>: Could not complete sender verify callout
-LOG: H=[V4NET.0.0.1] F=<x@???> temporarily rejected RCPT x@y: Could not complete sender verify callout
+LOG: H=(test) [V4NET.0.0.1] sender verify defer for <x@???>: Could not complete sender verify callout
+LOG: H=(test) [V4NET.0.0.1] F=<x@???> temporarily rejected RCPT x@y: Could not complete sender verify callout
diff --git a/test/stderr/0445 b/test/stderr/0445
index f493eda..38410b7 100644
--- a/test/stderr/0445
+++ b/test/stderr/0445
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "rcpt"
>>> processing "deny" (TESTSUITE/test-config 20)
>>> check !verify = sender
@@ -17,8 +18,8 @@
>>> ----------- end verify ------------
>>> deny: condition test succeeded in ACL "rcpt"
>>> end of ACL "rcpt": DENY
-LOG: H=[1.2.3.4] sender verify fail for <lp1@???>:
-LOG: H=[1.2.3.4] F=<lp1@???> rejected RCPT <zz@???>: Sender verify failed
+LOG: H=(test) [1.2.3.4] sender verify fail for <lp1@???>:
+LOG: H=(test) [1.2.3.4] F=<lp1@???> rejected RCPT <zz@???>: Sender verify failed
>>> using ACL "rcpt"
>>> processing "deny" (TESTSUITE/test-config 20)
>>> check !verify = sender
@@ -30,5 +31,5 @@ LOG: H=[1.2.3.4] F=<lp1@???> rejected RCPT <zz@???>: Sender verify failed
>>> ----------- end verify ------------
>>> deny: condition test succeeded in ACL "rcpt"
>>> end of ACL "rcpt": DENY
-LOG: H=[1.2.3.4] sender verify fail for <lp2@???>: This is a message
-LOG: H=[1.2.3.4] F=<lp2@???> rejected RCPT <zz@???>: Sender verify failed
+LOG: H=(test) [1.2.3.4] sender verify fail for <lp2@???>: This is a message
+LOG: H=(test) [1.2.3.4] F=<lp2@???> rejected RCPT <zz@???>: Sender verify failed
diff --git a/test/stderr/0462 b/test/stderr/0462
index 7ec8ded..0cf9bd4 100644
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -34,10 +34,10 @@ wrote callout cache domain record for localhost:
result=1 postmaster=2 random=0
wrote positive callout cache address record for Ok@localhost
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
created log directory TESTSUITE/spool/log
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@???>: Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@???>: Sender verify failed
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Verifying Ok@localhost
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -78,9 +78,9 @@ wrote callout cache domain record for elsewhere:
result=1 postmaster=0 random=0
wrote negative callout cache address record for NOTok@elsewhere
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
+ H=(test) [V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
+ H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -113,7 +113,7 @@ wrote callout cache domain record for elsewhere:
result=1 postmaster=0 random=0
wrote negative callout cache address record for NOTok2@elsewhere
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
+ H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0464 b/test/stderr/0464
index c156e87..c77aa97 100644
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -13,6 +13,8 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
diff --git a/test/stderr/0465 b/test/stderr/0465
index bef0e02..c1dc823 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -16,6 +16,8 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -49,6 +51,8 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -75,7 +79,8 @@ I Message-Id: <E10HmaY-0005vi-00@???>
Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaY-0005vi-00
for abc@domain;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -117,6 +122,8 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
SMTP<< mail from:<>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -143,7 +150,8 @@ I Message-Id: <E10HmaX-0005vi-00@???>
Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaX-0005vi-00
for abc@xyz;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stderr/0475 b/test/stderr/0475
index 6225b4d..c4df1ad 100644
--- a/test/stderr/0475
+++ b/test/stderr/0475
@@ -6,17 +6,18 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "a1"
>>> processing "deny" (TESTSUITE/test-config 16)
>>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8
LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8"
>>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? list match deferred for <; 1.2.3.4:5.6.7.8
>>> deny: condition test deferred in ACL "a1"
-LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"
+LOG: H=(test) [V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"
>>> using ACL "a2"
>>> processing "deny" (TESTSUITE/test-config 19)
>>> check hosts = 1.2.3/24
>>> host in "1.2.3/24"? no (malformed IPv4 address or address mask)
>>> deny: condition test failed in ACL "a2"
>>> end of ACL "a2": implicit DENY
-LOG: H=[V4NET.0.0.0] F=<> rejected RCPT <a2@b>
+LOG: H=(test) [V4NET.0.0.0] F=<> rejected RCPT <a2@b>
diff --git a/test/stderr/0569 b/test/stderr/0569
index 78ef6d3..4799df0 100644
--- a/test/stderr/0569
+++ b/test/stderr/0569
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_from"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check senders = usery@???
@@ -26,7 +27,7 @@
>>> processing "accept" (TESTSUITE/test-config 27)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -35,6 +36,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_from"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check senders = usery@???
@@ -53,7 +55,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> check verify = header_names_ascii
>>> require: condition test failed in ACL "check_message"
>>> end of ACL "check_message": not OK
-LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA: Invalid character in header "Received" found
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> rejected after DATA: Invalid character in header "Received" found
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -62,6 +64,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_from"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check senders = usery@???
@@ -80,7 +83,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> check verify = header_names_ascii
>>> require: condition test failed in ACL "check_message"
>>> end of ACL "check_message": not OK
-LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@???> rejected after DATA: Invalid character in header "Subjec⍅" found
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@???> rejected after DATA: Invalid character in header "Subjec⍅" found
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -89,6 +92,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@???> rejected after D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_from"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check senders = usery@???
@@ -107,7 +111,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@???> rejected after D
>>> check verify = header_names_ascii
>>> require: condition test failed in ACL "check_message"
>>> end of ACL "check_message": not OK
-LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after DATA: Invalid character in header "Subjec⍅" found
+LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@???> rejected after DATA: Invalid character in header "Subjec⍅" found
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -116,6 +120,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_from"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check senders = usery@???
@@ -136,7 +141,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@???> rejected after D
>>> processing "accept" (TESTSUITE/test-config 27)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@??? H=(test) [V4NET.10.10.10] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -145,6 +150,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_from"
>>> processing "accept" (TESTSUITE/test-config 20)
>>> check senders = usery@???
@@ -165,4 +171,4 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
>>> processing "accept" (TESTSUITE/test-config 27)
>>> accept: condition test succeeded in ACL "check_message"
>>> end of ACL "check_message": ACCEPT
-LOG: 10HmaZ-0005vi-00 <= userx@??? H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@??? H=(test) [V4NET.10.10.10] P=smtp S=sss
diff --git a/test/stderr/0575 b/test/stderr/0575
index 845b2c3..17f5004 100644
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.0.0.0]
+sender_rcvhost = [V4NET.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.0]
+SMTP>> 250 mail.test.ex Hello test [V4NET.0.0.0]
SMTP<< mail from:<x@y>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -42,19 +48,19 @@ search_tidyup called
Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
-P Received: from [V4NET.0.0.0]
+P Received: from [V4NET.0.0.0] (helo=test)
by mail.test.ex with smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaX-0005vi-00
for x@y;
Tue, 2 Mar 1999 09:44:33 +0000
LOG: MAIN
- <= x@y H=[V4NET.0.0.0] P=smtp S=sss
+ <= x@y H=(test) [V4NET.0.0.0] P=smtp S=sss
SMTP>> 250 OK id=10HmaX-0005vi-00
smtp_setup_msg entered
SMTP<< quit
SMTP>> 221 mail.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [V4NET.0.0.0] closed by QUIT
+ SMTP connection from (test) [V4NET.0.0.0] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0578 b/test/stderr/0578
index 8a34234..3be9e2a 100644
--- a/test/stderr/0578
+++ b/test/stderr/0578
@@ -64,10 +64,10 @@ callout cache: address record expired for ok@localhost
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 complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+ H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 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 F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+ H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -102,9 +102,9 @@ wrote callout cache domain record for localhost:
result=1 postmaster=0 random=0
wrote negative callout cache address record for bad@localhost
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -123,9 +123,9 @@ callout cache: found domain record for localhost
callout cache: found address record for bad@localhost
callout cache: address record is negative
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -159,9 +159,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
wrote callout cache domain record for localhost:
result=3 postmaster=0 random=0
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -179,9 +179,9 @@ Attempting full verification using callout
callout cache: found domain record for localhost
callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+ H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
LOG: MAIN REJECT
- H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
+ H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -223,9 +223,9 @@ wrote callout cache domain record for otherhost:
result=1 postmaster=2 random=0
wrote positive callout cache address record for ok@otherhost
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
+ H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -243,9 +243,9 @@ Attempting full verification using callout
callout cache: found domain record for otherhost
callout cache: domain does not accept RCPT TO:<postmaster@domain>
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+ H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
LOG: MAIN REJECT
- H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
+ H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -691,9 +691,9 @@ SMTP timeout
wrote callout cache domain record for otherhost51:
result=1 postmaster=0 random=0
LOG: MAIN REJECT
- H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+ H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
LOG: MAIN REJECT
- H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+ H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -769,7 +769,7 @@ wrote callout cache domain record for x.y.z:
result=1 postmaster=0 random=0
wrote positive callout cache address record for abcd@???/<somesender@???>
LOG: MAIN
- <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
+ <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -803,7 +803,7 @@ SMTP timeout
wrote callout cache domain record for x.y.z:
result=1 postmaster=0 random=0
LOG: MAIN
- <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+ <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0584 b/test/stderr/0584
index d3e854e..73a584a 100644
--- a/test/stderr/0584
+++ b/test/stderr/0584
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 20)
>>> check verify = sender=userx@???
@@ -20,7 +21,7 @@
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
>>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@??? H=(test) [127.0.0.1] P=smtp S=sss
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -29,6 +30,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtp S=sss
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 20)
>>> check verify = sender=fail@???
@@ -39,8 +41,8 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtp S=sss
>>> ----------- end verify ------------
>>> require: condition test failed in ACL "check_recipient"
>>> end of ACL "check_recipient": not OK
-LOG: H=[127.0.0.1] sender verify fail for <fail@???>: Unrouteable address
-LOG: H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Sender verify failed
+LOG: H=(test) [127.0.0.1] sender verify fail for <fail@???>: Unrouteable address
+LOG: H=(test) [127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Sender verify failed
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -49,6 +51,7 @@ LOG: H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Sender verif
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "require" (TESTSUITE/test-config 20)
>>> check verify = sender=$sender_address/defer_ok
@@ -64,4 +67,4 @@ LOG: H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Sender verif
>>> accept: condition test succeeded in ACL "check_recipient"
>>> end of ACL "check_recipient": ACCEPT
>>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@??? H=(test) [127.0.0.1] P=smtp S=sss
diff --git a/test/stderr/0609 b/test/stderr/0609
index 5d6f97f..f8b8aee 100644
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -28,7 +28,7 @@ ppppp Listening...
ppppp accept: condition test succeeded in ACL "delay4_accept"
ppppp end of ACL "delay4_accept": ACCEPT
ppppp LOG: smtp_connection MAIN
-ppppp SMTP connection from [127.0.0.1] closed by QUIT
+ppppp SMTP connection from (test) [127.0.0.1] closed by QUIT
ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
ppppp child ppppp ended: status=0x0
ppppp normal exit, 0
@@ -47,7 +47,7 @@ ppppp delay cancelled by peer close
ppppp accept: condition test succeeded in ACL "delay4_accept"
ppppp end of ACL "delay4_accept": ACCEPT
ppppp LOG: lost_incoming_connection MAIN
-ppppp unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+ppppp unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
ppppp 1 SMTP accept process running
ppppp SIGTERM/SIGINT seen
diff --git a/test/stderr/1002 b/test/stderr/1002
index d01a05d..7e23fe7 100644
--- a/test/stderr/1002
+++ b/test/stderr/1002
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_rcpt_1"
>>> processing "require" (TESTSUITE/test-config 19)
>>> message: domain doesn't match @ or @[]
@@ -26,4 +27,4 @@
>>> mxt11a.test.ex in "<+ @mx_any/ignore=<;127.0.0.1;::1"? no (end of list)
>>> require: condition test failed in ACL "acl_rcpt_6"
>>> end of ACL "acl_rcpt_6": not OK
-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <6@???>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <6@???>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
diff --git a/test/stderr/2202 b/test/stderr/2202
index 3ce1376..9770c04 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [ip4.ip4.ip4.ip4]
+sender_rcvhost = [ip4.ip4.ip4.ip4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [ip4.ip4.ip4.ip4]
+SMTP>> 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
SMTP<< mail from:<xx@???>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -59,8 +65,8 @@ the.local.host.name ip4.ip4.ip4.ip4 mx=-1 sort=xx
checking addresses for the.local.host.name
Forward DNS security status: unverified
ip4.ip4.ip4.ip4 OK
-sender_fullhost = the.local.host.name [ip4.ip4.ip4.ip4]
-sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4])
+sender_fullhost = the.local.host.name (test) [ip4.ip4.ip4.ip4]
+sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4] helo=test)
using host_fake_gethostbyname for cioce.test.again.dns (IPv4)
DNS lookup of cioce.test.again.dns (A) using fakens
DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
@@ -70,19 +76,19 @@ DNS: couldn't fake dnsa len
DNS: no SOA record found for neg-TTL
writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1
host_fake_gethostbyname(af=inet) returned 1 (HOST_NOT_FOUND)
-no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
+no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])
LOG: host_lookup_failed MAIN
- no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
+ no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])
failed to find IP address for cioce.test.again.dns: item ignored by +ignore_unknown
host in "+ignore_unknown : *.cioce.test.again.dns : cioce.test.again.dns : "? no (end of list)
accept: condition test failed in ACL "rcpt"
end of ACL "rcpt": implicit DENY
SMTP>> 550 Administrative prohibition
LOG: MAIN REJECT
- H=the.local.host.name [ip4.ip4.ip4.ip4] F=<xx@???> rejected RCPT <a@b>
+ H=the.local.host.name (test) [ip4.ip4.ip4.ip4] F=<xx@???> rejected RCPT <a@b>
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4] closed by QUIT
+ SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2600 b/test/stderr/2600
index 74dab0a..c53a5ef 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -161,6 +161,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]
SMTP<< mail from:<a@b>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -193,7 +199,7 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+ H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
SMTP<< rcpt to:<c@d>
using ACL "check_recipient"
processing "accept" (TESTSUITE/test-config 32)
@@ -223,11 +229,11 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+ H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.0.0.0] closed by QUIT
+ SMTP connection from (test) [10.0.0.0] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -256,6 +262,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]
SMTP<< mail from:<a@b>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -288,7 +300,7 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+ H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
SMTP<< rcpt to:<c@d>
using ACL "check_recipient"
processing "accept" (TESTSUITE/test-config 32)
@@ -318,11 +330,11 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+ H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.0.0.0] closed by QUIT
+ SMTP connection from (test) [10.0.0.0] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -351,6 +363,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.10.10.10]
+sender_rcvhost = [10.10.10.10] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.10.10.10]
+SMTP>> 250 myhost.test.ex Hello test [10.10.10.10]
SMTP<< mail from:<a@b>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -406,7 +424,7 @@ SMTP>> 250 Accepted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.10.10.10] closed by QUIT
+ SMTP connection from (test) [10.10.10.10] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
diff --git a/test/stderr/2610 b/test/stderr/2610
index c768cb3..fdda3b2 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -254,6 +254,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]
SMTP<< mail from:<a@b>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -317,7 +323,7 @@ check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223 {select name
lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
processing "warn" (TESTSUITE/test-config 36)
check set acl_m0 = ok: hostlist
check hosts = net-mysql;select * from them where id='$local_part'
@@ -352,7 +358,7 @@ lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
host in "<& net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
processing "warn" (TESTSUITE/test-config 44)
check set acl_m0 = FAIL: hostlist
check hosts = <& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='$local_part'
@@ -369,7 +375,7 @@ lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
host in "<& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
processing "accept" (TESTSUITE/test-config 47)
check domains = +local_domains
d in "@"? no (end of list)
@@ -399,11 +405,11 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+ H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.0.0.0] closed by QUIT
+ SMTP connection from (test) [10.0.0.0] closed by QUIT
search_tidyup called
close MYSQL connection: 127.0.0.1:1223/test/root
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2620 b/test/stderr/2620
index a132711..620aa86 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -240,6 +240,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]
SMTP<< mail from:<a@b>
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -273,7 +279,7 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the
lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
processing "warn" (TESTSUITE/test-config 38)
check set acl_m0 = ok: hostlist
check hosts = net-pgsql;select * from them where id='$local_part'
@@ -308,7 +314,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
processing "warn" (TESTSUITE/test-config 46)
check set acl_m0 = FAIL: hostlist
check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'
@@ -325,7 +331,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
processing "accept" (TESTSUITE/test-config 49)
check domains = +local_domains
d in "@"? no (end of list)
@@ -355,7 +361,7 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+ H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
SMTP<< rcpt to:<c@d>
using ACL "check_recipient"
processing "warn" (TESTSUITE/test-config 27)
@@ -382,7 +388,7 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the
lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
processing "warn" (TESTSUITE/test-config 38)
check set acl_m0 = ok: hostlist
check hosts = net-pgsql;select * from them where id='$local_part'
@@ -413,7 +419,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
processing "warn" (TESTSUITE/test-config 46)
check set acl_m0 = FAIL: hostlist
check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'
@@ -430,7 +436,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
processing "accept" (TESTSUITE/test-config 49)
check domains = +local_domains
d in "@"? no (end of list)
@@ -456,11 +462,11 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+ H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.0.0.0] closed by QUIT
+ SMTP connection from (test) [10.0.0.0] closed by QUIT
search_tidyup called
close PGSQL connection: localhost:1223/test/CALLER
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/3202 b/test/stderr/3202
index 557a0da..96d8d5f 100644
--- a/test/stderr/3202
+++ b/test/stderr/3202
@@ -6,12 +6,13 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_1_1_1"
>>> processing "accept" (TESTSUITE/test-config 17)
>>> check hosts = net-testdb;defer
>>> host in "net-testdb;defer"? list match deferred for net-testdb;defer
>>> accept: condition test deferred in ACL "acl_1_1_1"
-LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+LOG: H=(test) [1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -20,12 +21,13 @@ LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_1_1_2"
>>> processing "deny" (TESTSUITE/test-config 20)
>>> check domains = testdb;defer
>>> y in "testdb;defer"? list match deferred for testdb;defer
>>> deny: condition test deferred in ACL "acl_1_1_2"
-LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+LOG: H=(test) [1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -34,9 +36,10 @@ LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_1_1_3"
>>> processing "require" (TESTSUITE/test-config 23)
>>> check local_parts = testdb;defer
>>> x in "testdb;defer"? list match deferred for testdb;defer
>>> require: condition test deferred in ACL "acl_1_1_3"
-LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+LOG: H=(test) [1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
diff --git a/test/stderr/3204 b/test/stderr/3204
index e285f3d..cd7db8f 100644
--- a/test/stderr/3204
+++ b/test/stderr/3204
@@ -6,9 +6,10 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "deny" (TESTSUITE/test-config 17)
>>> check senders = testdb;defer
>>> userx@??? in "testdb;defer"? list match deferred for testdb;defer
>>> deny: condition test deferred in ACL "check_recipient"
-LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+LOG: H=(test) [1.2.3.4] F=<userx@???> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
diff --git a/test/stderr/3205 b/test/stderr/3205
index 012f5ae..6cc2e9c 100644
--- a/test/stderr/3205
+++ b/test/stderr/3205
@@ -6,12 +6,13 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_1_2_3_4"
>>> processing "deny" (TESTSUITE/test-config 17)
>>> check senders = testdb;defer
>>> userx@??? in "testdb;defer"? list match deferred for testdb;defer
>>> deny: condition test deferred in ACL "acl_1_2_3_4"
-LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@???>: testdb lookup forced DEFER
+LOG: H=(test) [1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@???>: testdb lookup forced DEFER
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -20,6 +21,7 @@ LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@tes
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_4_3_2_1"
>>> processing "accept" (TESTSUITE/test-config 23)
>>> check hosts = :
@@ -29,4 +31,4 @@ LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@tes
>>> check hosts = testdb;defer
>>> host in "testdb;defer"? list match deferred for testdb;defer
>>> deny: condition test deferred in ACL "acl_4_3_2_1"
-LOG: H=[4.3.2.1] F=<userx@???> temporarily rejected RCPT <userx@???>: testdb lookup forced DEFER
+LOG: H=(test) [4.3.2.1] F=<userx@???> temporarily rejected RCPT <userx@???>: testdb lookup forced DEFER
diff --git a/test/stderr/3211 b/test/stderr/3211
index 2ae0bde..37566d3 100644
--- a/test/stderr/3211
+++ b/test/stderr/3211
@@ -6,6 +6,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 17)
>>> check verify = recipient
@@ -21,7 +22,7 @@
>>> message: host lookup did not complete
>>> ----------- end verify ------------
>>> accept: condition test deferred in ACL "check_recipient"
-LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@???>: host lookup did not complete
+LOG: H=(test) [1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@???>: host lookup did not complete
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -30,6 +31,7 @@ LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@???
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "check_recipient"
>>> processing "accept" (TESTSUITE/test-config 17)
>>> check verify = recipient
@@ -43,4 +45,4 @@ LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@???
>>> message: host lookup did not complete
>>> ----------- end verify ------------
>>> accept: condition test deferred in ACL "check_recipient"
-LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <r1-userx@???>: host lookup did not complete
+LOG: H=(test) [1.2.3.4] F=<userx@???> temporarily rejected RCPT <r1-userx@???>: host lookup did not complete
diff --git a/test/stderr/3400 b/test/stderr/3400
index e5ab777..bd048d4 100644
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -14,6 +14,7 @@
>>> processing "accept" (TESTSUITE/test-config 34)
>>> accept: condition test succeeded in ACL "check_connect"
>>> end of ACL "check_connect": ACCEPT
+>>> test in helo_lookup_domains? no (end of list)
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> using ACL "check_vrfy"
>>> processing "deny" (TESTSUITE/test-config 67)
@@ -47,7 +48,7 @@
>>> test.ex in "! +local_domains"? no (matched "! +local_domains")
>>> list in "userx"? no (end of list)
>>> no more routers
-LOG: ETRN #abcd received from [10.0.0.2]
+LOG: ETRN #abcd received from (test) [10.0.0.2]
>>> using ACL "check_etrn"
>>> processing "deny" (TESTSUITE/test-config 53)
>>> check hosts = +auth_hosts
@@ -60,7 +61,7 @@ LOG: ETRN #abcd received from [10.0.0.2]
>>> processing "warn" (TESTSUITE/test-config 57)
>>> l_message: accepted ETRN $smtp_command_argument
>>> warn: condition test succeeded in ACL "check_etrn"
-LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd
+LOG: H=(test) [10.0.0.2] Warning: accepted ETRN #abcd
>>> processing "accept" (TESTSUITE/test-config 58)
>>> accept: condition test succeeded in ACL "check_etrn"
>>> end of ACL "check_etrn": ACCEPT
diff --git a/test/stderr/3410 b/test/stderr/3410
index 80cf299..a8470e9 100644
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -6,13 +6,15 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_5_6_9"
>>> processing "accept" (TESTSUITE/test-config 19)
>>> message: You must authenticate
>>> check authenticated = *
>>> accept: condition test failed in ACL "acl_5_6_9"
>>> accept: endpass encountered - denying access
-LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
+LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
+>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> rhu.barb in helo_lookup_domains? no (end of list)
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts? yes (matched "*")
@@ -41,12 +43,14 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> using ACL "acl_5_6_10"
>>> processing "accept" (TESTSUITE/test-config 24)
>>> check authenticated = auth1
>>> accept: condition test failed in ACL "acl_5_6_10"
>>> end of ACL "acl_5_6_10": implicit DENY
-LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
+>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> rhu.barb in helo_lookup_domains? no (end of list)
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts? yes (matched "*")
diff --git a/test/stderr/5820 b/test/stderr/5820
index 7d3ee56..f5dbbfa 100644
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -9,6 +9,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 88)
>>> check verify = recipient/callout
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -62,7 +63,7 @@
>>> ----------- end verify ------------
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
-LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+LOG: unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
### A server with a nonverifying cert and no TLSA
### A server with a verifying cert and no TLSA
diff --git a/test/stderr/5840 b/test/stderr/5840
index 8ece4e4..633d7c6 100644
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -9,6 +9,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains? no (end of list)
>>> processing "accept" (TESTSUITE/test-config 93)
>>> check verify = recipient/callout
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -62,7 +63,7 @@
>>> ----------- end verify ------------
>>> accept: condition test succeeded in inline ACL
>>> end of inline ACL: ACCEPT
-LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+LOG: unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
### TLSA (2 1 1)
### A server with a nonverifying cert and no TLSA
diff --git a/test/stdout/0002 b/test/stdout/0002
index 845b6b4..0b9a95c 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -985,6 +985,7 @@ xyz
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.0]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -1012,6 +1013,7 @@ xyz
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.0]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -1023,6 +1025,7 @@ xyz
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.0]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0003 b/test/stdout/0003
index 517f59f..6d08675 100644
--- a/test/stdout/0003
+++ b/test/stdout/0003
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [1.1.1.1]
250 OK
550 Administrative prohibition
250 Reset OK
diff --git a/test/stdout/0004 b/test/stdout/0004
index 5595b31..3669852 100644
--- a/test/stdout/0004
+++ b/test/stdout/0004
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [1.1.1.1]
250 OK
550 Administrative prohibition
250 Reset OK
diff --git a/test/stdout/0005 b/test/stdout/0005
index 19cdc6c..0aaf1b5 100644
--- a/test/stdout/0005
+++ b/test/stdout/0005
@@ -1,16 +1,19 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaY-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0014 b/test/stdout/0014
index 10aae73..6d377b7 100644
--- a/test/stdout/0014
+++ b/test/stdout/0014
@@ -63,6 +63,7 @@ reply-to: jules@???
env-from: "jules@???
env-to: unknown@???
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [10.0.0.2]
250 OK
550-Verification failed for <"jules@???>
550-Unrouteable mail domain "plc.example"
diff --git a/test/stdout/0022 b/test/stdout/0022
index 6dba840..311dd73 100644
--- a/test/stdout/0022
+++ b/test/stdout/0022
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -18,6 +19,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -32,6 +34,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -46,6 +49,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
451 forcibly deferred
250 Accepted
@@ -56,6 +60,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -65,6 +70,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
250 Accepted
250 Accepted
@@ -75,6 +81,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
550 host data >A host-specific message<
550 host data >A host-specific message<
@@ -82,6 +89,7 @@
550 host data >A host-specific message<
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -107,6 +115,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
550 forcibly dropped
@@ -115,6 +124,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
550 forcibly dropped
0m sss 10HmaX-0005vi-00 <CALLER@???> *** frozen ***
@@ -128,6 +138,9 @@
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<x@y>
??? 250
<<< 250 OK
diff --git a/test/stdout/0023 b/test/stdout/0023
index a835f2a..6f5af96 100644
--- a/test/stdout/0023
+++ b/test/stdout/0023
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
250 Accepted
550 Administrative prohibition
@@ -21,6 +22,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [5.6.7.8]
250 OK
550 Administrative prohibition
550 Administrative prohibition
@@ -33,6 +35,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [9.9.9.9]
250 OK
250 Accepted
250 Accepted
@@ -43,6 +46,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [9.9.9.8]
250 OK
550 don't like this host
550 don't like this host
@@ -53,6 +57,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [9.9.9.255]
250 OK
250 Accepted
250 Accepted
@@ -63,6 +68,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [5.6.8.1]
250 OK
550 Administrative prohibition
550 Administrative prohibition
@@ -87,6 +93,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [5.6.11.1]
250 OK
250 Accepted
250 Accepted
@@ -99,6 +106,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [5.6.12.1]
250 OK
250 Accepted
550 failed nested acl
@@ -109,6 +117,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [5.6.12.2]
250 OK
250 Accepted
250 Accepted
@@ -119,6 +128,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [8.8.8.8]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -128,6 +138,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [5.6.13.1]
250 OK
250 Accepted
550 Administrative prohibition
@@ -139,6 +150,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.11.12.13]
250 OK
550 host in DNS list rbl.test.ex: This is a test blacklisting message
550 host in DNS list rbl.test.ex: This is a test blacklisting message
@@ -149,6 +161,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.11.12.12]
250 OK
250 Accepted
250 Accepted
@@ -159,6 +172,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [20.20.20.20]
250 OK
550-Verification failed for <x@y>
550-Unrouteable address
@@ -171,6 +185,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [20.20.20.20]
250 OK
550 recipient verify failure
250 Accepted
@@ -181,6 +196,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [21.21.21.21]
250 OK
550 Unrouteable address
250 Accepted
@@ -203,6 +219,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [22.22.22.22]
250 OK
550 Administrative prohibition
250 Accepted
@@ -213,6 +230,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [23.23.23.0]
250 OK
550-Verification failed for <x@y>
550-Unrouteable address
@@ -227,6 +245,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [23.23.23.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -236,6 +255,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [24.24.24.24]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
@@ -245,6 +265,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [25.25.25.25]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
@@ -254,6 +275,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [26.26.26.26]
250 OK
250 Accepted
550 bounce messages can have only one recipient
@@ -265,6 +287,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [27.27.27.27]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -274,6 +297,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [28.28.28.28]
250 OK
250 Accepted
250 Reset OK
@@ -289,6 +313,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -298,6 +323,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.97]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
@@ -307,6 +333,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.99.99.96]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -316,6 +343,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.99.99.96]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -325,6 +353,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [29.29.29.29]
250 OK
550 Administrative prohibition
250 Reset OK
@@ -337,6 +366,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [30.30.30.30]
250 OK
550-domain=test.ex
550-value=V4NET.0.0.1
@@ -358,16 +388,19 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [31.31.31.31]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [32.32.32.32]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [32.32.32.32]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -379,6 +412,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [33.33.33.33]
250 OK
550 sender verify failure
550 sender verify failure
@@ -389,16 +423,19 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [44.44.44.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [55.55.55.55]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [56.56.56.56]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -441,6 +478,7 @@
250 OK id=10HmbJ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [56.56.57.57]
250 OK
250 accepted by condition
354 Enter message, ending with "." on a line by itself
@@ -454,12 +492,14 @@
250 OK id=10HmbL-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [56.56.56.56]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbM-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [56.56.58.58]
250 OK
250 Accepted
550 Administrative prohibition
@@ -471,11 +511,13 @@
250 OK id=10HmbN-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [56.56.59.59]
250 OK
550-ACL message for verification failure
550 Original was >here is a fail message<
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [V4NET.11.12.13]
250 OK
550 host in DNS list rbl.test.ex: This is a test blacklisting message
550 host in DNS list rbl.test.ex: This is a test blacklisting message
@@ -486,6 +528,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [60.60.60.60]
250 OK
250 Accepted
550 Administrative prohibition
diff --git a/test/stdout/0024 b/test/stdout/0024
index d82af4d..f4d0a7a 100644
--- a/test/stdout/0024
+++ b/test/stdout/0024
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [V4NET.0.0.0]
250 OK
250 Accepted
550-Verification failed for <x@y>
@@ -11,6 +12,7 @@
250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [V4NET.0.0.0]
250 OK
250 Accepted
250 Accepted
@@ -22,6 +24,7 @@
250 OK id=10HmaY-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [V4NET.255.255.0]
250 OK
550 unknown user
550 Unrouteable address
@@ -31,6 +34,7 @@
250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [V4NET.11.12.13]
250 OK
250 Accepted
550-rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
@@ -41,6 +45,7 @@
250 OK id=10HmbA-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [V4NET.11.12.16]
250 OK
250 Accepted
250 Accepted
@@ -49,6 +54,7 @@
250 OK id=10HmbB-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0025 b/test/stdout/0025
index a31c2d2..61e1cb5 100644
--- a/test/stdout/0025
+++ b/test/stdout/0025
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
550-Verification failed for <x@y>
550-Unrouteable address
diff --git a/test/stdout/0026 b/test/stdout/0026
index 1fac537..5d6e14f 100644
--- a/test/stdout/0026
+++ b/test/stdout/0026
@@ -1,46 +1,54 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbD-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbE-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -52,6 +60,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [10.0.0.0]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -63,24 +72,28 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [10.0.0.0]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbG-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbH-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0027 b/test/stdout/0027
index 5802969..ab6717f 100644
--- a/test/stdout/0027
+++ b/test/stdout/0027
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
550 deny for userx
550-Verification failed for <x@y>
@@ -6,11 +7,13 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
550 deny for userx
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
451 Temporary local problem - please try later
451 Temporary local problem - please try later
@@ -19,18 +22,21 @@
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0028 b/test/stdout/0028
index 7b6c710..8bbf238 100644
--- a/test/stdout/0028
+++ b/test/stdout/0028
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0029 b/test/stdout/0029
index d523784..9a0169b 100644
--- a/test/stdout/0029
+++ b/test/stdout/0029
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Reset OK
diff --git a/test/stdout/0030 b/test/stdout/0030
index e5b972d..9e8f0c2 100644
--- a/test/stdout/0030
+++ b/test/stdout/0030
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
550 >>data from accept router<<
550 <<data from redirect router>>
diff --git a/test/stdout/0034 b/test/stdout/0034
index db83cd0..950806d 100644
--- a/test/stdout/0034
+++ b/test/stdout/0034
@@ -27,6 +27,7 @@
250 HELP
554 Too many nonmail commands
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 Reset OK
250 OK
250 Accepted
diff --git a/test/stdout/0049 b/test/stdout/0049
index 152cfdb..30863f9 100644
--- a/test/stdout/0049
+++ b/test/stdout/0049
@@ -1,10 +1,12 @@
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbB-0005vi-00
221 myhost.ex closing connection
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0050 b/test/stdout/0050
index 1fc3418..dba1bfe 100644
--- a/test/stdout/0050
+++ b/test/stdout/0050
@@ -1,10 +1,12 @@
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbB-0005vi-00
221 myhost.ex closing connection
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0056 b/test/stdout/0056
index b9acb02..cc2c780 100644
--- a/test/stdout/0056
+++ b/test/stdout/0056
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0057 b/test/stdout/0057
index cb1e1b4..472e299 100644
--- a/test/stdout/0057
+++ b/test/stdout/0057
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
550 relay not permitted
diff --git a/test/stdout/0058 b/test/stdout/0058
index 7be8953..13f71dc 100644
--- a/test/stdout/0058
+++ b/test/stdout/0058
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0059 b/test/stdout/0059
index a8ee4d5..c556ae7 100644
--- a/test/stdout/0059
+++ b/test/stdout/0059
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
550 relay not permitted
diff --git a/test/stdout/0060 b/test/stdout/0060
index b240bf8..3a98b3a 100644
--- a/test/stdout/0060
+++ b/test/stdout/0060
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
250 Accepted
@@ -19,6 +20,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.0.0.2]
250 OK
250 Accepted
550 relay not permitted
@@ -34,6 +36,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.0.0.5]
250 OK
250 Accepted
250 Accepted
@@ -49,6 +52,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.0.0.6]
250 OK
250 Accepted
250 Accepted
@@ -64,6 +68,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.255.0.1]
250 OK
250 Accepted
550 relay not permitted
@@ -79,6 +84,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.255.0.2]
250 OK
250 Accepted
550 relay not permitted
@@ -94,6 +100,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.255.0.3]
250 OK
250 Accepted
550 relay not permitted
@@ -109,6 +116,7 @@
**** This is not for real!
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello test [V4NET.255.0.4]
250 OK
250 Accepted
550 relay not permitted
diff --git a/test/stdout/0061 b/test/stdout/0061
index 4ea10b0..22bda13 100644
--- a/test/stdout/0061
+++ b/test/stdout/0061
@@ -4,6 +4,7 @@
**** This is not for real!
220 ten-1.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 ten-1.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
250 Accepted
@@ -19,6 +20,7 @@
**** This is not for real!
220 ten-1.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 ten-1.test.ex Hello test [V4NET.0.0.2]
250 OK
250 Accepted
550 relay not permitted
diff --git a/test/stdout/0062 b/test/stdout/0062
index 0a709b7..69ffa5d 100644
--- a/test/stdout/0062
+++ b/test/stdout/0062
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
550 relay not permitted
@@ -19,6 +20,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.2]
250 OK
250 Accepted
250 Accepted
@@ -34,6 +36,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.3]
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0063 b/test/stdout/0063
index f9a486d..06e75e0 100644
--- a/test/stdout/0063
+++ b/test/stdout/0063
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
550 relay not permitted
@@ -19,6 +20,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.2]
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0064 b/test/stdout/0064
index f9a486d..06e75e0 100644
--- a/test/stdout/0064
+++ b/test/stdout/0064
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
550 relay not permitted
@@ -19,6 +20,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.2]
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0065 b/test/stdout/0065
index 10b3f28..c3cec01 100644
--- a/test/stdout/0065
+++ b/test/stdout/0065
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
250 Accepted
250 Accepted
@@ -19,6 +20,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.5]
250 OK
250 Accepted
550 relay not permitted
@@ -34,6 +36,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.4.5]
250 OK
250 Accepted
250 Accepted
@@ -49,6 +52,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.3.2.4]
250 OK
250 Accepted
550 relay not permitted
@@ -64,6 +68,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [131.111.8.2]
250 OK
250 Accepted
250 Accepted
@@ -79,6 +84,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [192.152.98.3]
250 OK
250 Accepted
250 Accepted
@@ -94,6 +100,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [192.153.98.4]
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0066 b/test/stdout/0066
index 2553bbf..527308e 100644
--- a/test/stdout/0066
+++ b/test/stdout/0066
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
250 Accepted
250 Accepted
@@ -19,6 +20,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.5]
250 OK
250 Accepted
550 relay not permitted
@@ -34,6 +36,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.4.5]
250 OK
250 Accepted
250 Accepted
@@ -49,6 +52,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.3.2.4]
250 OK
250 Accepted
550 relay not permitted
@@ -64,6 +68,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [131.111.8.2]
250 OK
250 Accepted
250 Accepted
@@ -79,6 +84,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [192.152.98.3]
250 OK
250 Accepted
250 Accepted
@@ -94,6 +100,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
250 Accepted
@@ -109,6 +116,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.11.12.13]
250 OK
250 Accepted
550 relay not permitted
@@ -124,6 +132,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.3]
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0067 b/test/stdout/0067
index 78ae911..49f661e 100644
--- a/test/stdout/0067
+++ b/test/stdout/0067
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
250 Accepted
250 Reset OK
diff --git a/test/stdout/0068 b/test/stdout/0068
index f974140..6f46234 100644
--- a/test/stdout/0068
+++ b/test/stdout/0068
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.10.10.10]
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0069 b/test/stdout/0069
index 6a55298..7c59218 100644
--- a/test/stdout/0069
+++ b/test/stdout/0069
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello ten-1.test.ex [V4NET.0.0.1]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
@@ -13,6 +14,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.13]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
@@ -22,6 +24,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.13]
250 OK
550 "Denied"
221 myhost.test.ex closing connection
@@ -31,6 +34,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.13]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -40,6 +44,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.13]
250 OK
550 "Denied"
221 myhost.test.ex closing connection
@@ -49,6 +54,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.13]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
@@ -58,6 +64,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.13]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -67,6 +74,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.13]
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0077 b/test/stdout/0077
index 83096cb..eeb20bd 100644
--- a/test/stdout/0077
+++ b/test/stdout/0077
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [127.0.0.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -13,6 +14,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -22,6 +24,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
diff --git a/test/stdout/0079 b/test/stdout/0079
index 4313576..5d0ea18 100644
--- a/test/stdout/0079
+++ b/test/stdout/0079
@@ -42,6 +42,7 @@
250 OK id=10HmaY-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0086 b/test/stdout/0086
index b329183..ac05e2a 100644
--- a/test/stdout/0086
+++ b/test/stdout/0086
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -15,6 +16,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -26,6 +28,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -37,6 +40,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -48,6 +52,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -59,6 +64,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.9]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0087 b/test/stdout/0087
index f9dd367..4893f48 100644
--- a/test/stdout/0087
+++ b/test/stdout/0087
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -18,6 +19,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -32,6 +34,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -43,6 +46,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -57,6 +61,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0091 b/test/stdout/0091
index 809bad0..27abdbb 100644
--- a/test/stdout/0091
+++ b/test/stdout/0091
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -15,6 +16,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.2]
250 OK
550-Verification failed for <junk@???>
550-Unrouteable address
@@ -30,6 +32,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.2]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -41,6 +44,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.2]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0092 b/test/stdout/0092
index a4df25c..ab30b24 100644
--- a/test/stdout/0092
+++ b/test/stdout/0092
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
421 myhost.test.ex: SMTP command timeout - closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -18,6 +19,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -28,6 +30,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -38,6 +41,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
550 unrouteable address
421 myhost.test.ex: SMTP command timeout - closing connection
diff --git a/test/stdout/0094 b/test/stdout/0094
index 475cfa0..0fc00a7 100644
--- a/test/stdout/0094
+++ b/test/stdout/0094
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.11.12.13]
250 OK
550 relay not permitted
221 the.local.host.name closing connection
@@ -13,10 +14,12 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello ten-1.test.ex [V4NET.0.0.1]
250 OK
550 relay not permitted
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello root at test [V4NET.11.12.13]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -28,17 +31,20 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello oneback.test.ex [V4NET.99.99.90]
250 OK
250 Accepted
550 relay not permitted
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello root at test [99.99.99.99]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaY-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello root at test [V4NET.99.99.96]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0121 b/test/stdout/0121
index d52013b..f3fda94 100644
--- a/test/stdout/0121
+++ b/test/stdout/0121
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [127.0.0.1]
250 OK
550-Verification failed for <unknown@???>
550-Unrouteable address
diff --git a/test/stdout/0124 b/test/stdout/0124
index f04d704..cbf9be0 100644
--- a/test/stdout/0124
+++ b/test/stdout/0124
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.97]
250 OK
550 relay not permitted
250 Reset OK
diff --git a/test/stdout/0127 b/test/stdout/0127
index 152cfdb..30863f9 100644
--- a/test/stdout/0127
+++ b/test/stdout/0127
@@ -1,10 +1,12 @@
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbB-0005vi-00
221 myhost.ex closing connection
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0130 b/test/stdout/0130
index de19445..31b8640 100644
--- a/test/stdout/0130
+++ b/test/stdout/0130
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.0]
250 OK
451 Temporary local problem - please try later
221 the.local.host.name closing connection
diff --git a/test/stdout/0136 b/test/stdout/0136
index 8039890..3e4577e 100644
--- a/test/stdout/0136
+++ b/test/stdout/0136
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -6,6 +7,7 @@
250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0145 b/test/stdout/0145
index 85f095c..cdbed50 100644
--- a/test/stdout/0145
+++ b/test/stdout/0145
@@ -5,6 +5,7 @@ x@??? is undeliverable: all relevant MX records point to non-existent
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
550-Verification failed for <x@???>
550-It appears that the DNS operator for mxt10.test.ex
@@ -18,6 +19,7 @@ x@??? is undeliverable: all relevant MX records point to non-existent
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
550-It appears that the DNS operator for mxt10.test.ex
550-has installed an invalid MX record with an IP address
diff --git a/test/stdout/0157 b/test/stdout/0157
index 30530c1..3205e21 100644
--- a/test/stdout/0157
+++ b/test/stdout/0157
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.1]
250 OK
550 invalid sender
250 Reset OK
@@ -16,6 +17,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.2]
250 OK
250 Accepted
250 Reset OK
@@ -28,6 +30,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.3]
250 OK
550 relay not permitted
250 Reset OK
diff --git a/test/stdout/0162 b/test/stdout/0162
index 985c5a3..85ea504 100644
--- a/test/stdout/0162
+++ b/test/stdout/0162
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0175 b/test/stdout/0175
index 10cb2c7..1291e5d 100644
--- a/test/stdout/0175
+++ b/test/stdout/0175
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.0]
250 OK
550 Sender verify failed
503-All RCPT commands were rejected with this error:
@@ -17,6 +18,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.0]
250 OK
550 Sender verify failed
503-All RCPT commands were rejected with this error:
@@ -30,6 +32,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.0]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0197 b/test/stdout/0197
index 72f0885..1ebd902 100644
--- a/test/stdout/0197
+++ b/test/stdout/0197
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0202 b/test/stdout/0202
index 2b1941f..cb29f0f 100644
--- a/test/stdout/0202
+++ b/test/stdout/0202
@@ -1,10 +1,12 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0212 b/test/stdout/0212
index 9f1626a..eaf8380 100644
--- a/test/stdout/0212
+++ b/test/stdout/0212
@@ -11,6 +11,7 @@
> "smartuser.b@??? verified
>
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test [V4NET.0.0.0]
250 OK
250 Accepted
550 unrouteable address
diff --git a/test/stdout/0214 b/test/stdout/0214
index 078e7a4..6e93eaa 100644
--- a/test/stdout/0214
+++ b/test/stdout/0214
@@ -1,6 +1,9 @@
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<x@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/0220 b/test/stdout/0220
index e437f3e..9438646 100644
--- a/test/stdout/0220
+++ b/test/stdout/0220
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0221 b/test/stdout/0221
index 4f5339b..26659dc 100644
--- a/test/stdout/0221
+++ b/test/stdout/0221
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0227 b/test/stdout/0227
index ff5f135..5c9ed50 100644
--- a/test/stdout/0227
+++ b/test/stdout/0227
@@ -1,12 +1,15 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Verification failed for <bad@localhost>
550-Called: 127.0.0.1
@@ -15,14 +18,17 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Callback setup failed while verifying <uncheckable@localhost1>
550-Called: 127.0.0.1
@@ -37,46 +43,55 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
550-Callout verification failed:
550 550 Recipient not liked
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
550-Callout verification failed:
550-550-Recipient not liked on two lines
550 550 Here's the second
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
550-Callout verification failed:
550 550 Recipient not liked, with bad char:(truncated)
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
451 Could not complete recipient verify callout
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.5]
250 OK
550 relay not permitted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.5]
250 OK
550-Postmaster verification failed while checking <ok@localhost1>
550-Called: 127.0.0.1
@@ -124,15 +139,18 @@
550 relay not permitted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
550-Callout verification failed:
550 550 Recipient not liked
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
diff --git a/test/stdout/0230 b/test/stdout/0230
index 67e1ffe..839ef8e 100644
--- a/test/stdout/0230
+++ b/test/stdout/0230
@@ -1,6 +1,9 @@
Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<x@???>
??? 250
<<< 250 OK
@@ -21,6 +24,9 @@ End of script
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<x@???>
??? 250
<<< 250 OK
@@ -61,6 +67,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 221 myhost.test.ex closing connection
End of script
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.9.8.7]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -74,6 +81,7 @@ End of script
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.9.8.7]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0233 b/test/stdout/0233
index 0644977..3f3bc4f 100644
--- a/test/stdout/0233
+++ b/test/stdout/0233
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0234 b/test/stdout/0234
index 5609d5d..57a423d 100644
--- a/test/stdout/0234
+++ b/test/stdout/0234
@@ -4,12 +4,14 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.0]
250 OK
550 relay not permitted
250 Accepted
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.0]
250 OK
550 relay not permitted
250 Accepted
diff --git a/test/stdout/0251 b/test/stdout/0251
index 40d1eba..bd774ed 100644
--- a/test/stdout/0251
+++ b/test/stdout/0251
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.0]
250 OK
250 Accepted
250 Reset OK
@@ -13,6 +14,9 @@
Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<ok@sender>
??? 250
<<< 250 OK
diff --git a/test/stdout/0256 b/test/stdout/0256
index 0058c5e..6622e82 100644
--- a/test/stdout/0256
+++ b/test/stdout/0256
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0258 b/test/stdout/0258
index 824463e..6a4b42b 100644
--- a/test/stdout/0258
+++ b/test/stdout/0258
@@ -1,10 +1,12 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbF-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0281 b/test/stdout/0281
index 4b4b307..662b2d7 100644
--- a/test/stdout/0281
+++ b/test/stdout/0281
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.1.1.1]
250 OK
250 Accepted
250 Accepted
@@ -29,6 +30,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -38,6 +40,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [127.0.0.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -47,6 +50,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.1.1.1]
250 OK
250 Accepted
550 domain doesn't match @mx_primary
diff --git a/test/stdout/0293 b/test/stdout/0293
index 63b499c..7890fdf 100644
--- a/test/stdout/0293
+++ b/test/stdout/0293
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -10,6 +11,7 @@
421 too many messages in this connection
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Reset OK
250 OK
diff --git a/test/stdout/0294 b/test/stdout/0294
index c154816..dbc511d 100644
--- a/test/stdout/0294
+++ b/test/stdout/0294
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -19,6 +20,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
250 Accepted
250 Accepted
@@ -29,11 +31,13 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
250 Accepted
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
550 Administrative prohibition
550 Administrative prohibition
diff --git a/test/stdout/0304 b/test/stdout/0304
index 2ff1e3e..12f12da 100644
--- a/test/stdout/0304
+++ b/test/stdout/0304
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
550 failed 7
550 failed 8
diff --git a/test/stdout/0305 b/test/stdout/0305
index fda4811..48cd185 100644
--- a/test/stdout/0305
+++ b/test/stdout/0305
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.2.3.4]
250 OK
250 Accepted
550 Administrative prohibition
diff --git a/test/stdout/0306 b/test/stdout/0306
index cc6990e..a0b4ca2 100644
--- a/test/stdout/0306
+++ b/test/stdout/0306
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
250 Accepted
250 Reset OK
diff --git a/test/stdout/0308 b/test/stdout/0308
index 7a003dc..d5f915d 100644
--- a/test/stdout/0308
+++ b/test/stdout/0308
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.97]
250 OK
250 Accepted
221 myhost.test.ex closing connection
@@ -13,6 +14,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0312 b/test/stdout/0312
index eed6d39..24ec929 100644
--- a/test/stdout/0312
+++ b/test/stdout/0312
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
diff --git a/test/stdout/0320 b/test/stdout/0320
index 18ba564..ad12b20 100644
--- a/test/stdout/0320
+++ b/test/stdout/0320
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0325 b/test/stdout/0325
index 91e52a8..5264c4c 100644
--- a/test/stdout/0325
+++ b/test/stdout/0325
@@ -6,6 +6,7 @@ xxx@???
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.0]
250 OK
550 $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA
221 myhost.test.ex closing connection
diff --git a/test/stdout/0340 b/test/stdout/0340
index 057562f..21bb2e7 100644
--- a/test/stdout/0340
+++ b/test/stdout/0340
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0342 b/test/stdout/0342
index 5ccb71f..d08cff7 100644
--- a/test/stdout/0342
+++ b/test/stdout/0342
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0362 b/test/stdout/0362
index f0eabc3..c4b6d07 100644
--- a/test/stdout/0362
+++ b/test/stdout/0362
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.0]
250 OK
250 Accepted
221 the.local.host.name closing connection
diff --git a/test/stdout/0365 b/test/stdout/0365
index 17a50d0..fcd35a9 100644
--- a/test/stdout/0365
+++ b/test/stdout/0365
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -29,6 +30,7 @@
250 Reset OK
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0372 b/test/stdout/0372
index 7639176..96688e5 100644
--- a/test/stdout/0372
+++ b/test/stdout/0372
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at host.name [1.2.3.4]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -9,6 +10,7 @@
250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at host2.name [4.3.2.1]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0376 b/test/stdout/0376
index a0af2cb..98a0177 100644
--- a/test/stdout/0376
+++ b/test/stdout/0376
@@ -1,16 +1,20 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Verification failed for <bad@localhost>
550-Called: 127.0.0.1
@@ -19,12 +23,14 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Verification failed for <bad@localhost>
550-Previous (cached) callout verification failure
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Callback setup failed while verifying <ok@localhost>
550-Called: 127.0.0.1
@@ -38,6 +44,7 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Callback setup failed while verifying <ok@localhost>
550-(result of an earlier callout reused).
@@ -49,6 +56,7 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
550-Postmaster verification failed while checking <ok@otherhost>
550-Called: 127.0.0.1
@@ -60,6 +68,7 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
550-Postmaster verification failed while checking <ok@otherhost>
550-(result of earlier verification reused).
@@ -69,82 +78,101 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.5]
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.6]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.7]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.8]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaY-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.9]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.10]
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0381 b/test/stdout/0381
index 057562f..1d85f48 100644
--- a/test/stdout/0381
+++ b/test/stdout/0381
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [V4NET.99.99.97]
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0386 b/test/stdout/0386
index 7ee79fd..88c573a 100644
--- a/test/stdout/0386
+++ b/test/stdout/0386
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
550 No such user here
250 Reset OK
@@ -11,6 +12,7 @@
550 No such user here
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [V4NET.11.12.13]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0387 b/test/stdout/0387
index 9129f01..3845b68 100644
--- a/test/stdout/0387
+++ b/test/stdout/0387
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Reset OK
@@ -6,14 +7,17 @@
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [10.9.8.7]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [192.168.4.5]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test [1.2.3.4]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
diff --git a/test/stdout/0389 b/test/stdout/0389
index 4984942..bbc87cf 100644
--- a/test/stdout/0389
+++ b/test/stdout/0389
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -10,6 +11,7 @@ CALLER UID GID
ddddddddd 0
-received_time_usec .uuuuuu
-received_time_complete tttt.uuuuuu
+--helo_name test
-ident CALLER
-received_protocol local-smtp
-aclm 0 22
@@ -25,7 +27,8 @@ XX
1
x@y
-dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+dddP Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for x@y;
diff --git a/test/stdout/0391 b/test/stdout/0391
index 5ccb71f..d08cff7 100644
--- a/test/stdout/0391
+++ b/test/stdout/0391
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0395 b/test/stdout/0395
index 21f3443..51a86f4 100644
--- a/test/stdout/0395
+++ b/test/stdout/0395
@@ -1,12 +1,13 @@
501 sender address must contain a domain
-Transaction started in line 0
-Error detected in line 1
+Transaction started in line 1
+Error detected in line 2
mail from: userx
501 recipient address must contain a domain
-Transaction started in line 0
-Error detected in line 2
+Transaction started in line 1
+Error detected in line 3
rcpt to: userx
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
501 userx: recipient address must contain a domain
503-All RCPT commands were rejected with this error:
@@ -17,12 +18,14 @@ rcpt to: userx
500 unrecognized command
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbE-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0396 b/test/stdout/0396
index cb91347..e311451 100644
--- a/test/stdout/0396
+++ b/test/stdout/0396
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
550 Administrative prohibition
221 the.local.host.name closing connection
diff --git a/test/stdout/0398 b/test/stdout/0398
index 882015d..e6c4191 100644
--- a/test/stdout/0398
+++ b/test/stdout/0398
@@ -1,10 +1,12 @@
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 mail.test.ex closing connection
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
550-Verification failed for <z@remote>
550-Called: 127.0.0.1
@@ -13,11 +15,13 @@
550 Sender verify failed
221 mail.test.ex closing connection
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
221 mail.test.ex closing connection
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0407 b/test/stdout/0407
index aeedbf5..5b43f0f 100644
--- a/test/stdout/0407
+++ b/test/stdout/0407
@@ -1,4 +1,5 @@
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0410 b/test/stdout/0410
index c37b4ac..8e9aef0 100644
--- a/test/stdout/0410
+++ b/test/stdout/0410
@@ -1,4 +1,5 @@
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0413 b/test/stdout/0413
index 5c320fc..9dc30cb 100644
--- a/test/stdout/0413
+++ b/test/stdout/0413
@@ -1,4 +1,5 @@
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
451 Could not complete sender verify callout
250 Reset OK
451 Could not complete sender verify callout
diff --git a/test/stdout/0417 b/test/stdout/0417
index c0aaa28..093c094 100644
--- a/test/stdout/0417
+++ b/test/stdout/0417
@@ -1,9 +1,11 @@
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
451 Temporary local problem - please try later
451 Temporary local problem - please try later
221 mail.test.ex closing connection
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
451-host lookup did not complete
451 Could not complete sender verify
diff --git a/test/stdout/0418 b/test/stdout/0418
index b108c99..23163d6 100644
--- a/test/stdout/0418
+++ b/test/stdout/0418
@@ -1,4 +1,5 @@
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
550-This is a message which is continued over several lines, with an
550 interspersed comment
diff --git a/test/stdout/0425 b/test/stdout/0425
index c37b4ac..8e9aef0 100644
--- a/test/stdout/0425
+++ b/test/stdout/0425
@@ -1,4 +1,5 @@
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0432 b/test/stdout/0432
index e36d048..ee0c5f5 100644
--- a/test/stdout/0432
+++ b/test/stdout/0432
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
221 myhost.test.ex closing connection
@@ -12,6 +13,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
221 myhost.test.ex closing connection
@@ -20,6 +22,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
221 myhost.test.ex closing connection
@@ -28,6 +31,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
221 myhost.test.ex closing connection
@@ -36,6 +40,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
221 myhost.test.ex closing connection
@@ -44,6 +49,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
diff --git a/test/stdout/0443 b/test/stdout/0443
index 81decfb..4173876 100644
--- a/test/stdout/0443
+++ b/test/stdout/0443
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.0.0.1]
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
diff --git a/test/stdout/0445 b/test/stdout/0445
index bf53581..e0fdc19 100644
--- a/test/stdout/0445
+++ b/test/stdout/0445
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
550-Verification failed for <lp1@???>
550 Sender verify failed
diff --git a/test/stdout/0446 b/test/stdout/0446
index 4cb5a92..3e01f18 100644
--- a/test/stdout/0446
+++ b/test/stdout/0446
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0453 b/test/stdout/0453
index b4d5604..45a045b 100644
--- a/test/stdout/0453
+++ b/test/stdout/0453
@@ -4,6 +4,7 @@
501 Syntactically invalid HELO argument(s)
501 Syntactically invalid HELO argument(s)
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
503 sender already given
503-sender already given
diff --git a/test/stdout/0459 b/test/stdout/0459
index 741a7ff..68b3e46 100644
--- a/test/stdout/0459
+++ b/test/stdout/0459
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
diff --git a/test/stdout/0462 b/test/stdout/0462
index 585e2e0..747c852 100644
--- a/test/stdout/0462
+++ b/test/stdout/0462
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Postmaster verification failed while checking <Ok@localhost>
550-Called: 127.0.0.1
@@ -11,6 +12,7 @@
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
550-Verification failed for <NOTok@elsewhere>
550-Called: 127.0.0.1
@@ -19,6 +21,7 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
550-Verification failed for <NOTok2@elsewhere>
550-Called: 127.0.0.1
diff --git a/test/stdout/0464 b/test/stdout/0464
index 057562f..21bb2e7 100644
--- a/test/stdout/0464
+++ b/test/stdout/0464
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0465 b/test/stdout/0465
index 9dd9847..a9ba3af 100644
--- a/test/stdout/0465
+++ b/test/stdout/0465
@@ -1,14 +1,17 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
501 <abc@domain.>: domain missing or malformed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaY-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0468 b/test/stdout/0468
index 2b10057..b601989 100644
--- a/test/stdout/0468
+++ b/test/stdout/0468
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0475 b/test/stdout/0475
index 2fc366e..819cea3 100644
--- a/test/stdout/0475
+++ b/test/stdout/0475
@@ -4,6 +4,7 @@
**** This is not for real!
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [V4NET.0.0.0]
250 OK
451 Temporary local problem - please try later
550 Administrative prohibition
diff --git a/test/stdout/0483 b/test/stdout/0483
index 483ea4b..8014e80 100644
--- a/test/stdout/0483
+++ b/test/stdout/0483
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
550 Administrative prohibition
diff --git a/test/stdout/0488 b/test/stdout/0488
index 6b0b1c6..703afa5 100644
--- a/test/stdout/0488
+++ b/test/stdout/0488
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -10,6 +11,7 @@ CALLER UID GID
ddddddddd 0
-received_time_usec .uuuuuu
-received_time_complete tttt.uuuuuu
+--helo_name test
-ident CALLER
-received_protocol local-smtp
-body_linecount 0
@@ -23,7 +25,8 @@ XX
1
userx@???
-dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+dddP Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for userx@???;
diff --git a/test/stdout/0490 b/test/stdout/0490
index fb456ca..3e2b0e0 100644
--- a/test/stdout/0490
+++ b/test/stdout/0490
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -14,6 +15,7 @@ CALLER UID GID
ddddddddd 0
-received_time_usec .uuuuuu
-received_time_complete tttt.uuuuuu
+--helo_name test
-ident CALLER
-received_protocol local-smtp
-body_linecount 2
@@ -27,7 +29,8 @@ XX
1
bb@???
-dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+dddP Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for bb@???;
diff --git a/test/stdout/0496 b/test/stdout/0496
index 33be089..d2cfe99 100644
--- a/test/stdout/0496
+++ b/test/stdout/0496
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0500 b/test/stdout/0500
index b13f1d2..bacc27a 100644
--- a/test/stdout/0500
+++ b/test/stdout/0500
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
550-Verification failed for <x@y>
@@ -6,6 +7,7 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0501 b/test/stdout/0501
index 057562f..21bb2e7 100644
--- a/test/stdout/0501
+++ b/test/stdout/0501
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0502 b/test/stdout/0502
index edb6d31..df6f28f 100644
--- a/test/stdout/0502
+++ b/test/stdout/0502
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -17,6 +18,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
221 Your message here
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
221 myhost.test.ex closing connection
Connecting to 127.0.0.1 port 1225 ... connected
diff --git a/test/stdout/0505 b/test/stdout/0505
index 597c294..67ed529 100644
--- a/test/stdout/0505
+++ b/test/stdout/0505
@@ -1,10 +1,12 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0507 b/test/stdout/0507
index 9156b51..ac8c2e9 100644
--- a/test/stdout/0507
+++ b/test/stdout/0507
@@ -1,22 +1,26 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbA-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
550 Rejected after DATA: bcc recipient detected
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -24,6 +28,7 @@
250 OK id=10HmbB-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -32,6 +37,7 @@
550 Administrative prohibition
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0517 b/test/stdout/0517
index 58649f6..ec86b86 100644
--- a/test/stdout/0517
+++ b/test/stdout/0517
@@ -1,10 +1,12 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0518 b/test/stdout/0518
index 478b304..c00eda1 100644
--- a/test/stdout/0518
+++ b/test/stdout/0518
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0525 b/test/stdout/0525
index bf3f091..969cf11 100644
--- a/test/stdout/0525
+++ b/test/stdout/0525
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0527 b/test/stdout/0527
index 98cca17..12ed3d1 100644
--- a/test/stdout/0527
+++ b/test/stdout/0527
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
diff --git a/test/stdout/0530 b/test/stdout/0530
index 1a39f69..fcfd721 100644
--- a/test/stdout/0530
+++ b/test/stdout/0530
@@ -1,28 +1,33 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbH-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbJ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbL-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbN-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0532 b/test/stdout/0532
index 7d79c1e..c6d6c25 100644
--- a/test/stdout/0532
+++ b/test/stdout/0532
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
550 Administrative prohibition
diff --git a/test/stdout/0538 b/test/stdout/0538
index 7a19058..44e9b87 100644
--- a/test/stdout/0538
+++ b/test/stdout/0538
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
550-Callback setup failed while verifying <userx@???>
550-Called: 127.0.0.1
550-Sent: MAIL FROM:<>
@@ -11,10 +12,12 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
550-Callback setup failed while verifying <userx@???>
550-(result of an earlier callout reused).
550-The initial connection, or a HELO or MAIL FROM:<> command was
diff --git a/test/stdout/0539 b/test/stdout/0539
index d260b66..fe06886 100644
--- a/test/stdout/0539
+++ b/test/stdout/0539
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
550 Administrative prohibition
550 Administrative prohibition
550 Administrative prohibition
diff --git a/test/stdout/0540 b/test/stdout/0540
index 4d788a5..3cb76b5 100644
--- a/test/stdout/0540
+++ b/test/stdout/0540
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0542 b/test/stdout/0542
index ce255a7..1a262e6 100644
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -9,6 +9,7 @@
> (userx@???, usery@???)
>
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0555 b/test/stdout/0555
index b821e7b..1f8ac8f 100644
--- a/test/stdout/0555
+++ b/test/stdout/0555
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -7,6 +8,7 @@
550 recipient(s).
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0561 b/test/stdout/0561
index d37cc1a..f83fd5b 100644
--- a/test/stdout/0561
+++ b/test/stdout/0561
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -9,6 +10,7 @@
250 OK id=10HmaY-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0565 b/test/stdout/0565
index 5433ba4..bb36614 100644
--- a/test/stdout/0565
+++ b/test/stdout/0565
@@ -1,10 +1,12 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -24,7 +26,8 @@ RCPT TO:<x@y>
250 Receiver OK
DATA
354 Send it
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for x@y;
@@ -54,7 +57,8 @@ RCPT TO:<x@???>
250 Receiver OK
DATA
354 Send it
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
for x@???;
diff --git a/test/stdout/0567 b/test/stdout/0567
index 7d79c1e..c6d6c25 100644
--- a/test/stdout/0567
+++ b/test/stdout/0567
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
550 Administrative prohibition
diff --git a/test/stdout/0569 b/test/stdout/0569
index 9d82558..d227953 100644
--- a/test/stdout/0569
+++ b/test/stdout/0569
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -18,6 +19,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -29,6 +31,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -40,6 +43,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -51,6 +55,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -65,6 +70,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.10.10.10]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0575 b/test/stdout/0575
index d7ad1f3..60c7174 100644
--- a/test/stdout/0575
+++ b/test/stdout/0575
@@ -4,6 +4,7 @@
**** This is not for real!
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello test [V4NET.0.0.0]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0576 b/test/stdout/0576
index 0a0e014..48e29b7 100644
--- a/test/stdout/0576
+++ b/test/stdout/0576
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -18,12 +19,14 @@
alternate@???
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaZ-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -31,6 +34,7 @@
221 the.local.host.name closing connection
### load messages
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0578 b/test/stdout/0578
index d3089e7..42bc52d 100644
--- a/test/stdout/0578
+++ b/test/stdout/0578
@@ -1,16 +1,20 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Verification failed for <bad@localhost>
550-Called: 127.0.0.1
@@ -19,12 +23,14 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Verification failed for <bad@localhost>
550-Previous (cached) callout verification failure
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Callback setup failed while verifying <ok@localhost>
550-Called: 127.0.0.1
@@ -38,6 +44,7 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
250 OK
550-Callback setup failed while verifying <ok@localhost>
550-(result of an earlier callout reused).
@@ -49,6 +56,7 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
550-Postmaster verification failed while checking <ok@otherhost>
550-Called: 127.0.0.1
@@ -60,6 +68,7 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
550-Postmaster verification failed while checking <ok@otherhost>
550-(result of earlier verification reused).
@@ -69,82 +78,101 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.4]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.2]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.5]
250 OK
451 Could not complete sender verify callout
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.6]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.7]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.8]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaY-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.9]
250 OK
250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.10]
250 OK
250 Accepted
221 myhost.test.ex closing connection
diff --git a/test/stdout/0580 b/test/stdout/0580
index 5d3d0bd..d9e7b18 100644
--- a/test/stdout/0580
+++ b/test/stdout/0580
@@ -1,10 +1,12 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -12,6 +14,7 @@
250 OK id=10HmaY-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -19,6 +22,7 @@
250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -26,6 +30,7 @@
250 OK id=10HmbA-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -45,7 +50,8 @@ RCPT TO:<usery@???>
250 OK
DATA
354 hit me
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
for usery@???;
@@ -86,7 +92,8 @@ RCPT TO:<usery2@???>
250 OK
DATA
354 hit me
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -126,7 +133,8 @@ RCPT TO:<usery@???>
250 OK
DATA
354 hit me
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaZ-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -154,7 +162,8 @@ RCPT TO:<usery5@???>
250 OK
DATA
354 hit me
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
@@ -180,7 +189,8 @@ RCPT TO:<remote@???>
250 OK
DATA
354 hit me
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+ by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbB-0005vi-00;
Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0584 b/test/stdout/0584
index 620e8f8..c18ad73 100644
--- a/test/stdout/0584
+++ b/test/stdout/0584
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [127.0.0.1]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -18,6 +19,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [127.0.0.1]
250 OK
550-Verification failed for <fail@???>
550-Unrouteable address
@@ -29,6 +31,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [127.0.0.1]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0585 b/test/stdout/0585
index 9c896e3..d2d0191 100644
--- a/test/stdout/0585
+++ b/test/stdout/0585
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -6,6 +7,7 @@
221 myhost.test.ex closing connection
### Reject: no match
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -13,6 +15,7 @@
221 myhost.test.ex closing connection
### Reject, with specific SMTP message
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
@@ -20,6 +23,7 @@
221 myhost.test.ex closing connection
### Accept, matches in header CC:
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -28,6 +32,7 @@
221 myhost.test.ex closing connection
### Reject: To: & CC: combo, an env rcpt missing
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -37,6 +42,7 @@
221 myhost.test.ex closing connection
### Accept: Resent-To: & Resent-CC: combo
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0593 b/test/stdout/0593
index 2b1941f..cb29f0f 100644
--- a/test/stdout/0593
+++ b/test/stdout/0593
@@ -1,10 +1,12 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0596 b/test/stdout/0596
index 1c94559..77a8333 100644
--- a/test/stdout/0596
+++ b/test/stdout/0596
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
250 Accepted
@@ -6,6 +7,7 @@
250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/0599 b/test/stdout/0599
index 3c2710e..c173746 100644
--- a/test/stdout/0599
+++ b/test/stdout/0599
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0600 b/test/stdout/0600
index 2b1941f..cb29f0f 100644
--- a/test/stdout/0600
+++ b/test/stdout/0600
@@ -1,10 +1,12 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0607 b/test/stdout/0607
index 47285d7..1552847 100644
--- a/test/stdout/0607
+++ b/test/stdout/0607
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0609 b/test/stdout/0609
index 8ebf9a2..ebda399 100644
--- a/test/stdout/0609
+++ b/test/stdout/0609
@@ -1,6 +1,9 @@
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<x@???>
??? 250
<<< 250 OK
@@ -14,6 +17,9 @@ End of script
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<x@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/0610 b/test/stdout/0610
index 7fceba9..6b1d7a7 100644
--- a/test/stdout/0610
+++ b/test/stdout/0610
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0614 b/test/stdout/0614
index ee9b665..e9cae83 100644
--- a/test/stdout/0614
+++ b/test/stdout/0614
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0615 b/test/stdout/0615
index a6da43d..b0423fe 100644
--- a/test/stdout/0615
+++ b/test/stdout/0615
@@ -1,4 +1,5 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/1002 b/test/stdout/1002
index 0971712..a5ab7a1 100644
--- a/test/stdout/1002
+++ b/test/stdout/1002
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [V4NET.1.1.1]
250 OK
250 Accepted
550 domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
diff --git a/test/stdout/1103 b/test/stdout/1103
index df5777d..717be0d 100644
--- a/test/stdout/1103
+++ b/test/stdout/1103
@@ -19,6 +19,17 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> ehlo test
+??? 250-
+<<< 250-myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/1105 b/test/stdout/1105
index 7a0430c..39f8610 100644
--- a/test/stdout/1105
+++ b/test/stdout/1105
@@ -1,6 +1,9 @@
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -25,6 +28,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/1108 b/test/stdout/1108
index c7a0df4..14e05d7 100644
--- a/test/stdout/1108
+++ b/test/stdout/1108
@@ -19,6 +19,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/1110 b/test/stdout/1110
index 27f78bd..2a896e5 100644
--- a/test/stdout/1110
+++ b/test/stdout/1110
@@ -38,6 +38,9 @@ Attempting to start TLS
Succeeded in starting TLS
??? 220
<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2002 b/test/stdout/2002
index 276c903..58621f2 100644
--- a/test/stdout/2002
+++ b/test/stdout/2002
@@ -19,6 +19,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
>>> mail from:<CALLER@???>
??? 250
<<< 250 OK
@@ -57,6 +68,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<"name with spaces"@???>
??? 250
<<< 250 OK
@@ -123,6 +137,9 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<CALLER@???>
??? 250
<<< 250 OK
@@ -161,6 +178,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<CALLER@???>
??? 250
<<< 250 OK
@@ -200,6 +220,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<CALLER@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2014 b/test/stdout/2014
index 829a86c..4eddd72 100644
--- a/test/stdout/2014
+++ b/test/stdout/2014
@@ -83,6 +83,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -117,6 +120,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -179,6 +185,9 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -214,7 +223,7 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
Attempting to start TLS
A TLS fatal alert has been received.
Failed to start TLS
->>> mail from:<userx@???>
+>>> helo test
??? 554
<<< 554 Security failure
End of script
@@ -242,6 +251,9 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -276,6 +288,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2029 b/test/stdout/2029
index 28be7c4..f2108b6 100644
--- a/test/stdout/2029
+++ b/test/stdout/2029
@@ -19,6 +19,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2102 b/test/stdout/2102
index ecd88c6..4706a69 100644
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -19,6 +19,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
>>> mail from:<a@???>
??? 250
<<< 250 OK
@@ -57,6 +68,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
>>> mail from:<"name with spaces"@???>
??? 250
<<< 250 OK
@@ -124,6 +146,17 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
>>> mail from:<b@???>
??? 250
<<< 250 OK
@@ -162,6 +195,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
>>> mail from:<c@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2114.openssl_1_1_1 b/test/stdout/2114.openssl_1_1_1
index 215baf9..a0b9fe3 100644
--- a/test/stdout/2114.openssl_1_1_1
+++ b/test/stdout/2114.openssl_1_1_1
@@ -92,6 +92,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -126,6 +129,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -192,6 +198,9 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -258,6 +267,9 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -292,6 +304,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2132.openssl_1_1_1 b/test/stdout/2132.openssl_1_1_1
index 4421443..6327b61 100644
--- a/test/stdout/2132.openssl_1_1_1
+++ b/test/stdout/2132.openssl_1_1_1
@@ -20,6 +20,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<CALLER@???>
??? 250
<<< 250 OK
@@ -59,6 +62,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<"name with spaces"@???>
??? 250
<<< 250 OK
@@ -130,6 +136,9 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<CALLER@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2150 b/test/stdout/2150
index 28be7c4..f2108b6 100644
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -19,6 +19,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2202 b/test/stdout/2202
index bcb3fa2..f2bf2f0 100644
--- a/test/stdout/2202
+++ b/test/stdout/2202
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
250 OK
550 Administrative prohibition
221 myhost.test.ex closing connection
diff --git a/test/stdout/2600 b/test/stdout/2600
index 0a0a461..74422c0 100644
--- a/test/stdout/2600
+++ b/test/stdout/2600
@@ -18,6 +18,7 @@ after" id=newline
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [10.0.0.0]
250 OK
550 relay not permitted
550 relay not permitted
@@ -28,6 +29,7 @@ after" id=newline
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [10.0.0.0]
250 OK
550 relay not permitted
550 relay not permitted
@@ -38,6 +40,7 @@ after" id=newline
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [10.10.10.10]
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/2610 b/test/stdout/2610
index fb89752..961928b 100644
--- a/test/stdout/2610
+++ b/test/stdout/2610
@@ -29,6 +29,7 @@ name=Aristotle id=aaaa
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [10.0.0.0]
250 OK
550 relay not permitted
221 myhost.test.ex closing connection
diff --git a/test/stdout/2620 b/test/stdout/2620
index 8afeec9..bbad4d5 100644
--- a/test/stdout/2620
+++ b/test/stdout/2620
@@ -29,6 +29,7 @@ name=Aristotle id=aaaa
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [10.0.0.0]
250 OK
550 relay not permitted
550 relay not permitted
diff --git a/test/stdout/3202 b/test/stdout/3202
index df43ee8..eea6c3c 100644
--- a/test/stdout/3202
+++ b/test/stdout/3202
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.1.1.1]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -13,6 +14,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.1.2.1]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -22,6 +24,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.1.3.1]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
diff --git a/test/stdout/3204 b/test/stdout/3204
index 2af1ddf..1a62f08 100644
--- a/test/stdout/3204
+++ b/test/stdout/3204
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
diff --git a/test/stdout/3205 b/test/stdout/3205
index 2881c1b..6722a0f 100644
--- a/test/stdout/3205
+++ b/test/stdout/3205
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -13,6 +14,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [4.3.2.1]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
diff --git a/test/stdout/3211 b/test/stdout/3211
index e066078..2adf9be 100644
--- a/test/stdout/3211
+++ b/test/stdout/3211
@@ -1,4 +1,5 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -8,6 +9,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
@@ -17,6 +19,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [1.2.3.4]
250 OK
451 Temporary local problem - please try later
221 myhost.test.ex closing connection
diff --git a/test/stdout/3400 b/test/stdout/3400
index c57747b..5efa690 100644
--- a/test/stdout/3400
+++ b/test/stdout/3400
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [10.0.0.2]
250 OK
250 Reset OK
250 <userx@???> is deliverable
diff --git a/test/stdout/3410 b/test/stdout/3410
index 5c356db..bc4b2ab 100644
--- a/test/stdout/3410
+++ b/test/stdout/3410
@@ -4,6 +4,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [5.6.9.1]
250 OK
550 You must authenticate
250 Reset OK
@@ -23,6 +24,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [5.6.10.1]
250 OK
550 Administrative prohibition
250 Reset OK
diff --git a/test/stdout/5300 b/test/stdout/5300
index bb3956b..1d697e4 100644
--- a/test/stdout/5300
+++ b/test/stdout/5300
@@ -7,6 +7,7 @@ x@???
zz@???
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/5301 b/test/stdout/5301
index acbcbff..f198185 100644
--- a/test/stdout/5301
+++ b/test/stdout/5301
@@ -9,6 +9,7 @@ x@[abcd::dcba]
x@[IPv6:cba::abc]
router = r3, transport = t1
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
250 Accepted
diff --git a/test/stdout/5600 b/test/stdout/5600
index 51def75..550ee1c 100644
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -22,6 +22,9 @@ Key file = aux-fixed/cert2
Attempting to start TLS
Response verify OK
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/5610 b/test/stdout/5610
index 51def75..550ee1c 100644
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -22,6 +22,9 @@ Key file = aux-fixed/cert2
Attempting to start TLS
Response verify OK
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/5650 b/test/stdout/5650
index 8a72c0f..77ea71e 100644
--- a/test/stdout/5650
+++ b/test/stdout/5650
@@ -20,6 +20,9 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/5820 b/test/stdout/5820
index 1c517a3..34ef2bd 100644
--- a/test/stdout/5820
+++ b/test/stdout/5820
@@ -7,6 +7,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [127.0.0.1]
250 OK
250 Accepted
421 myhost.test.ex lost input connection
diff --git a/test/stdout/5840 b/test/stdout/5840
index 00c6cdc..13ff736 100644
--- a/test/stdout/5840
+++ b/test/stdout/5840
@@ -7,6 +7,7 @@
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [127.0.0.1]
250 OK
250 Accepted
421 myhost.test.ex lost input connection
