diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/README | 2 | ||||
| -rw-r--r-- | test/log/1008 | 4 | ||||
| -rw-r--r-- | test/scripts/1000-Basic-ipv6/1006 | 2 | ||||
| -rw-r--r-- | test/src/client.c | 2 | ||||
| -rw-r--r-- | test/stdout/1008 | 10 |
5 files changed, 10 insertions, 10 deletions
diff --git a/test/README b/test/README index d4ef72d5e..80c35117b 100644 --- a/test/README +++ b/test/README @@ -836,7 +836,7 @@ This command runs the auxiliary "client" program that simulates an SMTP client. It is controlled by a script read from its standard input, details of which are given below. There are two options. One is -t, which must be followed directly by a number, to specify the command timeout in seconds (e.g. -t5). The default -timeout is 1 second. The other option is -tls-on-connect, which causes the +timeout is 5 seconds. The other option is -tls-on-connect, which causes the client to try to start up a TLS session as soon as it has connected, without using the STARTTLS command. The client program connects to the given IP address and port, using the specified interface, if one is given. diff --git a/test/log/1008 b/test/log/1008 index 1e5f075e9..4e92c74cb 100644 --- a/test/log/1008 +++ b/test/log/1008 @@ -1,3 +1,3 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host ::1 [::1]: 450 Temporary error +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-45) H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error diff --git a/test/scripts/1000-Basic-ipv6/1006 b/test/scripts/1000-Basic-ipv6/1006 index 365d1c68c..8b07fde5e 100644 --- a/test/scripts/1000-Basic-ipv6/1006 +++ b/test/scripts/1000-Basic-ipv6/1006 @@ -21,7 +21,7 @@ quit killdaemon exim -DSERVER=server -DD6=disable_ipv6 -bd -oX PORT_D **** -1 +85 client HOSTIPV6 PORT_D **** killdaemon diff --git a/test/src/client.c b/test/src/client.c index 614c2c557..a983896b1 100644 --- a/test/src/client.c +++ b/test/src/client.c @@ -717,7 +717,7 @@ an externally applied timeout if the signal handler has been run. */ if (rc < 0) { close(sock); - printf("failed: %s\n", strerror(save_errno)); + printf("connect failed: %s\n", strerror(save_errno)); exit(85); } diff --git a/test/stdout/1008 b/test/stdout/1008 index e2c79135d..f930d30a5 100644 --- a/test/stdout/1008 +++ b/test/stdout/1008 @@ -1,18 +1,18 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error + T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed = time last try = time2 next try = time2 + 7200 - T:::1:::1:1224:10HmaX-0005vi-00 -45 12865 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host ::1 [::1]: 450 Temporary error + T:::1:::1:1224:10HmaX-0005vi-00 -45 12865 H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed = time last try = time2 next try = time2 + 7200 -Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-0005vi-00 error -45: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error +Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-0005vi-00 error -45: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 -Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error -45: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host ::1 [::1]: 450 Temporary error +Transport: [:1:::1:1224:10HmaX-0005vi-00]:1224 10HmaX-0005vi-00 error -45: H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 exinext exit code = 0 -Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error -45: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host ::1 [::1]: 450 Temporary error +Transport: [:1:::1:1224:10HmaX-0005vi-00] error -45: H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 |