git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Log: more info in ACL "warn statement skipped" message. Bug 2897
[exim.git] / test / stderr / 0464
diff --git a/test/stderr/0464 b/test/stderr/0464
index 4037cfacdcd6390b7fb4c29493480fd61e5328e4..bed191f9b4dfeb8716ee30f2a88d14e32ae51f2a 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -1,22 +1,7 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -37,27 +22,29 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
-processing "require" (TESTSUITE/test-config 20)
+processing ACL rcpt "require" (TESTSUITE/test-config 20)
 check domains = +special_domains
-list element: +special_domains
- start sublist special_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")
+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
@@ -68,11 +55,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking 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)
+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)
@@ -92,25 +80,27 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-list element: +special_domains
- start sublist special_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 "+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
@@ -126,14 +116,15 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
-require: condition test succeeded in ACL "rcpt"
-processing "require" (TESTSUITE/test-config 23)
+require: condition test succeeded in ACL rcpt
+processing ACL rcpt "require" (TESTSUITE/test-config 23)
 check domains = +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)
+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
@@ -144,11 +135,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking 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)
+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)
@@ -168,24 +160,26 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-list element: +special_domains
- start sublist special_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 "+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
@@ -200,14 +194,14 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
-require: condition test succeeded in ACL "rcpt"
-processing "accept" (TESTSUITE/test-config 25)
-accept: condition test succeeded in ACL "rcpt"
-end of ACL "rcpt": ACCEPT
+require: condition test succeeded in ACL rcpt
+processing ACL rcpt "accept" (TESTSUITE/test-config 25)
+accept: condition test succeeded in ACL rcpt
+end of ACL rcpt: ACCEPT
 SMTP>> 250 Accepted
 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
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Master Exim source repository