diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-05-27 23:03:02 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-06-02 12:58:39 +0100 |
| commit | 2b68e140a846db4f24f4e29dfa16db73dc35c37f (patch) | |
| tree | 4584e6301c10f489613bd4421a6beca262cfa89a /test | |
| parent | c2046b73572e3b2ea94b4bf7fea9810b73d606c4 (diff) | |
Handle a v4mapped sender address given us by a proxy. Bug 2855
Diffstat (limited to 'test')
| -rwxr-xr-x | test/runtest | 2 | ||||
| -rw-r--r-- | test/stdout/0035 | 28 | ||||
| -rw-r--r-- | test/stdout/3415 | 20 |
3 files changed, 25 insertions, 25 deletions
diff --git a/test/runtest b/test/runtest index c88a8929e..4a304a8aa 100755 --- a/test/runtest +++ b/test/runtest @@ -792,7 +792,7 @@ RESET_AFTER_EXTRA_LINE_READ: } # Port in host address in spool file output from -Mvh - s/^(--?host_address) (.*)\.\d+/$1 $2.9999/; + s/^(--?host_address) (.*[:.])\d+$/$1 ${2}9999/; if ($dynamic_socket and $dynamic_socket->opened and my $port = $dynamic_socket->sockport) { s/^Connecting to 127\.0\.0\.1 port \K$port/<dynamic port>/; diff --git a/test/stdout/0035 b/test/stdout/0035 index 2a2bc285c..c2f2cf56f 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -147,8 +147,8 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 --interface_address 127.0.0.1.1225 +-host_address [127.0.0.1]:9999 +-interface_address [127.0.0.1]:1112 -received_protocol esmtp -body_linecount 0 -max_received_linelength 0 @@ -170,8 +170,8 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 --interface_address 127.0.0.1.1225 +-host_address [127.0.0.1]:9999 +-interface_address [127.0.0.1]:1112 -received_protocol esmtp -body_linecount 0 -max_received_linelength 0 @@ -196,8 +196,8 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 --interface_address 127.0.0.1.1225 +-host_address [127.0.0.1]:9999 +-interface_address [127.0.0.1]:1112 -received_protocol esmtp -body_linecount 0 -max_received_linelength 0 @@ -220,8 +220,8 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 --interface_address 127.0.0.1.1225 +-host_address [127.0.0.1]:9999 +-interface_address [127.0.0.1]:1112 -received_protocol esmtp -body_linecount 0 -max_received_linelength 25 @@ -244,8 +244,8 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 --interface_address 127.0.0.1.1225 +-host_address [127.0.0.1]:9999 +-interface_address [127.0.0.1]:1112 -received_protocol esmtp -body_linecount 0 -max_received_linelength 25 @@ -271,8 +271,8 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 --interface_address 127.0.0.1.1225 +-host_address [127.0.0.1]:9999 +-interface_address [127.0.0.1]:1112 -received_protocol esmtp -body_linecount 0 -max_received_linelength 25 @@ -298,8 +298,8 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 --interface_address 127.0.0.1.1225 +-host_address [127.0.0.1]:9999 +-interface_address [127.0.0.1]:1112 -received_protocol esmtp -body_linecount 0 -max_received_linelength 25 diff --git a/test/stdout/3415 b/test/stdout/3415 index 0ce6f1909..11060a1b9 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -158,10 +158,10 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 +-host_address [127.0.0.1]:9999 -host_auth au1 -host_auth_pubname PLAIN --interface_address 127.0.0.1.1225 +-interface_address [127.0.0.1]:1112 -received_protocol esmtpa -body_linecount 0 -max_received_linelength 0 @@ -188,10 +188,10 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 +-host_address [127.0.0.1]:9999 -host_auth au1 -host_auth_pubname PLAIN --interface_address 127.0.0.1.1225 +-interface_address [127.0.0.1]:1112 -received_protocol esmtpa -body_linecount 0 -max_received_linelength 0 @@ -216,10 +216,10 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 +-host_address [127.0.0.1]:9999 -host_auth au1 -host_auth_pubname PLAIN --interface_address 127.0.0.1.1225 +-interface_address [127.0.0.1]:1112 -received_protocol esmtpa -body_linecount 0 -max_received_linelength 0 @@ -244,10 +244,10 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 +-host_address [127.0.0.1]:9999 -host_auth au1 -host_auth_pubname PLAIN --interface_address 127.0.0.1.1225 +-interface_address [127.0.0.1]:1112 -received_protocol esmtpa -body_linecount 0 -max_received_linelength 0 @@ -272,10 +272,10 @@ ddddddddd 0 -received_time_usec .uuuuuu -received_time_complete tttt.uuuuuu --helo_name rhu.barb --host_address 127.0.0.1.9999 +-host_address [127.0.0.1]:9999 -host_auth au1 -host_auth_pubname PLAIN --interface_address 127.0.0.1.1225 +-interface_address [127.0.0.1]:1112 -received_protocol esmtpa -body_linecount 0 -max_received_linelength 15 |