X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/898d150f9aa9c796bb01117bc438b24ddb2e7435..ff6dccc43b493a7f3aad49d4feaca9fb393b0c3f:/test/stderr/0432?ds=sidebyside

diff --git a/test/stderr/0432 b/test/stderr/0432
index f4aa77a5a..33e1b9892 100644
--- 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 ------------
->>> 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
@@ -89,7 +89,8 @@ 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
-  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>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -108,7 +109,7 @@ dbfn_write: key=x@y
 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
@@ -182,7 +183,7 @@ callout cache: found address record
 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
@@ -215,7 +216,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> 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)
@@ -242,7 +243,8 @@ 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
->>>   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>> MAIL FROM:<>
 >>>   SMTP<< 250 OK
@@ -253,7 +255,7 @@ MUNGED: ::1 will be omitted in what follows
 >>>   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)
@@ -280,9 +282,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
->>>   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 ------------
->>> 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