OpenSSL: Default the SINGLE_DH_USE option flag set

[users/heiko/exim.git] / test / stderr / 0227

diff --git a/test/stderr/0227 b/test/stderr/0227
index 8a34bd454fa5d99ab56c2f2d28d4f7512e3ec24c..7a75ec0154da7bca8610490d8d14faa71cc60965 100644 (file)
--- a/test/stderr/0227
+++ b/test/stderr/0227
@@ -2,7 +2,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -19,7 +19,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -36,7 +36,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -53,7 +53,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 550 Error for <>
@@ -68,7 +68,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 550-Multiline error for <>
@@ -84,7 +84,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -92,14 +92,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 550 Recipient not liked
   SMTP>> QUIT
 LOG: MAIN REJECT
-  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: (recipient): response to "RCPT TO:<z@remote.domain>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
+  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: response to "RCPT TO:<z@remote.domain>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -108,7 +108,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
          550 Here's the second
   SMTP>> QUIT
 LOG: MAIN REJECT
-  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: (recipient): response to "RCPT TO:<z@remote.domain>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second
+  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: response to "RCPT TO:<z@remote.domain>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
@@ -123,7 +123,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -138,7 +138,7 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -153,12 +153,13 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<ok@localhost1>
   SMTP<< 250 OK
+Cutthrough cancelled by presence of postmaster verify
   SMTP>> RSET
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
@@ -174,12 +175,13 @@ LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<ok@localhost1>
   SMTP<< 250 OK
+Cutthrough cancelled by presence of postmaster verify
   SMTP>> RSET
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
@@ -190,7 +192,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 LOG: MAIN REJECT
   H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: response to "RCPT TO:<postmaster@localhost1>" from 127.0.0.1 [127.0.0.1] was: 550 Don't like postmaster
 LOG: MAIN REJECT
-  H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: (postmaster): Sender verify failed
+  H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
@@ -205,7 +207,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 550 Recipient not liked
   SMTP>> QUIT
 LOG: MAIN REJECT
-  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: (recipient): response to "RCPT TO:<z@remote.lmtp>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
+  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: response to "RCPT TO:<z@remote.lmtp>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN