Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0524

diff --git a/test/stderr/0524 b/test/stderr/0524
index a499dbf31b98995f6793b92cd4425a67831c87e3..2212a1b46d20b395d8566b3430dc449f78919f85 100644 (file)
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -6,19 +6,44 @@
 >>> 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)

+>>> csa1.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
+>>>   message: CSA status is $csa_status

 >>> check verify = csa
 >>> check verify = csa

->>> accept: condition test succeeded
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> accept: condition test succeeded in ACL "check_mail"
+>>> end of ACL "check_mail": ACCEPT
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> csa2.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
+>>>   message: CSA status is $csa_status

 >>> check verify = csa
 >>> check verify = csa

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_mail"

 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> host in hosts_connection_nolog? no (option unset)


@@ -29,20 +54,44 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> 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)

+>>> csa1.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
+>>>   message: CSA status is $csa_status

 >>> check verify = csa
 >>> check verify = csa

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_mail"

 >>> accept: endpass encountered - denying access
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
 >>> accept: endpass encountered - denying access
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)

->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> csa2.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
+>>>   message: CSA status is $csa_status

 >>> check verify = csa
 >>> check verify = csa

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_mail"

 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (host name not authorized)