DMARC: expand main-config options. Bug 3102

[exim.git] / test / scripts / 3450-plaintext-GnuTLS / 3450

diff --git a/test/scripts/3450-plaintext-GnuTLS/3450 b/test/scripts/3450-plaintext-GnuTLS/3450
index 0494118ca94d4afff4d1c6654b397e56c8da6d72..5f7d23bde9ec6a1e1804d6a389c69fd716adb374 100644 (file)
--- a/test/scripts/3450-plaintext-GnuTLS/3450
+++ b/test/scripts/3450-plaintext-GnuTLS/3450
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****

-client-ssl HOSTIPV4 PORT_D
+client-gnutls HOSTIPV4 PORT_D

 ??? 220
 ehlo foobar
 ??? 250-
 ??? 220
 ehlo foobar
 ??? 250-


@@ -11,13 +11,14 @@ ehlo foobar
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 auth plain AHVzZXJ4AHNlY3JldA==
 ??? 235
 quit
 ??? 221
 ****
 ??? 250
 auth plain AHVzZXJ4AHNlY3JldA==
 ??? 235
 quit
 ??? 221
 ****

-client-ssl 127.0.0.1 PORT_D
+client-gnutls 127.0.0.1 PORT_D

 ??? 220
 ehlo foobar
 ??? 250-
 ??? 220
 ehlo foobar
 ??? 250-


@@ -26,6 +27,7 @@ ehlo foobar
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 auth plain AHVzZXJ4AHNlY3JldA==
 ??? 503
 ??? 250
 auth plain AHVzZXJ4AHNlY3JldA==
 ??? 503


@@ -37,6 +39,7 @@ ehlo foobar
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 auth plain AHVzZXJ4AHNlY3JldA==
 ??? 235
 ??? 250
 auth plain AHVzZXJ4AHNlY3JldA==
 ??? 235