DMARC: expand main-config options. Bug 3102

[exim.git] / test / stderr / 0303

diff --git a/test/stderr/0303 b/test/stderr/0303
index 8e735c3278f71de4367ca608539b02a770df0407..ea3f63024d4185e8a7979f39dd5149fce45a3394 100644 (file)
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -10,12 +10,12 @@
 >>>  list element: @
 >>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for V4NET.0.0.1
 >>>  list element: @
 >>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded "ten-1.test.ex"
+>>>  IP address lookup yielded "ten-1.test.ex"

 >>>  check dnssec require list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec require list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)

->>> checking addresses for ten-1.test.ex
+>>>  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>>   V4NET.0.0.1 OK
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -30,12 +30,12 @@
 >>>  list element: @[]
 >>>  [127.0.0.1] in helo_lookup_domains? yes (matched "@[]")
 >>> looking up host name for V4NET.0.0.1
 >>>  list element: @[]
 >>>  [127.0.0.1] in helo_lookup_domains? yes (matched "@[]")
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded "ten-1.test.ex"
+>>>  IP address lookup yielded "ten-1.test.ex"

 >>>  check dnssec require list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec require list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)

->>> checking addresses for ten-1.test.ex
+>>>  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>>  list element: *
 >>>  host in limits_advertise_hosts? yes (matched "*")
 >>>   V4NET.0.0.1 OK
 >>>  list element: *
 >>>  host in limits_advertise_hosts? yes (matched "*")


@@ -58,6 +58,7 @@
 >>>  list element: @[]
 >>> rhubarb.custard in helo_lookup_domains? no (end of list)
 Exim version x.yz ....
 >>>  list element: @[]
 >>> rhubarb.custard in helo_lookup_domains? no (end of list)
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available


@@ -111,7 +112,7 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>

-processing "accept" (TESTSUITE/test-config 12)
+processing inline ACL "accept"

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted


@@ -145,6 +146,7 @@ LOG: smtp_connection MAIN
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 seeking password data for user "CALLER": cache not available
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 seeking password data for user "CALLER": cache not available


@@ -194,7 +196,7 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>

-processing "accept" (TESTSUITE/test-config 12)
+processing inline ACL "accept"

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted