Fix error logging for dynamically-loaded modules. Bug 2507

[users/heiko/exim.git] / test / stdout / 5820

diff --git a/test/stdout/5820 b/test/stdout/5820
index 49dac098a7f728bcb867f105f45ad68034984aea..1c517a3010e14f0dda06fce93c2052137e0d198d 100644 (file)
--- a/test/stdout/5820
+++ b/test/stdout/5820
@@ -1,5 +1,5 @@
-### TLSA (3 1 1)
-### TLSA (3 1 2)
+### TLSA (3 1 1) (DANE-EE SPKI SHA2-256)
+### TLSA (3 1 2) (            SHA2-512)

 ### Recipient callout
 
 **** SMTP testing session as if from host 127.0.0.1
 ### Recipient callout
 
 **** SMTP testing session as if from host 127.0.0.1


@@ -10,7 +10,7 @@
 250 OK\r
 250 Accepted\r
 421 myhost.test.ex lost input connection\r
 250 OK\r
 250 Accepted\r
 421 myhost.test.ex lost input connection\r

-### TLSA (2 0 1)
+### 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
 ### A server with two MXs for which both TLSA lookups return defer (delivery should defer)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA
 ### A server with two MXs for which both TLSA lookups return defer (delivery should defer)


@@ -19,17 +19,23 @@
 ### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer)
 ### A server securely saying "no TLSA records here", dane required (delivery should fail)
 ### A server securely saying "no TLSA records here", dane requested only (should deliver)
 ### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer)
 ### A server securely saying "no TLSA records here", dane required (delivery should fail)
 ### A server securely saying "no TLSA records here", dane requested only (should deliver)

+Message 10HmbH-0005vi-00 has been removed
+Message 10HmbK-0005vi-00 has been removed

 ### A server securely serving a wrong TLSA record, dane requested only (delivery should fail)
 ### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good TLSA record, dane required (delivery should fail)
 ### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good A record, dane required (delivery should fail)
 ### A server securely serving a wrong TLSA record, dane requested only (delivery should fail)
 ### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good TLSA record, dane required (delivery should fail)
 ### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good A record, dane required (delivery should fail)

+### A server with a mixed-usage set of TLSAs - the EE-mode one failing verify (should deliver, DANE-mode)
+### A server with a name not matching the cert.  TA-mode; should fail
+### A server with a name not matching the cert.  EE-mode; should deliver and claim DANE mode
+### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)

 
 ******** SERVER ********
 
 ******** SERVER ********

-### TLSA (3 1 1)
-### TLSA (3 1 2)
+### TLSA (3 1 1) (DANE-EE SPKI SHA2-256)
+### TLSA (3 1 2) (            SHA2-512)

 ### Recipient callout
 ### Recipient callout

-### TLSA (2 0 1)
+### 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
 ### A server with two MXs for which both TLSA lookups return defer (delivery should defer)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA
 ### A server with two MXs for which both TLSA lookups return defer (delivery should defer)


@@ -43,3 +49,7 @@
 ### A server insecurely serving a good TLSA record, dane required (delivery should fail)
 ### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good A record, dane required (delivery should fail)
 ### A server insecurely serving a good TLSA record, dane required (delivery should fail)
 ### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good A record, dane required (delivery should fail)

+### A server with a mixed-usage set of TLSAs - the EE-mode one failing verify (should deliver, DANE-mode)
+### A server with a name not matching the cert.  TA-mode; should fail
+### A server with a name not matching the cert.  EE-mode; should deliver and claim DANE mode
+### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)