Logging: Add "D=" to more connection closure log lines. Bug 2434

[exim.git] / test / stderr / 0386

diff --git a/test/stderr/0386 b/test/stderr/0386
index e4275b92fff6618b5d149089d8cebdac265ee554..e6aeda9e2a90e8c5c9259b55c2548b7c49f0ba38 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -28,6 +28,9 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7] (helo=test)
@@ -41,15 +44,23 @@ SMTP<< rcpt to:<1@b>
 using ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 18)
 check local_parts = 1
-1 in "1"? yes (matched "1")
+1 in "1"?
+ list element: 1
+ 1 in "1"? yes (matched "1")
 check acl = TESTSUITE/aux-fixed/0386.acl1
  read ACL from file TESTSUITE/aux-fixed/0386.acl1
  processing "accept" (TESTSUITE/test-config 44)
  check hosts = :
+  host in ":"?
+  list element: 
   host in ":"? no (end of list)
  accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "deny" (TESTSUITE/test-config 44)
  check local_parts = ^.*[@%!/|]
+ 1 in "^.*[@%!/|]"?
+  list element: ^.*[@%!/|]
+  compiled caseless RE '^.*[@%!/|]' not found in local cache
+  compiled RE '^.*[@%!/|]' saved in local cache
  1 in "^.*[@%!/|]"? no (end of list)
  deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "require" (TESTSUITE/test-config 44)
@@ -97,15 +108,22 @@ SMTP<< rcpt to:<1@b>
 using ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 18)
 check local_parts = 1
-1 in "1"? yes (matched "1")
+1 in "1"?
+ list element: 1
+ 1 in "1"? yes (matched "1")
 check acl = TESTSUITE/aux-fixed/0386.acl1
  using ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "accept" (TESTSUITE/test-config 44)
  check hosts = :
+  host in ":"?
+  list element: 
   host in ":"? no (end of list)
  accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "deny" (TESTSUITE/test-config 44)
  check local_parts = ^.*[@%!/|]
+ 1 in "^.*[@%!/|]"?
+  list element: ^.*[@%!/|]
+  compiled caseless RE '^.*[@%!/|]' found in local cache
  1 in "^.*[@%!/|]"? no (end of list)
  deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "require" (TESTSUITE/test-config 44)
@@ -145,7 +163,7 @@ LOG: MAIN REJECT
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -180,6 +198,9 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER)
@@ -193,11 +214,15 @@ SMTP<< rcpt to:<2@b>
 using ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 18)
 check local_parts = 1
+2 in "1"?
+ list element: 1
 2 in "1"? no (end of list)
 accept: condition test failed in ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 check local_parts = 2
-2 in "2"? yes (matched "2")
+2 in "2"?
+ list element: 2
+ 2 in "2"? yes (matched "2")
 check acl = TESTSUITE/aux-fixed/0386.acl2
  read ACL from file TESTSUITE/aux-fixed/0386.acl2
  processing "warn" (TESTSUITE/test-config 44)
@@ -392,11 +417,15 @@ SMTP<< rcpt to:<2@b>
 using ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 18)
 check local_parts = 1
+2 in "1"?
+ list element: 1
 2 in "1"? no (end of list)
 accept: condition test failed in ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 check local_parts = 2
-2 in "2"? yes (matched "2")
+2 in "2"?
+ list element: 2
+ 2 in "2"? yes (matched "2")
 check acl = TESTSUITE/aux-fixed/0386.acl2
  using ACL "TESTSUITE/aux-fixed/0386.acl2"
  processing "warn" (TESTSUITE/test-config 44)
@@ -578,6 +607,6 @@ smtp_setup_msg entered
 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=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>