Testsuite: munge for platform variances

[users/jgh/exim.git] / test / stderr / 2620

diff --git a/test/stderr/2620 b/test/stderr/2620
index e9fffa59fdd2745ca9d9c7c135797317f20ed6cc..337d518507b47fb9ef16b3ee91e81d8c68cc1f1c 100644 (file)
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -8,66 +8,66 @@ admin user
 dropping to exim gid; retaining priv uid
  search_open: pgsql "NULL"
  search_find: file="NULL"
 dropping to exim gid; retaining priv uid
  search_open: pgsql "NULL"
  search_find: file="NULL"

-   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select name from them where id='ph10';"
+   type=pgsql key="select name from them where id='ph10';" opts=NULL

  database lookup required for select name from them where id='ph10';
  database lookup required for select name from them where id='ph10';

- PostgreSQL query: select name from them where id='ph10';
+ PostgreSQL query: "select name from them where id='ph10';" opts 'NULL'

  PGSQL new connection: host=localhost port=1223 database=test user=CALLER
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL new connection: host=localhost port=1223 database=test user=CALLER
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select name from them where id='ph10';"
+   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
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  cached data used for lookup of select name from them where id='ph10';
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
+   key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select name from them where id='xxxx';"
+   type=pgsql key="select name from them where id='xxxx';" opts=NULL

  database lookup required for select name from them where id='xxxx';
  database lookup required for select name from them where id='xxxx';

- PostgreSQL query: select name from them where id='xxxx';
+ PostgreSQL query: "select name from them where id='xxxx';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  PGSQL: no data found
  lookup failed
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  PGSQL: no data found
  lookup failed
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+   key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select name from them where id='nothing';"
+   type=pgsql key="select name from them where id='nothing';" opts=NULL

  database lookup required for select name from them where id='nothing';
  database lookup required for select name from them where id='nothing';

- PostgreSQL query: select name from them where id='nothing';
+ PostgreSQL query: "select name from them where id='nothing';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+   key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select id,name from them where id='nothing';"
+   type=pgsql key="select id,name from them where id='nothing';" opts=NULL

  database lookup required for select id,name from them where id='nothing';
  database lookup required for select id,name from them where id='nothing';

- PostgreSQL query: select id,name from them where id='nothing';
+ PostgreSQL query: "select id,name from them where id='nothing';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: id=nothing name="" 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: id=nothing name="" 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="delete from them where id='nonexist';" partial=-1 affix=NULL starflags=0
+   key="delete from them where id='nonexist';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="delete from them where id='nonexist';"
+   type=pgsql key="delete from them where id='nonexist';" opts=NULL

  database lookup required for delete from them where id='nonexist';
  database lookup required for delete from them where id='nonexist';

- PostgreSQL query: delete from them where id='nonexist';
+ PostgreSQL query: "delete from them where id='nonexist';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  PGSQL: command does not return any data but was successful. Rows affected: 0
  lookup forced cache cleanup
  PGSQL using cached connection for localhost:1223/test/CALLER
  PGSQL: command does not return any data but was successful. Rows affected: 0
  lookup forced cache cleanup


@@ -75,124 +75,124 @@ dropping to exim gid; retaining priv uid
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
+   key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select * from them where id='quote2';"
+   type=pgsql key="select * from them where id='quote2';" opts=NULL

  database lookup required for select * from them where id='quote2';
  database lookup required for select * from them where id='quote2';

- PostgreSQL query: select * from them where id='quote2';
+ PostgreSQL query: "select * from them where id='quote2';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name="\"stquot" id=quote2 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name="\"stquot" id=quote2 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0
+   key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select * from them where id='newline';"
+   type=pgsql key="select * from them where id='newline';" opts=NULL

  database lookup required for select * from them where id='newline';
  database lookup required for select * from them where id='newline';

- PostgreSQL query: select * from them where id='newline';
+ PostgreSQL query: "select * from them where id='newline';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name="before\r
  after" id=newline 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name="before\r
  after" id=newline 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0
+   key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select * from them where id='tab';"
+   type=pgsql key="select * from them where id='tab';" opts=NULL

  database lookup required for select * from them where id='tab';
  database lookup required for select * from them where id='tab';

- PostgreSQL query: select * from them where id='tab';
+ PostgreSQL query: "select * from them where id='tab';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name="x       x" id=tab 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name="x       x" id=tab 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="select * from them where name='''stquot';" partial=-1 affix=NULL starflags=0
+   key="select * from them where name='''stquot';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select * from them where name='''stquot';"
+   type=pgsql key="select * from them where name='''stquot';" opts=NULL

  database lookup required for select * from them where name='''stquot';
  database lookup required for select * from them where name='''stquot';

- PostgreSQL query: select * from them where name='''stquot';
+ PostgreSQL query: "select * from them where name='''stquot';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name='stquot id=quote1 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name='stquot id=quote1 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="servers=x:localhost; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+   key="servers=x:localhost; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="servers=x:localhost; select name from them where id='ph10';"
+   type=pgsql key="servers=x:localhost; select name from them where id='ph10';" opts=NULL

  database lookup required for servers=x:localhost; select name from them where id='ph10';
  database lookup required for servers=x:localhost; select name from them where id='ph10';

- PostgreSQL query: servers=x:localhost; select name from them where id='ph10';
+ PostgreSQL query: "servers=x:localhost; select name from them where id='ph10';" opts 'NULL'

  lookup deferred: PostgreSQL server "x" not found in pgsql_servers
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  lookup deferred: PostgreSQL server "x" not found in pgsql_servers
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="servers=localhost::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+   key="servers=localhost::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="servers=localhost::1223:x; select name from them where id='ph10';"
+   type=pgsql key="servers=localhost::1223:x; select name from them where id='ph10';" opts=NULL

  database lookup required for servers=localhost::1223:x; select name from them where id='ph10';
  database lookup required for servers=localhost::1223:x; select name from them where id='ph10';

- PostgreSQL query: servers=localhost::1223:x; select name from them where id='ph10';
+ PostgreSQL query: "servers=localhost::1223:x; select name from them where id='ph10';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+   key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';"
+   type=pgsql key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" opts=NULL

  database lookup required for servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';
  database lookup required for servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';

- PostgreSQL query: servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';
+ PostgreSQL query: "servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+   key="servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';"
+   type=pgsql key="servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';" opts=NULL

  database lookup required for servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';
  database lookup required for servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';

- PostgreSQL query: servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';
+ PostgreSQL query: "servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';" opts 'NULL'

  PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER
  lookup yielded: Philip Hazel
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
+   key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');"
+   type=pgsql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL

  database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
  database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa');

- PostgreSQL query: SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
+ PostgreSQL query: "SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: Philip Hazel
  Aristotle
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: Philip Hazel
  Aristotle
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
+   key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');"
+   type=pgsql key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL

  database lookup required for SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
  database lookup required for SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');

- PostgreSQL query: SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
+ PostgreSQL query: "SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name="Philip Hazel" id=ph10 
  name=Aristotle id=aaaa 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"
  PGSQL using cached connection for localhost:1223/test/CALLER
  lookup yielded: name="Philip Hazel" id=ph10 
  name=Aristotle id=aaaa 
  search_open: pgsql "NULL"
    cached open
  search_find: file="NULL"

-   key="delete from them where id='aaaa'" partial=-1 affix=NULL starflags=0
+   key="delete from them where id='aaaa'" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="delete from them where id='aaaa'"
+   type=pgsql key="delete from them where id='aaaa'" opts=NULL

  database lookup required for delete from them where id='aaaa'
  database lookup required for delete from them where id='aaaa'

- PostgreSQL query: delete from them where id='aaaa'
+ PostgreSQL query: "delete from them where id='aaaa'" opts 'NULL'

  PGSQL using cached connection for localhost:1223/test/CALLER
  PGSQL: command does not return any data but was successful. Rows affected: 1
  lookup forced cache cleanup
  PGSQL using cached connection for localhost:1223/test/CALLER
  PGSQL: command does not return any data but was successful. Rows affected: 1
  lookup forced cache cleanup


@@ -233,28 +233,107 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"

-processing "accept" (TESTSUITE/test-config 25)
+processing "warn" (TESTSUITE/test-config 27)
+ search_open: pgsql "NULL"
+ search_find: file="NULL"
+   key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id = 'c'" opts=NULL
+ database lookup required for select name from them where id = 'c'
+ PostgreSQL query: "select name from them where id = 'c'" opts 'NULL'
+ PGSQL new connection: host=localhost port=1223 database=test user=CALLER
+ PGSQL: no data found
+ lookup failed
+check set acl_m0 = ok:   ${lookup pgsql                    {select name from them where id = '$local_part'}}
+                 = ok:   
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=SSPEC"
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id = 'c'" opts="servers=SSPEC"
+ cached data found but either wrong opts or dated;  database lookup required for select name from them where id = 'c'
+ PostgreSQL query: "select name from them where id = 'c'" opts 'servers=SSPEC'
+ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+warn: condition test deferred in ACL "check_recipient"
+LOG: MAIN
+  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+processing "warn" (TESTSUITE/test-config 38)
+check set acl_m0 = ok:   hostlist
+check hosts = net-pgsql;select * from them where id='$local_part'
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key="select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key="select * from them where id='c'" opts=NULL
+database lookup required for select * from them where id='c'
+PostgreSQL query: "select * from them where id='c'" opts 'NULL'
+PGSQL using cached connection for localhost:1223/test/CALLER
+PGSQL: no data found
+lookup failed
+host in "net-pgsql;select * from them where id='c'"? no (end of list)
+warn: condition test failed in ACL "check_recipient"
+processing "warn" (TESTSUITE/test-config 41)
+check set acl_m0 = FAIL: hostlist
+check hosts = <& net-pgsql;servers=SSPEC; select * from them where id='$local_part'
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key="servers=SSPEC; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key="servers=SSPEC; select * from them where id='c'" opts=NULL
+database lookup required for servers=SSPEC; select * from them where id='c'
+PostgreSQL query: "servers=SSPEC; select * from them where id='c'" opts 'NULL'
+lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
+warn: condition test deferred in ACL "check_recipient"
+LOG: MAIN
+  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+processing "warn" (TESTSUITE/test-config 46)
+check set acl_m0 = FAIL: hostlist
+check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=SSPEC"
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key=" select * from them where id='c'" opts="servers=SSPEC"
+database lookup required for  select * from them where id='c'
+PostgreSQL query: " select * from them where id='c'" opts 'servers=SSPEC'
+lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
+warn: condition test deferred in ACL "check_recipient"
+LOG: MAIN
+  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+processing "accept" (TESTSUITE/test-config 49)

 check domains = +local_domains
 d in "@"? no (end of list)
 d in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 check domains = +local_domains
 d in "@"? no (end of list)
 d in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"

-processing "accept" (TESTSUITE/test-config 26)
+processing "accept" (TESTSUITE/test-config 50)

 check hosts = +relay_hosts
 search_open: pgsql "NULL"
 check hosts = +relay_hosts
 search_open: pgsql "NULL"

+  cached open

 search_find: file="NULL"
 search_find: file="NULL"

-  key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0
+  key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts=NULL

 LRU list:
 internal_search_find: file="NULL"
 LRU list:
 internal_search_find: file="NULL"

-  type=pgsql key="select * from them where id='10.0.0.0'"
+  type=pgsql key="select * from them where id='10.0.0.0'" opts=NULL

 database lookup required for select * from them where id='10.0.0.0'
 database lookup required for select * from them where id='10.0.0.0'

-PostgreSQL query: select * from them where id='10.0.0.0'
-PGSQL new connection: host=localhost port=1223 database=test user=CALLER
+PostgreSQL query: "select * from them where id='10.0.0.0'" opts 'NULL'
+PGSQL using cached connection for localhost:1223/test/CALLER

 PGSQL: no data found
 lookup failed
 host in "net-pgsql;select * from them where id='10.0.0.0'"? no (end of list)
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 PGSQL: no data found
 lookup failed
 host in "net-pgsql;select * from them where id='10.0.0.0'"? no (end of list)
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"

-processing "deny" (TESTSUITE/test-config 27)
+processing "deny" (TESTSUITE/test-config 51)

   message: relay not permitted
 deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
   message: relay not permitted
 deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY


@@ -263,26 +342,99 @@ LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"

-processing "accept" (TESTSUITE/test-config 25)
+processing "warn" (TESTSUITE/test-config 27)
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id = 'c'" opts=NULL
+ cached data used for lookup of select name from them where id = 'c'
+ lookup failed
+check set acl_m0 = ok:   ${lookup pgsql                    {select name from them where id = '$local_part'}}
+                 = ok:   
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=SSPEC"
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id = 'c'" opts="servers=SSPEC"
+ cached data found but either wrong opts or dated;  database lookup required for select name from them where id = 'c'
+ PostgreSQL query: "select name from them where id = 'c'" opts 'servers=SSPEC'
+ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+warn: condition test deferred in ACL "check_recipient"
+LOG: MAIN
+  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+processing "warn" (TESTSUITE/test-config 38)
+check set acl_m0 = ok:   hostlist
+check hosts = net-pgsql;select * from them where id='$local_part'
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key="select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key="select * from them where id='c'" opts=NULL
+cached data used for lookup of select * from them where id='c'
+lookup failed
+host in "net-pgsql;select * from them where id='c'"? no (end of list)
+warn: condition test failed in ACL "check_recipient"
+processing "warn" (TESTSUITE/test-config 41)
+check set acl_m0 = FAIL: hostlist
+check hosts = <& net-pgsql;servers=SSPEC; select * from them where id='$local_part'
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key="servers=SSPEC; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key="servers=SSPEC; select * from them where id='c'" opts=NULL
+database lookup required for servers=SSPEC; select * from them where id='c'
+PostgreSQL query: "servers=SSPEC; select * from them where id='c'" opts 'NULL'
+lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
+warn: condition test deferred in ACL "check_recipient"
+LOG: MAIN
+  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+processing "warn" (TESTSUITE/test-config 46)
+check set acl_m0 = FAIL: hostlist
+check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=SSPEC"
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key=" select * from them where id='c'" opts="servers=SSPEC"
+database lookup required for  select * from them where id='c'
+PostgreSQL query: " select * from them where id='c'" opts 'servers=SSPEC'
+lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
+warn: condition test deferred in ACL "check_recipient"
+LOG: MAIN
+  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+processing "accept" (TESTSUITE/test-config 49)

 check domains = +local_domains
 d in "@"? no (end of list)
 d in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 check domains = +local_domains
 d in "@"? no (end of list)
 d in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"

-processing "accept" (TESTSUITE/test-config 26)
+processing "accept" (TESTSUITE/test-config 50)

 check hosts = +relay_hosts
 search_open: pgsql "NULL"
   cached open
 search_find: file="NULL"
 check hosts = +relay_hosts
 search_open: pgsql "NULL"
   cached open
 search_find: file="NULL"

-  key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0
+  key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts=NULL

 LRU list:
 internal_search_find: file="NULL"
 LRU list:
 internal_search_find: file="NULL"

-  type=pgsql key="select * from them where id='10.0.0.0'"
+  type=pgsql key="select * from them where id='10.0.0.0'" opts=NULL

 cached data used for lookup of select * from them where id='10.0.0.0'
 lookup failed
 host in "net-pgsql;select * from them where id='10.0.0.0'"? no (end of list)
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 cached data used for lookup of select * from them where id='10.0.0.0'
 lookup failed
 host in "net-pgsql;select * from them where id='10.0.0.0'"? no (end of list)
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"

-processing "deny" (TESTSUITE/test-config 27)
+processing "deny" (TESTSUITE/test-config 51)

   message: relay not permitted
 deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
   message: relay not permitted
 deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY


@@ -342,9 +494,7 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called

-fresh-exec forking for local-accept-delivery

 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00

-fresh-exec forked for local-accept-delivery: npppp

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp


@@ -389,12 +539,12 @@ local_part=CALLER domain=myhost.test.ex
 processing address_data
  search_open: pgsql "NULL"
  search_find: file="NULL"
 processing address_data
  search_open: pgsql "NULL"
  search_find: file="NULL"

-   key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0
+   key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select name from them where id='ph10'"
+   type=pgsql key="select name from them where id='ph10'" opts=NULL

  database lookup required for select name from them where id='ph10'
  database lookup required for select name from them where id='ph10'

- PostgreSQL query: select name from them where id='ph10'
+ PostgreSQL query: "select name from them where id='ph10'" opts 'NULL'

  PGSQL new connection: host=localhost port=1223 database=test user=CALLER
  lookup yielded: Philip Hazel
 calling r1 router
  PGSQL new connection: host=localhost port=1223 database=test user=CALLER
  lookup yielded: Philip Hazel
 calling r1 router


@@ -426,7 +576,6 @@ close PGSQL connection: localhost:1223/test/CALLER
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called

-local-accept-delivery forking for delivery-local

 changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
 changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/


@@ -434,12 +583,12 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1
 appendfile transport entered
  search_open: pgsql "NULL"
  search_find: file="NULL"
 appendfile transport entered
  search_open: pgsql "NULL"
  search_find: file="NULL"

-   key="select id from them where id='ph10'" partial=-1 affix=NULL starflags=0
+   key="select id from them where id='ph10'" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select id from them where id='ph10'"
+   type=pgsql key="select id from them where id='ph10'" opts=NULL

  database lookup required for select id from them where id='ph10'
  database lookup required for select id from them where id='ph10'

- PostgreSQL query: select id from them where id='ph10'
+ PostgreSQL query: "select id from them where id='ph10'" opts 'NULL'

  PGSQL new connection: host=localhost port=1223 database=test user=CALLER
  lookup yielded: ph10
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
  PGSQL new connection: host=localhost port=1223 database=test user=CALLER
  lookup yielded: ph10
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0


@@ -460,7 +609,6 @@ writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
 close PGSQL connection: localhost:1223/test/CALLER
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
 close PGSQL connection: localhost:1223/test/CALLER

-local-accept-delivery forked for delivery-local: npppp

 journalling CALLER@myhost.test.ex
 t1 transport returned OK for CALLER@myhost.test.ex
 post-process CALLER@myhost.test.ex (0)
 journalling CALLER@myhost.test.ex
 t1 transport returned OK for CALLER@myhost.test.ex
 post-process CALLER@myhost.test.ex (0)


@@ -499,12 +647,12 @@ admin user
 dropping to exim gid; retaining priv uid
  search_open: pgsql "NULL"
  search_find: file="NULL"
 dropping to exim gid; retaining priv uid
  search_open: pgsql "NULL"
  search_find: file="NULL"

-   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=pgsql key="select name from them where id='ph10';"
+   type=pgsql key="select name from them where id='ph10';" opts=NULL

  database lookup required for select name from them where id='ph10';
  database lookup required for select name from them where id='ph10';

- PostgreSQL query: select name from them where id='ph10';
+ PostgreSQL query: "select name from them where id='ph10';" opts 'NULL'

  PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER
  lookup yielded: Philip Hazel
 search_tidyup called
  PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER
  lookup yielded: Philip Hazel
 search_tidyup called