Fix portability issues on *BSD and MacOS

[exim.git] / test / stderr / 0002

diff --git a/test/stderr/0002 b/test/stderr/0002
index b4f06a104862e8d795d750c6559605954dc29128..d94e3686ac476b0eda2203e4508c44dea6694bac 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -130,6 +130,15 @@ expanding: -oMt  sender_ident = $sender_ident
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -189,6 +198,15 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -373,6 +391,15 @@ LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME