Fix taint hybrid-checking on BSD

[users/jgh/exim.git] / test / stderr / 5403

diff --git a/test/stderr/5403 b/test/stderr/5403
index 292f09133e712763968197a0bac1792825342704..e7c605a0192a098f4fe9bc74eb1953cb1d6c7b47 100644 (file)
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -13,17 +13,17 @@ LOG: no host name found for IP address 1.2.3.4
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "ar"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "ar"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 21)

 >>> check control = cutthrough_delivery
 >>> check logwrite = rcpt for $local_part@$domain
 >>>                = rcpt for plain@domain.com
 LOG: rcpt for plain@domain.com
 >>> warn: condition test succeeded in ACL "ar"
 >>> check control = cutthrough_delivery
 >>> check logwrite = rcpt for $local_part@$domain
 >>>                = rcpt for plain@domain.com
 LOG: rcpt for plain@domain.com
 >>> warn: condition test succeeded in ACL "ar"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)

 >>> check condition = ${if eq {verify}{$local_part}}
 >>>                 = 
 >>> warn: condition test failed in ACL "ar"
 >>> check condition = ${if eq {verify}{$local_part}}
 >>>                 = 
 >>> warn: condition test failed in ACL "ar"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 25)

 >>> accept: condition test succeeded in ACL "ar"
 >>> end of ACL "ar": ACCEPT
 LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com
 >>> accept: condition test succeeded in ACL "ar"
 >>> end of ACL "ar": ACCEPT
 LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com


@@ -42,13 +42,13 @@ LOG: no host name found for IP address 1.2.3.4
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "ar"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "ar"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 21)

 >>> check control = cutthrough_delivery
 >>> check logwrite = rcpt for $local_part@$domain
 >>>                = rcpt for verify@domain.com
 LOG: rcpt for verify@domain.com
 >>> warn: condition test succeeded in ACL "ar"
 >>> check control = cutthrough_delivery
 >>> check logwrite = rcpt for $local_part@$domain
 >>>                = rcpt for verify@domain.com
 LOG: rcpt for verify@domain.com
 >>> warn: condition test succeeded in ACL "ar"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)

 >>> check condition = ${if eq {verify}{$local_part}}
 >>>                 = true
 >>> check verify = recipient/callout=use_sender
 >>> check condition = ${if eq {verify}{$local_part}}
 >>>                 = true
 >>> check verify = recipient/callout=use_sender


@@ -69,22 +69,27 @@ MUNGED: ::1 will be omitted in what follows
 >>> Attempting full verification using callout
 >>> callout cache: disabled by no_cache
 >>> interface=ip4.ip4.ip4.ip4 port=1224
 >>> Attempting full verification using callout
 >>> callout cache: disabled by no_cache
 >>> interface=ip4.ip4.ip4.ip4 port=1224

->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ...  connected

 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex

+>>> cmd buf flush 21 bytes

 >>>   SMTP<< 250 OK
 >>> 127.0.0.1 in hosts_require_auth? no (option unset)
 >>>   SMTP<< 250 OK
 >>> 127.0.0.1 in hosts_require_auth? no (option unset)

->>>   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
+>>>   SMTP>> MAIL FROM:<sender@myhost.test.ex>
+>>> cmd buf flush 35 bytes

 >>>   SMTP<< 250 OK
 >>>   SMTP>> RCPT TO:<verify@domain.com>
 >>>   SMTP<< 250 OK
 >>>   SMTP>> RCPT TO:<verify@domain.com>

+>>> cmd buf flush 29 bytes

 >>>   SMTP<< 250 OK
 >>> holding verify callout open for cutthrough delivery
 >>> ----------- end verify ------------
 >>> warn: condition test succeeded in ACL "ar"
 >>>   SMTP<< 250 OK
 >>> holding verify callout open for cutthrough delivery
 >>> ----------- end verify ------------
 >>> warn: condition test succeeded in ACL "ar"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 25)

 >>> accept: condition test succeeded in ACL "ar"
 >>> end of ACL "ar": ACCEPT
 >>>   SMTP>> QUIT
 >>> accept: condition test succeeded in ACL "ar"
 >>> end of ACL "ar": ACCEPT
 >>>   SMTP>> QUIT

+>>>   SMTP<< 220 OK
+>>>   SMTP(close)>>

 >>> ----------- cutthrough shutdown (host-checking mode) ------------
 >>> ----------- cutthrough shutdown (host-checking mode) ------------

-LOG: 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com
+LOG: 10HmaY-0005vi-00 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com