Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0069 b/test/scripts/0000-Basic/0069
index 9170dfc58eebbd8259715d05b27069db796a9773..729d19f5ee2284b4edfe5aff6fc058a21fdf4afb 100644 (file)
--- a/test/scripts/0000-Basic/0069
+++ b/test/scripts/0000-Basic/0069
@@ -2,41 +2,49 @@
 need_ipv4
 #
 exim -bh V4NET.0.0.1
 need_ipv4
 #
 exim -bh V4NET.0.0.1

+helo test

 mail from:<x@y>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 mail from:<x@y>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<y@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx@test.ex>
 rcpt to:<y@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<z@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13 -DLOG_SELECTOR=log_selector=+unknown_in_list
 MAIL FROM:<userx@test.ex>
 rcpt to:<z@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13 -DLOG_SELECTOR=log_selector=+unknown_in_list

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<y@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx@test.ex>
 rcpt to:<y@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx>
 rcpt to:<a@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx>
 rcpt to:<a@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<b@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx@test.ex>
 rcpt to:<b@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<c@test.ex>
 quit
 MAIL FROM:<userx@test.ex>
 rcpt to:<c@test.ex>
 quit