Fix spurious detection of timeout while writing to transport filter

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

diff --git a/test/stderr/2600 b/test/stderr/2600
index 9108eca8cbba76157086fbf97051a5fb27551015..3c2b058d63aa9d883552c4bb10b72f7776077225 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -1,107 +1,108 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='userx';"
-file lookup required for select name from them where id='userx';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: Ayen Other
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='userx';"
-cached data used for lookup of select name from them where id='userx';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: Ayen Other
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='xxxx';"
-file lookup required for select name from them where id='xxxx';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup forced cache cleanup
-lookup failed
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='nothing';"
-file lookup required for select name from them where id='nothing';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select id,name from them where id='nothing';"
-file lookup required for select id,name from them where id='nothing';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: id=nothing name="" 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where id='quote2';"
-file lookup required for select * from them where id='quote2';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name="\"stquot" id=quote2 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where id='newline';"
-file lookup required for select * from them where id='newline';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name="before
-after" id=newline 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where id='tab';"
-file lookup required for select * from them where id='tab';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name="x        x" id=tab 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where id='its';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where id='its';"
-file lookup required for select * from them where id='its';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name=it's id=its 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where name='it''s';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where name='it''s';"
-file lookup required for select * from them where name='it''s';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name=it's id=its 
+dropping to exim gid; retaining priv uid
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='userx';"
+ file lookup required for select name from them where id='userx';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: Ayen Other
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='userx';"
+ cached data used for lookup of select name from them where id='userx';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: Ayen Other
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='xxxx';"
+ file lookup required for select name from them where id='xxxx';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup forced cache cleanup
+ lookup failed
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='nothing';"
+ file lookup required for select name from them where id='nothing';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select id,name from them where id='nothing';"
+ file lookup required for select id,name from them where id='nothing';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: id=nothing name="" 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where id='quote2';"
+ file lookup required for select * from them where id='quote2';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name="\"stquot" id=quote2 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where id='newline';"
+ file lookup required for select * from them where id='newline';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name="before
+ after" id=newline 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where id='tab';"
+ file lookup required for select * from them where id='tab';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name="x       x" id=tab 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where id='its';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where id='its';"
+ file lookup required for select * from them where id='its';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name=it's id=its 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where name='it''s';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where name='it''s';"
+ file lookup required for select * from them where name='it''s';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name=it's id=its 

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....


@@ -319,11 +320,11 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Writing spool header file: TESTSUITE/spool//input//hdr.pppp
-DSN: Write SPOOL :-dsn_envid NULL
-DSN: Write SPOOL :-dsn_ret 0
-DSN: Flags :0
-DSN: **** SPOOL_OUT - address: |userx@myhost.test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
+DSN: Write SPOOL: -dsn_envid NULL
+DSN: Write SPOOL  :-dsn_ret 0
+DSN: Flags: 0x0
+DSN: **** SPOOL_OUT - address: <userx@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0

 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN


@@ -337,6 +338,7 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages


@@ -351,7 +353,7 @@ Empty Tree
 recipients_count=1
 **** SPOOL_IN - No additional fields
 body_linecount=1 message_linecount=7
 recipients_count=1
 **** SPOOL_IN - No additional fields
 body_linecount=1 message_linecount=7

-DSN: set orcpt:   flags: 0
+DSN: set orcpt:   flags: 0x0

 Delivery address list:
   userx@myhost.test.ex 
  locking TESTSUITE/spool/db/retry.lockfile
 Delivery address list:
   userx@myhost.test.ex 
  locking TESTSUITE/spool/db/retry.lockfile


@@ -372,15 +374,15 @@ routing userx@myhost.test.ex
 --------> r1 router <--------
 local_part=userx domain=myhost.test.ex
 processing address_data
 --------> r1 router <--------
 local_part=userx domain=myhost.test.ex
 processing address_data

-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='userx'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='userx'"
-file lookup required for select name from them where id='userx'
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: Ayen Other
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='userx'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='userx'"
+ file lookup required for select name from them where id='userx'
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: Ayen Other

 calling r1 router
 r1 router called for userx@myhost.test.ex
   domain = myhost.test.ex
 calling r1 router
 r1 router called for userx@myhost.test.ex
   domain = myhost.test.ex


@@ -414,15 +416,15 @@ changed uid/gid: local delivery to userx <userx@myhost.test.ex> transport=t1
   home=NULL current=/
 set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1
 appendfile transport entered
   home=NULL current=/
 set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1
 appendfile transport entered

-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select id from them where id='userx'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select id from them where id='userx'"
-file lookup required for select id from them where id='userx'
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: userx
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select id from them where id='userx'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select id from them where id='userx'"
+ file lookup required for select id from them where id='userx'
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: userx

 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=TESTSUITE/test-mail/userx format=unix
   message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=TESTSUITE/test-mail/userx format=unix
   message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n


@@ -459,7 +461,7 @@ end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@myhost.test.ex
 DSN: Sender_address: CALLER@myhost.test.ex
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@myhost.test.ex
 DSN: Sender_address: CALLER@myhost.test.ex

-DSN: orcpt: NULL  flags: 0
+DSN: orcpt: NULL  flags: 0x0

 DSN: envid: NULL  ret: 0
 DSN: Final recipient: userx@myhost.test.ex
 DSN: Remote SMTP server supports DSN: 0
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: userx@myhost.test.ex
 DSN: Remote SMTP server supports DSN: 0


@@ -475,14 +477,15 @@ search_tidyup called
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='userx';"
-file lookup required for select name from them where id='userx';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: Ayen Other
+dropping to exim gid; retaining priv uid
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='userx';"
+ file lookup required for select name from them where id='userx';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: Ayen Other

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>