git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Transactions in retry hintsdb
[exim.git] / test / stderr / 0464
diff --git a/test/stderr/0464 b/test/stderr/0464
index 6ea3f3f978cadf7eef47e8eba41585d0e6fbdecf..aa91bff38a4efe8cf862f1305619ca5c1d19cd22 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -1,10 +1,11 @@
 Exim version x.yz ....
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex>
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex>
@@ -13,6 +14,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -21,20 +24,27 @@ SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
 processing "require" (TESTSUITE/test-config 20)
 check domains = +special_domains
 using ACL "rcpt"
 processing "require" (TESTSUITE/test-config 20)
 check domains = +special_domains
-search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
-search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  key="domain1" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0464.domains
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  type=lsearch key="domain1" opts=NULL
-file lookup required for domain1
-  in TESTSUITE/aux-fixed/0464.domains
-lookup yielded: data for domain1
-domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? yes (matched "lsearch;TESTSUITE/aux-fixed/0464.domains")
-data from lookup saved for cache for +special_domains: key 'domain1' value 'data for domain1'
-domain1 in "+special_domains"? yes (matched "+special_domains")
+domain1 in "+special_domains"?
+ list element: +special_domains
+  start sublist special_domains
+   domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0464.domains
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
+   ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  key="domain1" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  0TESTSUITE/aux-fixed/0464.domains
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  type=lsearch key="domain1" opts=NULL
+   ╎file lookup required for domain1
+   ╎  in TESTSUITE/aux-fixed/0464.domains
+   ╎creating new cache entry
+   ╎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'
+ domain1 in "+special_domains"? yes (matched "+special_domains")
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying abc@domain1
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying abc@domain1
@@ -45,9 +55,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
-cached yes match for +special_domains
-cached lookup data = data for domain1
-domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+domain1 in domains?
+ list element: +special_domains
+  start sublist special_domains
+ cached yes match for +special_domains
+ cached lookup data = data for domain1
+ domain1 in domains? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
@@ -67,20 +80,27 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0464.domains
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  type=lsearch key="xxx.domain1" opts=NULL
-file lookup required for xxx.domain1
-  in TESTSUITE/aux-fixed/0464.domains
-lookup failed
-xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
-xxx.domain1 in "+special_domains"? no (end of list)
+xxx.domain1 in domains?
+ list element: +special_domains
+  start sublist special_domains
+   xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0464.domains
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
+   ╎  cached open
+   ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  0TESTSUITE/aux-fixed/0464.domains
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  type=lsearch key="xxx.domain1" opts=NULL
+   ╎file lookup required for xxx.domain1
+   ╎  in TESTSUITE/aux-fixed/0464.domains
+   ╎creating new cache entry
+   ╎lookup failed
+   xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
+  end sublist special_domains
+xxx.domain1 in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
@@ -91,7 +111,7 @@ set transport smtp
 queued for smtp transport: local_part = abc
 domain = xxx.domain1
   errors_to=NULL
 queued for smtp transport: local_part = abc
 domain = xxx.domain1
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
@@ -99,9 +119,12 @@ routed by r2 router
 require: condition test succeeded in ACL "rcpt"
 processing "require" (TESTSUITE/test-config 23)
 check domains = +special_domains
 require: condition test succeeded in ACL "rcpt"
 processing "require" (TESTSUITE/test-config 23)
 check domains = +special_domains
-cached yes match for +special_domains
-cached lookup data = data for domain1
-domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+domain1 in "+special_domains"?
+ list element: +special_domains
+  start sublist special_domains
+ cached yes match for +special_domains
+ cached lookup data = data for domain1
+ domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying abc@domain1
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying abc@domain1
@@ -112,9 +135,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
-cached yes match for +special_domains
-cached lookup data = data for domain1
-domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+domain1 in domains?
+ list element: +special_domains
+  start sublist special_domains
+ cached yes match for +special_domains
+ cached lookup data = data for domain1
+ domain1 in domains? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
@@ -134,20 +160,26 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0464.domains
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  type=lsearch key="xxx.domain1" opts=NULL
-cached data used for lookup of xxx.domain1
-  in TESTSUITE/aux-fixed/0464.domains
-lookup failed
-xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
-xxx.domain1 in "+special_domains"? no (end of list)
+xxx.domain1 in domains?
+ list element: +special_domains
+  start sublist special_domains
+   xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0464.domains
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
+   ╎  cached open
+   ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  0TESTSUITE/aux-fixed/0464.domains
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  type=lsearch key="xxx.domain1" opts=NULL
+   ╎cached data used for lookup of xxx.domain1
+   ╎  in TESTSUITE/aux-fixed/0464.domains
+   ╎lookup failed
+   xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
+  end sublist special_domains
+xxx.domain1 in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
@@ -157,7 +189,7 @@ r2 router called for abc@xxx.domain1
 queued for smtp transport: local_part = abc
 domain = xxx.domain1
   errors_to=NULL
 queued for smtp transport: local_part = abc
 domain = xxx.domain1
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
@@ -170,6 +202,6 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 search_tidyup called
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Master Exim source repository