DMARC: expand main-config options. Bug 3102

[exim.git] / test / scripts / 0000-Basic / 0035

diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035
index d0805bdeec8c833fd10414195cc059fc83d2a6a0..3894de6fe6b04b19b993ff282b2f2ff6210eacc4 100644 (file)
--- a/test/scripts/0000-Basic/0035
+++ b/test/scripts/0000-Basic/0035
@@ -3,14 +3,15 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****

-client -t5 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-

-??? 250-
-??? 250-
-??? 250-
-??? 250
+??? 250-SIZE
+??? 250-LIMITS
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250 HELP

 mail from:<notsubmit@y>
 ??? 250
 rcpt to:<x@y>
 mail from:<notsubmit@y>
 ??? 250
 rcpt to:<x@y>


@@ -61,13 +62,14 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/sender_retain -bd -oX PORT_D
 ****
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/sender_retain -bd -oX PORT_D
 ****

-client -t5 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 mail from:<a@y>
 ??? 250
 ??? 250
 mail from:<a@y>
 ??? 250


@@ -86,13 +88,14 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/name=SomeName -bd -oX PORT_D
 ****
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/name=SomeName -bd -oX PORT_D
 ****

-client -t5 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 mail from:<a@y>
 ??? 250
 ??? 250
 mail from:<a@y>
 ??? 250