Safer coding for utf8clean expansion operator

[exim.git] / test / stderr / 0432

diff --git a/test/stderr/0432 b/test/stderr/0432
index f4aa77a5ac4d9aab1b5ab0e2ece91e6d036540ca..759c9a819aafa3d9d1c8ec1c688bd1b61a330d6d 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -22,7 +22,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> ... callout omitted by default when host testing
 >>> (Use -bhc if you want the callouts to happen.)
 >>> ----------- end verify ------------
 >>> ... callout omitted by default when host testing
 >>> (Use -bhc if you want the callouts to happen.)
 >>> ----------- end verify ------------

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "mail"

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -89,8 +89,10 @@ callout cache: no address record found
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 server ready
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 server ready

-  SMTP>> HELO myhost.test.ex
+127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+  SMTP>> EHLO myhost.test.ex

   SMTP<< 250 OK
   SMTP<< 250 OK

+127.0.0.1 in hosts_require_auth? no (option unset)

   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<x@y>
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<x@y>


@@ -108,7 +110,7 @@ dbfn_write: key=x@y
 wrote positive callout cache address record
 ----------- end verify ------------
 sender x@y verified ok
 wrote positive callout cache address record
 ----------- end verify ------------
 sender x@y verified ok

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"

 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection


@@ -182,7 +184,7 @@ callout cache: found address record
 callout cache: address record is positive
 ----------- end verify ------------
 sender x@y verified ok
 callout cache: address record is positive
 ----------- end verify ------------
 sender x@y verified ok

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"

 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection


@@ -215,7 +217,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: found address record
 >>> callout cache: address record is positive
 >>> ----------- end verify ------------
 >>> callout cache: found address record
 >>> callout cache: address record is positive
 >>> ----------- end verify ------------

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "mail"

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -242,8 +244,10 @@ MUNGED: ::1 will be omitted in what follows
 >>> interface=NULL port=1224
 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 >>>   SMTP<< 220 server ready
 >>> interface=NULL port=1224
 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 >>>   SMTP<< 220 server ready

->>>   SMTP>> HELO myhost.test.ex
+>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+>>>   SMTP>> EHLO myhost.test.ex

 >>>   SMTP<< 250 OK
 >>>   SMTP<< 250 OK

+>>> 127.0.0.1 in hosts_require_auth? no (option unset)

 >>>   SMTP>> MAIL FROM:<>
 >>>   SMTP<< 250 OK
 >>>   SMTP>> RCPT TO:<a@b>
 >>>   SMTP>> MAIL FROM:<>
 >>>   SMTP<< 250 OK
 >>>   SMTP>> RCPT TO:<a@b>


@@ -253,7 +257,7 @@ MUNGED: ::1 will be omitted in what follows
 >>>   result=1 postmaster=0 random=0
 >>> wrote positive callout cache address record
 >>> ----------- end verify ------------
 >>>   result=1 postmaster=0 random=0
 >>> wrote positive callout cache address record
 >>> ----------- end verify ------------

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "mail"

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -280,9 +284,10 @@ MUNGED: ::1 will be omitted in what follows
 >>> interface=NULL port=1224
 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 >>>   SMTP<< 220 server ready
 >>> interface=NULL port=1224
 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 >>>   SMTP<< 220 server ready

->>>   SMTP>> HELO myhost.test.ex
+>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+>>>   SMTP>> EHLO myhost.test.ex

 >>> SMTP timeout
 >>> ----------- end verify ------------
 >>> SMTP timeout
 >>> ----------- end verify ------------

->>> accept: condition test deferred
+>>> accept: condition test deferred in ACL "mail"

 LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout
 LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout
 LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout
 LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout