Testsuite: fix munge for mailq

[exim.git] / test / stderr / 0381

diff --git a/test/stderr/0381 b/test/stderr/0381
index 270b7b2ae9c8ed124cabe4ce3373e676a55d0ad9..2c240677b4e49d36268560a718b9a67cde13bff9 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -1,16 +1,19 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 Exim version x.yz ....
 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
 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]
 sender_rcvhost = [V4NET.99.99.97] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.99.99.97] via -oMa
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 sender_fullhost = [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.99.99.97] via -oMa

+set_process_info: pppp accepting a local SMTP message from <CALLER>

 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER


@@ -22,58 +25,83 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 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\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 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)
+set_process_info: pppp handling incoming connection from (test) [V4NET.99.99.97] U=CALLER
+SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.99.99.97]

 SMTP<< mail from:<notgov@test.ex>
 SMTP<< mail from:<notgov@test.ex>

-SMTP>> 250 OK\r
+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>> 250 OK

 SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"
 SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"

-processing "warn"
+processing "warn" (TESTSUITE/test-config 17)

 check hosts = *.gov.uk.test.ex
 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
 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
-IP address lookup yielded x.gov.uk.test.ex
-  alias x.co.uk.test.ex
-using host_fake_gethostbyname for x.gov.uk.test.ex (IPv4)
-DNS lookup of x.gov.uk.test.ex (A) using fakens
-DNS lookup of x.gov.uk.test.ex (A) succeeded
-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=x.gov.uk.test.ex address=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
+IP address lookup yielded "x.gov.uk.test.ex"
+  alias "x.co.uk.test.ex"
+  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
 checking addresses for x.gov.uk.test.ex

+Forward DNS security status: unverified

   V4NET.99.99.97 OK
   V4NET.99.99.97 OK

-using host_fake_gethostbyname for x.co.uk.test.ex (IPv4)
-DNS lookup of x.co.uk.test.ex (A) using fakens
-DNS lookup of x.co.uk.test.ex (A) succeeded
-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=x.co.uk.test.ex address=V4NET.99.99.97
+  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
 checking addresses for x.co.uk.test.ex

+Forward DNS security status: unverified

   V4NET.99.99.97 OK
   V4NET.99.99.97 OK

-sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
-sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
-host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
-warn: condition test succeeded
-processing "warn"
+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")
+warn: condition test succeeded in ACL "check_rcpt"
+processing "warn" (TESTSUITE/test-config 18)

 check hosts = !*.gov.uk.test.ex
 check hosts = !*.gov.uk.test.ex

-host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
-warn: condition test failed
-processing "warn"
+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
 check hosts = *.co.uk.test.ex

-host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
-warn: condition test succeeded
-processing "warn"
+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
 check hosts = !*.co.uk.test.ex

-host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
-warn: condition test failed
-processing "accept"
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+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"
+end of ACL "check_rcpt": ACCEPT
+SMTP>> 250 Accepted

 SMTP<< quit
 SMTP<< quit

-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection

 LOG: smtp_connection MAIN
 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 terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>