diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-05-28 00:26:48 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-05-28 00:32:12 +0100 |
| commit | fd6e2d18420f43b0c956d943024cb462e1af6aa6 (patch) | |
| tree | 33fc84fe20f544bd40ecab8ce04a90fea64fcecf /test | |
| parent | a40828c57d328cf42a956f650b1fd2456bf7b21a (diff) | |
PIPE_CONNECT: avoid using when the transport helo_data uses $sending_ip_address
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/4050 | 3 | ||||
| -rw-r--r-- | test/log/4051 | 10 | ||||
| -rw-r--r-- | test/scripts/4050-pipe-conn/4051 | 12 |
3 files changed, 24 insertions, 1 deletions
diff --git a/test/confs/4050 b/test/confs/4050 index 7cddca9a2..c26b7a9c2 100644 --- a/test/confs/4050 +++ b/test/confs/4050 @@ -59,6 +59,9 @@ smtp: driver = smtp hosts_try_fastopen = : hosts_pipe_connect = CONTROL +.ifdef HELO_MSG + helo_data = HELO_MSG +.endif max_rcpt = 1 # diff --git a/test/log/4051 b/test/log/4051 index b1d814429..c332087d7 100644 --- a/test/log/4051 +++ b/test/log/4051 @@ -18,6 +18,11 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 => clientno@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for helo_data@test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmbF-0005vi-00 => helo_data@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbG-0005vi-00" +1999-03-02 09:44:33 10HmbF-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D @@ -42,3 +47,8 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <clientno@test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@the.local.host.name H=(127.0.0.1) [127.0.0.1] P=esmtp L. S=sss id=E10HmbF-0005vi-00@the.local.host.name for helo_data@test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmbG-0005vi-00 => :blackhole: <helo_data@test.ex> R=server +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/scripts/4050-pipe-conn/4051 b/test/scripts/4050-pipe-conn/4051 index 45e4b7410..dd5f4c7a8 100644 --- a/test/scripts/4050-pipe-conn/4051 +++ b/test/scripts/4050-pipe-conn/4051 @@ -54,6 +54,16 @@ exim -DNOTDAEMON -DSERVER=server -q **** # # -killdaemon +# Check that client doesn't try when transport uses $sending_ip_address in +# helo_data +exim helo_data@test.ex +Subject test 5 +**** +exim -DCONTROL=127.0.0.1 -DHELO_MSG='$sending_ip_address' -q +**** +exim -DNOTDAEMON -DSERVER=server -q +**** +# # +killdaemon no_msglog_check |