Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0060 b/test/scripts/0000-Basic/0060
index 87981047ca566337837489d7841c759b30a4ea0d..84b8fc4c1f2d9c93d037e07c3e08d92541173915 100644 (file)
--- a/test/scripts/0000-Basic/0060
+++ b/test/scripts/0000-Basic/0060
@@ -1,5 +1,6 @@
 # Relay by hostlist match for host name or IP address
 exim -bh V4NET.0.0.1
 # Relay by hostlist match for host name or IP address
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -16,6 +18,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.5
 quit
 ****
 exim -bh V4NET.0.0.5

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -24,6 +27,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.6
 quit
 ****
 exim -bh V4NET.0.0.6

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -32,6 +36,7 @@ data
 quit
 ****
 exim -bh V4NET.255.0.1
 quit
 ****
 exim -bh V4NET.255.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -40,6 +45,7 @@ data
 quit
 ****
 exim -bh V4NET.255.0.2
 quit
 ****
 exim -bh V4NET.255.0.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -48,6 +54,7 @@ data
 quit
 ****
 exim -bh V4NET.255.0.3
 quit
 ****
 exim -bh V4NET.255.0.3

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -56,6 +63,7 @@ data
 quit
 ****
 exim -bh V4NET.255.0.4
 quit
 ****
 exim -bh V4NET.255.0.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>