diff options
Diffstat (limited to 'test')
l---------[-rw-r--r--] | test/confs/2020 | 53 | ||||
-rw-r--r-- | test/confs/2120 | 4 | ||||
-rw-r--r-- | test/log/2020 | 13 | ||||
-rw-r--r-- | test/log/2120 | 17 | ||||
-rw-r--r-- | test/paniclog/2020 | 8 | ||||
-rw-r--r-- | test/paniclog/2120 | 8 | ||||
-rw-r--r-- | test/scripts/2000-GnuTLS/2020 | 2 | ||||
-rw-r--r-- | test/scripts/2100-OpenSSL/2120 | 2 | ||||
-rw-r--r-- | test/stderr/2020 | 6 | ||||
-rw-r--r-- | test/stderr/2120 | 6 |
10 files changed, 18 insertions, 101 deletions
diff --git a/test/confs/2020 b/test/confs/2020 index 241d88335..5ec250ecd 100644..120000 --- a/test/confs/2020 +++ b/test/confs/2020 @@ -1,52 +1 @@ -# Exim test configuration 2020 - -SERVER= - -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns -log_file_path = DIR/spool/log/SERVER%slog -gecos_pattern = "" -gecos_name = CALLER_NAME -primary_hostname = myhost.test.ex -spool_directory = DIR/spool - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -log_selector = +tls_peerdn - -queue_only -queue_run_in_order - -tls_advertise_hosts = * - - -# ----- Routers ----- - -begin routers - -abc: - driver = accept - transport = t1 - - -# ----- Transports ----- - -begin transports - -t1: - driver = smtp - hosts = 127.0.0.1 - allow_localhost - port = PORT_D - - -# ----- Retry ----- - -begin retry - -* * F,1d,1d - -# End +2120
\ No newline at end of file diff --git a/test/confs/2120 b/test/confs/2120 index e3a0ba1af..75b8dfa7f 100644 --- a/test/confs/2120 +++ b/test/confs/2120 @@ -8,7 +8,7 @@ host_lookup_order = bydns log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME -primary_hostname = myhost.test.ex +primary_hostname = thishost.test.ex spool_directory = DIR/spool # ----- Main settings ----- @@ -38,7 +38,7 @@ begin transports t1: driver = smtp - hosts = 127.0.0.1 + hosts = thishost.test.ex allow_localhost port = PORT_D diff --git a/test/log/2020 b/test/log/2020 index 25a01dfb3..2e4a0944b 100644 --- a/test/log/2020 +++ b/test/log/2020 @@ -1,16 +1,15 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. +1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@thishost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option 1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@myhost.test.ex R=abc T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=Exim Developers,CN=thishost.test.ex" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qf ******** SERVER ******** -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. +1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [127.0.0.1] (no TLS server certificate is specified) -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@thishost.test.ex H=localhost (thishost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@thishost.test.ex diff --git a/test/log/2120 b/test/log/2120 index 10e2316c0..c70f7d401 100644 --- a/test/log/2120 +++ b/test/log/2120 @@ -1,19 +1,16 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. +1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@thishost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option 1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>> -1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session failure: delivering unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls) -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@myhost.test.ex R=abc T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=Exim Developers/CN=thishost.test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=Exim Developers/CN=thishost.test.ex" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qf ******** SERVER ******** -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. +1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [127.0.0.1] (SSL_accept): error: <<detail omitted>> -1999-03-02 09:44:33 TLS client disconnected cleanly (rejected our certificate?) -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@thishost.test.ex H=localhost (thishost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no S=sss id=E10HmaX-0005vi-00@thishost.test.ex diff --git a/test/paniclog/2020 b/test/paniclog/2020 deleted file mode 100644 index e16a6800b..000000000 --- a/test/paniclog/2020 +++ /dev/null @@ -1,8 +0,0 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option - -******** SERVER ******** -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option diff --git a/test/paniclog/2120 b/test/paniclog/2120 deleted file mode 100644 index e16a6800b..000000000 --- a/test/paniclog/2120 +++ /dev/null @@ -1,8 +0,0 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option - -******** SERVER ******** -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option diff --git a/test/scripts/2000-GnuTLS/2020 b/test/scripts/2000-GnuTLS/2020 index bd00740bf..3203ab4ea 100644 --- a/test/scripts/2000-GnuTLS/2020 +++ b/test/scripts/2000-GnuTLS/2020 @@ -1,4 +1,4 @@ -# TLS server: no certificate defined, client sends in clear +# TLS server: no certificate defined, autogen selfsign used gnutls exim -DSERVER=server -bd -oX PORT_D **** diff --git a/test/scripts/2100-OpenSSL/2120 b/test/scripts/2100-OpenSSL/2120 index 7e0aa1e0e..53cd81333 100644 --- a/test/scripts/2100-OpenSSL/2120 +++ b/test/scripts/2100-OpenSSL/2120 @@ -1,4 +1,4 @@ -# TLS server: no certificate defined, client sends in clear +# TLS server: no certificate defined, autogen selfsign used exim -DSERVER=server -bd -oX PORT_D **** exim userx diff --git a/test/stderr/2020 b/test/stderr/2020 index e16a6800b..045fadc9b 100644 --- a/test/stderr/2020 +++ b/test/stderr/2020 @@ -1,8 +1,2 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option ******** SERVER ******** -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option diff --git a/test/stderr/2120 b/test/stderr/2120 index e16a6800b..045fadc9b 100644 --- a/test/stderr/2120 +++ b/test/stderr/2120 @@ -1,8 +1,2 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option ******** SERVER ******** -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option |