DANE: do not override a cert verify failure, in callback. Also fix some test mistakes

[users/heiko/exim.git] / test / scripts / 0000-Basic / 0227

diff --git a/test/scripts/0000-Basic/0227 b/test/scripts/0000-Basic/0227
index 62832e01285936818eb722f0c7a6592adb950494..59adba788b85967c48458bac91f88b169ecd9a29 100644 (file)
--- a/test/scripts/0000-Basic/0227
+++ b/test/scripts/0000-Basic/0227
@@ -1,9 +1,9 @@
-# callout verification (no caching)
+# callout verification (no caching) and $router_name

 need_ipv4
 #
 server PORT_S
 220 Server ready
 need_ipv4
 #
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -24,7 +24,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -40,7 +40,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -56,7 +56,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 550 Error for <>
 250 OK
 MAIL FROM
 550 Error for <>


@@ -70,7 +70,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 550-Multiline error for <>
 250 OK
 MAIL FROM
 550-Multiline error for <>


@@ -85,7 +85,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -101,7 +101,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -123,7 +123,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -142,7 +142,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -161,7 +161,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK


@@ -183,7 +183,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
 ****
 server PORT_S
 220 Server ready

-HELO
+EHLO

 250 OK
 MAIL FROM
 250 OK
 250 OK
 MAIL FROM
 250 OK