From 64226a31616e631b9e10f7897d603cdf9847a458 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 22 Mar 2024 23:05:02 +0000 Subject: [PATCH] Debug: mark up space/nl in lookup results --- src/src/search.c | 2 +- test/stderr/0085 | 16 ++++++++-------- test/stderr/0464 | 2 +- test/stderr/0484 | 12 ++++++------ test/stderr/2201 | 8 ++++---- test/stderr/2600 | 32 ++++++++++++++++---------------- test/stderr/2610 | 24 ++++++++++++------------ test/stderr/2620 | 32 ++++++++++++++++---------------- test/stderr/3212 | 8 ++++---- 9 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/src/search.c b/src/src/search.c index 27c686a5d..168c25e6a 100644 --- a/src/src/search.c +++ b/src/src/search.c @@ -686,7 +686,7 @@ out: DEBUG(D_lookup) { if (data) - debug_printf_indent("lookup yielded: %s\n", data); + debug_printf_indent("lookup yielded: %W\n", data); else if (f.search_find_defer) debug_printf_indent("lookup deferred: %s\n", search_error_message); else debug_printf_indent("lookup failed\n"); diff --git a/test/stderr/0085 b/test/stderr/0085 index 520e9de95..5befd2cfd 100644 --- a/test/stderr/0085 +++ b/test/stderr/0085 @@ -66,7 +66,7 @@ checking local_parts file lookup required for smart.domain in TESTSUITE/aux-fixed/0085.data creating new cache entry - lookup yielded: x : y : abc@d.e.f + lookup yielded: x░:░y░:░abc@d.e.f x in "x : y : abc@d.e.f"? list element: x x in "x : y : abc@d.e.f"? yes (matched "x") @@ -82,7 +82,7 @@ checking senders type=lsearch key="smart.domain" opts=NULL cached data used for lookup of smart.domain in TESTSUITE/aux-fixed/0085.data - lookup yielded: x : y : abc@d.e.f + lookup yielded: x░:░y░:░abc@d.e.f abc@d.e.f in "x : y : abc@d.e.f"? list element: x address match test: subject=abc@d.e.f pattern=x @@ -161,7 +161,7 @@ checking local_parts file lookup required for test.ex in TESTSUITE/aux-fixed/0085.data creating new cache entry - lookup yielded: x : y : abc@d.e.f + lookup yielded: x░:░y░:░abc@d.e.f x in "x : y : abc@d.e.f"? list element: x x in "x : y : abc@d.e.f"? yes (matched "x") @@ -177,7 +177,7 @@ checking senders type=lsearch key="test.ex" opts=NULL cached data used for lookup of test.ex in TESTSUITE/aux-fixed/0085.data - lookup yielded: x : y : abc@d.e.f + lookup yielded: x░:░y░:░abc@d.e.f abc@d.e.f in "x : y : abc@d.e.f"? list element: x address match test: subject=abc@d.e.f pattern=x @@ -328,7 +328,7 @@ checking local_parts file lookup required for smart.domain in TESTSUITE/aux-fixed/0085.data creating new cache entry - lookup yielded: x : y : abc@d.e.f + lookup yielded: x░:░y░:░abc@d.e.f x in "x : y : abc@d.e.f"? list element: x x in "x : y : abc@d.e.f"? yes (matched "x") @@ -344,7 +344,7 @@ checking senders type=lsearch key="smart.domain" opts=NULL cached data used for lookup of smart.domain in TESTSUITE/aux-fixed/0085.data - lookup yielded: x : y : abc@d.e.f + lookup yielded: x░:░y░:░abc@d.e.f CALLER@myhost.test.ex in "x : y : abc@d.e.f"? list element: x address match test: subject=CALLER@myhost.test.ex pattern=x @@ -424,7 +424,7 @@ checking local_parts file lookup required for test.ex in TESTSUITE/aux-fixed/0085.data creating new cache entry - lookup yielded: x : y : abc@d.e.f + lookup yielded: x░:░y░:░abc@d.e.f x in "x : y : abc@d.e.f"? list element: x x in "x : y : abc@d.e.f"? yes (matched "x") @@ -440,7 +440,7 @@ checking senders type=lsearch key="test.ex" opts=NULL cached data used for lookup of test.ex in TESTSUITE/aux-fixed/0085.data - lookup yielded: x : y : abc@d.e.f + lookup yielded: x░:░y░:░abc@d.e.f CALLER@myhost.test.ex in "x : y : abc@d.e.f"? list element: x address match test: subject=CALLER@myhost.test.ex pattern=x diff --git a/test/stderr/0464 b/test/stderr/0464 index 388539123..1d2b22b96 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -39,7 +39,7 @@ domain1 in "+special_domains"? ╎file lookup required for domain1 ╎ in TESTSUITE/aux-fixed/0464.domains ╎creating new cache entry - ╎lookup yielded: data for domain1 + ╎lookup yielded: data░for░domain1 ╎domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? yes (matched "lsearch;TESTSUITE/aux-fixed/0464.domains") end sublist special_domains data from lookup saved for cache for +special_domains: key 'domain1' value 'data for domain1' diff --git a/test/stderr/0484 b/test/stderr/0484 index 6b3e2f02f..22ea6ae65 100644 --- a/test/stderr/0484 +++ b/test/stderr/0484 @@ -17,7 +17,7 @@ sender address = CALLER@myhost.test.ex file lookup required for list in TESTSUITE/aux-fixed/0484.aliases creating new cache entry - lookup yielded: userx, usery + lookup yielded: userx,░usery search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases" cached open search_find: file="TESTSUITE/aux-fixed/0484.aliases" @@ -29,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/0484.aliases - lookup yielded: userx, usery + lookup yielded: userx,░usery search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases" cached open search_find: file="TESTSUITE/aux-fixed/0484.aliases" @@ -66,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/0484.aliases - lookup yielded: userx, usery + lookup yielded: userx,░usery search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases2" search_find: file="TESTSUITE/aux-fixed/0484.aliases2" key="list" partial=-1 affix=NULL starflags=0 opts=NULL @@ -79,7 +79,7 @@ sender address = CALLER@myhost.test.ex file lookup required for list in TESTSUITE/aux-fixed/0484.aliases2 creating new cache entry - lookup yielded: userx2, usery2 + lookup yielded: userx2,░usery2 search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases2" cached open search_find: file="TESTSUITE/aux-fixed/0484.aliases2" @@ -106,7 +106,7 @@ sender address = CALLER@myhost.test.ex type=lsearch key="list" opts=NULL cached data used for lookup of list in TESTSUITE/aux-fixed/0484.aliases2 - lookup yielded: userx2, usery2 + lookup yielded: userx2,░usery2 search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases" cached open search_find: file="TESTSUITE/aux-fixed/0484.aliases" @@ -119,7 +119,7 @@ sender address = CALLER@myhost.test.ex type=lsearch key="list" opts=NULL cached data used for lookup of list in TESTSUITE/aux-fixed/0484.aliases - lookup yielded: userx, usery + lookup yielded: userx,░usery search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases" cached open search_find: file="TESTSUITE/aux-fixed/0484.aliases" diff --git a/test/stderr/2201 b/test/stderr/2201 index 61b8b2967..cc1a37aed 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -43,7 +43,7 @@ test.ex in "dnsdb;test.ex"? DNS lookup of test.ex (TXT) using fakens DNS lookup of test.ex (TXT) succeeded creating new cache entry - lookup yielded: A TXT record for test.ex. + lookup yielded: A░TXT░record░for░test.ex. test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex") checking local_parts test.ex in "dnsdb;test.ex"? @@ -56,7 +56,7 @@ test.ex in "dnsdb;test.ex"? internal_search_find: file="NULL" type=dnsdb key="test.ex" opts=NULL cached data used for lookup of test.ex - lookup yielded: A TXT record for test.ex. + lookup yielded: A░TXT░record░for░test.ex. test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex") calling r1 router r1 router called for test.ex@test.ex @@ -96,7 +96,7 @@ test.ex in "dnsdb;test.ex"? internal_search_find: file="NULL" type=dnsdb key="test.ex" opts=NULL cached data used for lookup of test.ex - lookup yielded: A TXT record for test.ex. + lookup yielded: A░TXT░record░for░test.ex. test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex") checking local_parts unknown in "dnsdb;unknown"? @@ -133,7 +133,7 @@ test.ex in "dnsdb;test.ex"? internal_search_find: file="NULL" type=dnsdb key="test.ex" opts=NULL cached data used for lookup of test.ex - lookup yielded: A TXT record for test.ex. + lookup yielded: A░TXT░record░for░test.ex. test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex") checking senders CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"? diff --git a/test/stderr/2600 b/test/stderr/2600 index a81e20da0..917ead58f 100644 --- 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 .... @@ -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") @@ -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") @@ -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 .... diff --git a/test/stderr/2610 b/test/stderr/2610 index b08ea843f..1dde7606f 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -15,7 +15,7 @@ dropping to exim gid; retaining priv uid MySQL query: "select name from them where id='ph10';" opts 'NULL' MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: mysql "NULL" cached open search_find: file="NULL" @@ -24,7 +24,7 @@ dropping to exim gid; retaining priv uid internal_search_find: file="NULL" type=mysql key="select name from them where id='ph10';" opts=NULL cached data used for lookup of select name from them where id='ph10'; - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: mysql "NULL" cached open search_find: file="NULL" @@ -61,7 +61,7 @@ dropping to exim gid; retaining priv uid MySQL query: "select id,name from them where id='nothing';" opts 'NULL' MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry - lookup yielded: id=nothing name="" + lookup yielded: id=nothing░name=""░ search_open: mysql "NULL" cached open search_find: file="NULL" @@ -112,7 +112,7 @@ dropping to exim gid; retaining priv uid MySQL query: "select * from them where id='quote2';" opts 'NULL' MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry - lookup yielded: name="\"stquot" id=quote2 + lookup yielded: name="\"stquot"░id=quote2░ search_open: mysql "NULL" cached open search_find: file="NULL" @@ -153,7 +153,7 @@ LOG: MAIN WARNING: obsolete syntax used for lookup MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: mysql "NULL" cached open search_find: file="NULL" @@ -168,7 +168,7 @@ LOG: MAIN WARNING: obsolete syntax used for lookup MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: mysql "NULL" cached open search_find: file="NULL" @@ -183,7 +183,7 @@ LOG: MAIN WARNING: obsolete syntax used for lookup MYSQL new connection: host=ip4.ip4.ip4.ip4 port=PORT_N socket=NULL database=test user=root creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: mysql "NULL" cached open search_find: file="NULL" @@ -198,7 +198,7 @@ LOG: MAIN WARNING: obsolete syntax used for lookup MYSQL new connection: host=localhost port=0 socket=TESTSUITE/mysql/sock database=test user=root creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: mysql "NULL" cached open search_find: file="NULL" @@ -210,7 +210,7 @@ LOG: MAIN MySQL query: "SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel↩ Aristotle search_open: mysql "NULL" cached open @@ -223,8 +223,8 @@ LOG: MAIN MySQL query: "SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry - lookup yielded: name="Philip Hazel" id=ph10 - name=Aristotle id=aaaa + lookup yielded: name="Philip░Hazel"░id=ph10░↩ + name=Aristotle░id=aaaa░ search_open: mysql "NULL" cached open search_find: file="NULL" @@ -850,7 +850,7 @@ LOG: MAIN PANIC MySQL query: "select name from them where id='ph10' limit 1" opts 'NULL' MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel calling r1 router r1 router called for ph10@myhost.test.ex domain = myhost.test.ex diff --git a/test/stderr/2620 b/test/stderr/2620 index 4b4bd1ccf..a32994c26 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -15,7 +15,7 @@ dropping to exim gid; retaining priv uid PostgreSQL query: "select name from them where id='ph10';" opts 'NULL' PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -24,7 +24,7 @@ dropping to exim gid; retaining priv uid internal_search_find: file="NULL" type=pgsql key="select name from them where id='ph10';" opts=NULL cached data used for lookup of select name from them where id='ph10'; - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -61,7 +61,7 @@ dropping to exim gid; retaining priv uid PostgreSQL query: "select id,name from them where id='nothing';" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: id=nothing name="" + lookup yielded: id=nothing░name=""░ search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -86,7 +86,7 @@ dropping to exim gid; retaining priv uid PostgreSQL query: "select * from them where id='quote2';" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: name="\"stquot" id=quote2 + lookup yielded: name="\"stquot"░id=quote2░ search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -98,8 +98,8 @@ dropping to exim gid; retaining priv uid PostgreSQL query: "select * from them where id='newline';" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: name="before - after" id=newline + lookup yielded: name="before ↩ + after"░id=newline░ search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -111,7 +111,7 @@ dropping to exim gid; retaining priv uid PostgreSQL query: "select * from them where id='tab';" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: name="x x" id=tab + lookup yielded: name="x x"░id=tab░ search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -123,7 +123,7 @@ dropping to exim gid; retaining priv uid PostgreSQL query: "select * from them where name='''stquot';" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: name='stquot id=quote1 + lookup yielded: name='stquot░id=quote1░ search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -151,7 +151,7 @@ LOG: MAIN WARNING: obsolete syntax used for lookup PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -166,7 +166,7 @@ LOG: MAIN WARNING: obsolete syntax used for lookup PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -181,7 +181,7 @@ LOG: MAIN WARNING: obsolete syntax used for lookup PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -193,7 +193,7 @@ LOG: MAIN PostgreSQL query: "SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel↩ Aristotle search_open: pgsql "NULL" cached open @@ -206,8 +206,8 @@ LOG: MAIN PostgreSQL query: "SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry - lookup yielded: name="Philip Hazel" id=ph10 - name=Aristotle id=aaaa + lookup yielded: name="Philip░Hazel"░id=ph10░↩ + name=Aristotle░id=aaaa░ search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -750,7 +750,7 @@ processing address_data PostgreSQL query: "select name from them where id='ph10'" opts 'NULL' PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel calling r1 router r1 router called for CALLER@myhost.test.ex domain = myhost.test.ex @@ -860,7 +860,7 @@ dropping to exim gid; retaining priv uid PostgreSQL query: "select name from them where id='ph10';" opts 'NULL' PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER creating new cache entry - lookup yielded: Philip Hazel + lookup yielded: Philip░Hazel search_tidyup called close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3212 b/test/stderr/3212 index a0cc58945..f9f556d30 100644 --- a/test/stderr/3212 +++ b/test/stderr/3212 @@ -17,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" @@ -29,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" @@ -66,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 @@ -124,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" -- 2.30.2