From 9d6bb16d6af8c4d2c5e2f58d2a6983c03600c35a Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 9 Dec 2012 14:27:37 +0000
Subject: Fix tests 5400, 5401, 5410, 5420 to work under any user.

---
 test/scripts/5400-cutthrough/5400         | 6 +++---
 test/scripts/5400-cutthrough/5401         | 2 +-
 test/scripts/5410-cutthrough-OpenSSL/5410 | 6 +++---
 test/scripts/5420-cutthrough-GnuTLS/5420  | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'test/scripts')

diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400
index ccf5e7429..56d6fec77 100644
--- a/test/scripts/5400-cutthrough/5400
+++ b/test/scripts/5400-cutthrough/5400
@@ -18,7 +18,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 DATA
 
@@ -47,7 +47,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userz@domain.com>
 DATA
 
@@ -83,7 +83,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 RCPT TO:<userx@domain.com>
 DATA
diff --git a/test/scripts/5400-cutthrough/5401 b/test/scripts/5400-cutthrough/5401
index 42a90f4cb..d92110ce5 100644
--- a/test/scripts/5400-cutthrough/5401
+++ b/test/scripts/5400-cutthrough/5401
@@ -18,7 +18,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 DATA
 
diff --git a/test/scripts/5410-cutthrough-OpenSSL/5410 b/test/scripts/5410-cutthrough-OpenSSL/5410
index 9938e00e5..9f5ff7196 100644
--- a/test/scripts/5410-cutthrough-OpenSSL/5410
+++ b/test/scripts/5410-cutthrough-OpenSSL/5410
@@ -4,7 +4,7 @@ exim -DSERVER=server -bd -oX PORT_D
 # this one should succeed
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 DATA
 
@@ -15,7 +15,7 @@ QUIT
 # so this one should not use TLS
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 DATA
 
@@ -26,7 +26,7 @@ QUIT
 # so this one should not use TLS
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 DATA
 
diff --git a/test/scripts/5420-cutthrough-GnuTLS/5420 b/test/scripts/5420-cutthrough-GnuTLS/5420
index c43e1865b..446bcc667 100644
--- a/test/scripts/5420-cutthrough-GnuTLS/5420
+++ b/test/scripts/5420-cutthrough-GnuTLS/5420
@@ -3,7 +3,7 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 DATA
 
@@ -13,7 +13,7 @@ QUIT
 # via a transport setting hosts_avoid_tls
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 DATA
 
@@ -23,7 +23,7 @@ QUIT
 # via a transport setting hosts_verify_avoid_tls
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 DATA
 
-- 
cgit v1.2.3