git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Testsuite: munge for non-dkim
[exim.git] / test / stderr / 2600
diff --git a/test/stderr/2600 b/test/stderr/2600
index 72291ff43685d914932b8f26f9ab86c11c449ba0..ae1208ca61deac0fc00bde71e23e4132561babbf 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -11,7 +11,7 @@ dropping to exim gid; retaining priv uid
  file lookup required for select name from them where id='userx';
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: Ayen Other
+ lookup yielded: Ayen░Other
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -22,7 +22,7 @@ dropping to exim gid; retaining priv uid
  cached data found but wrong opts;  file lookup required for select name from them where id='userx';
  c  in TESTSUITE/aux-fixed/sqlitedb
  replacing old cache entry
- lookup yielded: Ayen Other
+ lookup yielded: Ayen░Other
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -33,7 +33,7 @@ dropping to exim gid; retaining priv uid
  cached data found but wrong opts;  file lookup required for select name from them where id='userx';
  c  in TESTSUITE/aux-fixed/sqlitedb
  replacing old cache entry
- lookup yielded: Ayen Other
+ lookup yielded: Ayen░Other
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -43,7 +43,7 @@ dropping to exim gid; retaining priv uid
    type=sqlite key="select name from them where id='userx';" opts="file=TESTSUITE/aux-fixed/sqlitedb"
  cached data used for lookup of select name from them where id='userx';
    in TESTSUITE/aux-fixed/sqlitedb
- lookup yielded: Ayen Other
+ lookup yielded: Ayen░Other
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -76,7 +76,7 @@ dropping to exim gid; retaining priv uid
  file lookup required for select id,name from them where id='nothing';
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: id=nothing name="" 
+ lookup yielded: id=nothing░name=""░
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -87,7 +87,7 @@ dropping to exim gid; retaining priv uid
  file lookup required for select * from them where id='quote2';
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: name="\"stquot" id=quote2 
+ lookup yielded: name="\"stquot"░id=quote2░
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -98,8 +98,8 @@ dropping to exim gid; retaining priv uid
  file lookup required for select * from them where id='newline';
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: name="before
- after" id=newline 
+ lookup yielded: name="before↩
+ after"░id=newline░
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -110,7 +110,7 @@ dropping to exim gid; retaining priv uid
  file lookup required for select * from them where id='tab';
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: name="x       x" id=tab 
+ lookup yielded: name="x␉x"░id=tab░
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -121,7 +121,7 @@ dropping to exim gid; retaining priv uid
  file lookup required for select * from them where id='its';
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: name=it's id=its 
+ lookup yielded: name=it's░id=its░
  search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    cached open
  search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -132,7 +132,7 @@ dropping to exim gid; retaining priv uid
  file lookup required for select * from them where name='it''s';
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: name=it's id=its 
+ lookup yielded: name=it's░id=its░
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -193,7 +193,7 @@ host in "+relay_hosts"?
  list element: +relay_hosts
   start sublist relay_hosts
   host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'"?
-   ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'
+   ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb;░select░*░from░them░where░id='10.0.0.0'
    ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb"
    ╎  key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts="file=TESTSUITE/aux-fixed/sqlitedb"
@@ -234,7 +234,7 @@ host in "+relay_hosts"?
  list element: +relay_hosts
   start sublist relay_hosts
   host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'"?
-   ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'
+   ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb;░select░*░from░them░where░id='10.0.0.0'
    ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    ╎  cached open
    ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -321,7 +321,7 @@ host in "+relay_hosts"?
  list element: +relay_hosts
   start sublist relay_hosts
   host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"?
-   ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'
+   ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb░select░*░from░them░where░id='10.0.0.0'
    ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb"
    ╎  key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts=NULL
@@ -362,7 +362,7 @@ host in "+relay_hosts"?
  list element: +relay_hosts
   start sublist relay_hosts
   host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"?
-   ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'
+   ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb░select░*░from░them░where░id='10.0.0.0'
    ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    ╎  cached open
    ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -449,7 +449,7 @@ host in "+relay_hosts"?
  list element: +relay_hosts
   start sublist relay_hosts
   host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"?
-   ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'
+   ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb░select░*░from░them░where░id='10.10.10.10'
    ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb"
    ╎  key="select * from them where id='10.10.10.10'" partial=-1 affix=NULL starflags=0 opts=NULL
@@ -459,7 +459,7 @@ host in "+relay_hosts"?
    ╎file lookup required for select * from them where id='10.10.10.10'
    ╎  in TESTSUITE/aux-fixed/sqlitedb
    ╎creating new cache entry
-   ╎lookup yielded: name=ok id=10.10.10.10 
+   ╎lookup yielded: name=ok░id=10.10.10.10░
    ╎host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'")
   end sublist relay_hosts
   host in "+relay_hosts"? yes (matched "+relay_hosts")
@@ -485,7 +485,7 @@ host in "+relay_hosts"?
  list element: +relay_hosts
   start sublist relay_hosts
   host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"?
-   ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'
+   ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb░select░*░from░them░where░id='10.10.10.10'
    ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
    ╎  cached open
    ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb"
@@ -495,7 +495,7 @@ host in "+relay_hosts"?
    ╎  type=sqlite key="select * from them where id='10.10.10.10'" opts=NULL
    ╎cached data used for lookup of select * from them where id='10.10.10.10'
    ╎  in TESTSUITE/aux-fixed/sqlitedb
-   ╎lookup yielded: name=ok id=10.10.10.10 
+   ╎lookup yielded: name=ok░id=10.10.10.10░
    ╎host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'")
   end sublist relay_hosts
   host in "+relay_hosts"? yes (matched "+relay_hosts")
@@ -529,15 +529,15 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
-F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
+ F From: CALLER_NAME <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
 Data file written for message 10HmaX-000000005vi-0000
@@ -606,7 +606,7 @@ processing address_data
  file lookup required for select name from them where id='userx'
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: Ayen Other
+ lookup yielded: Ayen░Other
 calling r1 router
 r1 router called for userx@myhost.test.ex
   domain = myhost.test.ex
@@ -712,7 +712,7 @@ dropping to exim gid; retaining priv uid
  file lookup required for select name from them where id='userx';
    in TESTSUITE/aux-fixed/sqlitedb
  creating new cache entry
- lookup yielded: Ayen Other
+ lookup yielded: Ayen░Other
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -728,7 +728,7 @@ dropping to exim gid; retaining priv uid
    type=sqlite key="select name from them where id='userx';" opts=NULL
  database lookup required for select name from them where id='userx';
  creating new cache entry
- lookup yielded: Ayen Other
+ lookup yielded: Ayen░Other
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
Master Exim source repository