Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0381

diff --git a/test/stderr/0381 b/test/stderr/0381
index 19c4e8a3a08386335a390c2da9e2987b16f83526..d35fb626190ba7f4605240f4a697d6fd0bce26aa 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -1,13 +1,14 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 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 = NULL
 sender_fullhost = [V4NET.99.99.97]
@@ -28,6 +29,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.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER)
@@ -41,40 +45,56 @@ SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 17)
 check hosts = *.gov.uk.test.ex
+host in "*.gov.uk.test.ex"?
+ list element: *.gov.uk.test.ex
 sender host name required, to match against *.gov.uk.test.ex
 looking up host name for V4NET.99.99.97
-DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
-DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
+  DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
+  DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "x.gov.uk.test.ex"
   alias "x.co.uk.test.ex"
-DNS lookup of x.gov.uk.test.ex (A) using fakens
-DNS lookup of x.gov.uk.test.ex (A) succeeded
-x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
+  check dnssec require list
+   x.gov.uk.test.ex not in empty list (option unset? cannot trace name)
+  check dnssec request list
+   x.gov.uk.test.ex not in empty list (option unset? cannot trace name)
+  DNS lookup of x.gov.uk.test.ex (A) using fakens
+  DNS lookup of x.gov.uk.test.ex (A) succeeded
+  x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
 checking addresses for x.gov.uk.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.97 OK
-DNS lookup of x.co.uk.test.ex (A) using fakens
-DNS lookup of x.co.uk.test.ex (A) succeeded
-x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
+  check dnssec require list
+   x.co.uk.test.ex not in empty list (option unset? cannot trace name)
+  check dnssec request list
+   x.co.uk.test.ex not in empty list (option unset? cannot trace name)
+  DNS lookup of x.co.uk.test.ex (A) using fakens
+  DNS lookup of x.co.uk.test.ex (A) succeeded
+  x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
 checking addresses for x.co.uk.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.97 OK
 sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex
        ([V4NET.99.99.97] helo=test ident=CALLER)
-host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
+  host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)
 check hosts = !*.gov.uk.test.ex
-host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
+host in "!*.gov.uk.test.ex"?
+ list element: !*.gov.uk.test.ex
+  host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
 warn: condition test failed in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 19)
 check hosts = *.co.uk.test.ex
-host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
+host in "*.co.uk.test.ex"?
+ list element: *.co.uk.test.ex
+  host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 20)
 check hosts = !*.co.uk.test.ex
-host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
+host in "!*.co.uk.test.ex"?
+ list element: !*.co.uk.test.ex
+  host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
 warn: condition test failed in ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 accept: condition test succeeded in ACL "check_rcpt"
@@ -83,6 +103,6 @@ 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=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>