Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0612 b/test/scripts/0000-Basic/0612
index c5e3bfba10cd622306c82405183b00b4c6c40f9d..f9f283dcb32c2ef794afc35108b4160a838e8971 100644 (file)
--- a/test/scripts/0000-Basic/0612
+++ b/test/scripts/0000-Basic/0612
@@ -8,6 +8,7 @@ client 127.0.0.1 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
 EHLO testclient
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250 HELP
 ****
 killdaemon
 ??? 250 HELP
 ****
 killdaemon


@@ -23,6 +24,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
 EHLO testclient
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<a@dump.ex>
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<a@dump.ex>


@@ -50,6 +52,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
 EHLO testclient
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<b@dump.ex>
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<b@dump.ex>


@@ -84,6 +87,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
 EHLO testclient
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<b2@dump.ex>
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<b2@dump.ex>


@@ -121,6 +125,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
 EHLO testclient
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<c@dump.ex>
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<c@dump.ex>


@@ -146,6 +151,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
 EHLO testclient
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<d@dump.ex>
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<d@dump.ex>


@@ -186,6 +192,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
 EHLO testclient
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<e@dump.ex>
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<e@dump.ex>