DMARC: Avoid using Resent-From: header. Bug 3029

[exim.git] / test / stderr / 3212

diff --git a/test/stderr/3212 b/test/stderr/3212
index 4be275df297e4eb74aa94319db4d9c5ee29e9b13..f9f556d3070fc2f05644d5c2bcdaba7b769264ea 100644 (file)
--- a/test/stderr/3212
+++ b/test/stderr/3212
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -42,7 +17,7 @@ sender address = CALLER@myhost.test.ex
  file lookup required for list
    in TESTSUITE/aux-fixed/3212.aliases
  creating new cache entry
- lookup yielded: userx, usery
+ lookup yielded: userx,░usery
  search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
    cached open
  search_find: file="TESTSUITE/aux-fixed/3212.aliases"
@@ -54,7 +29,7 @@ sender address = CALLER@myhost.test.ex
    type=lsearch key="list" opts=NULL
  cached data used for lookup of list
    in TESTSUITE/aux-fixed/3212.aliases
- lookup yielded: userx, usery
+ lookup yielded: userx,░usery
  search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
    cached open
  search_find: file="TESTSUITE/aux-fixed/3212.aliases"
@@ -91,7 +66,7 @@ sender address = CALLER@myhost.test.ex
    type=lsearch key="list" opts=NULL
  cached data used for lookup of list
    in TESTSUITE/aux-fixed/3212.aliases
- lookup yielded: userx, usery
+ lookup yielded: userx,░usery
  search_open: testdb "NULL"
  search_find: file="NULL"
    key="something" partial=-1 affix=NULL starflags=0 opts=NULL
@@ -149,7 +124,7 @@ sender address = CALLER@myhost.test.ex
    type=lsearch key="list" opts=NULL
  cached data used for lookup of list
    in TESTSUITE/aux-fixed/3212.aliases
- lookup yielded: userx, usery
+ lookup yielded: userx,░usery
  search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
    cached open
  search_find: file="TESTSUITE/aux-fixed/3212.aliases"