Make -n combine with -bP to inhibit names

[users/jgh/exim.git] / test / stdout / 2114

diff --git a/test/stdout/2114 b/test/stdout/2114
index f675141ce7a2b38efaa3737c514726cf2134f43f..35a69691518aae0da32afce57bba34e7f5cb8e61 100644 (file)
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -7,6 +7,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -21,6 +23,7 @@ SSL info: before/connect initialization
 SSL info: SSLv2/v3 write client hello A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -28,8 +31,8 @@ SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSLv3 read finished A
+SSL info: SSLv3 read server session ticket A
+SSL info: SSLv3 read server session ticket A
 pppp:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
 Failed to start TLS
 End of script
@@ -42,6 +45,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -56,6 +61,7 @@ SSL info: before/connect initialization
 SSL info: SSLv2/v3 write client hello A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -63,6 +69,7 @@ SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -92,6 +99,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -106,6 +115,7 @@ SSL info: before/connect initialization
 SSL info: SSLv2/v3 write client hello A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -114,6 +124,7 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -140,6 +151,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -154,6 +167,7 @@ SSL info: before/connect initialization
 SSL info: SSLv2/v3 write client hello A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -162,6 +176,7 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -188,6 +203,8 @@ Key file = aux-fixed/cert1
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -202,6 +219,7 @@ SSL info: before/connect initialization
 SSL info: SSLv2/v3 write client hello A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -210,8 +228,8 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSLv3 read finished A
+SSL info: SSLv3 read server session ticket A
+SSL info: SSLv3 read server session ticket A
 pppp:error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48
 Failed to start TLS
 End of script
@@ -226,6 +244,8 @@ Key file = aux-fixed/cert1
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -240,6 +260,7 @@ SSL info: before/connect initialization
 SSL info: SSLv2/v3 write client hello A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -248,6 +269,7 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -258,9 +280,9 @@ Succeeded in starting TLS
 <<< 250 OK
 >>> rcpt to:<userx@test.ex>
 ??? 550-
-<<< 550-certificate not verified: peerdn=/C=UK/L=Cambridge/O=University of
+<<< 550-certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test
 ??? 550
-<<< 550 Cambridge/OU=Computing Service/CN=Philip Hazel
+<<< 550 Suite/CN=Phil Pennock
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -276,6 +298,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -290,6 +314,7 @@ SSL info: before/connect initialization
 SSL info: SSLv2/v3 write client hello A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -298,8 +323,8 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSLv3 read finished A
+SSL info: SSLv3 read server session ticket A
+SSL info: SSLv3 read server session ticket A
 pppp:error:14094414:SSL routines:SSL3_READ_BYTES:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44
 Failed to start TLS
 End of script
@@ -314,6 +339,8 @@ Key file = aux-fixed/cert1
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -328,6 +355,7 @@ SSL info: before/connect initialization
 SSL info: SSLv2/v3 write client hello A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -336,6 +364,7 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -346,9 +375,9 @@ Succeeded in starting TLS
 <<< 250 OK
 >>> rcpt to:<userx@test.ex>
 ??? 550-
-<<< 550-certificate not verified: peerdn=/C=UK/L=Cambridge/O=University of
+<<< 550-certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test
 ??? 550
-<<< 550 Cambridge/OU=Computing Service/CN=Philip Hazel
+<<< 550 Suite/CN=Phil Pennock
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection