When trying spooled messages, account for the local-interface in grouping for a conne...

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

diff --git a/test/stderr/0432 b/test/stderr/0432
index a35449b40b1745ec474ac7c06bc9435f0a3b34db..918363e2ed98b1c327aeaef82fb7f8630da7b598 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -14,7 +14,6 @@
 >>> calling r1 router
 >>> routed by r1 router
 >>> local host found for non-MX address
->>> fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=127.0.0.1 address=127.0.0.1
@@ -23,6 +22,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> (Use -bhc if you want the callouts to happen.)
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in ACL "mail"
+>>> end of ACL "mail": ACCEPT
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -30,6 +30,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]
@@ -72,7 +73,6 @@ routed by r1 router
   transport: t1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
-fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 get[host|ipnode]byname[2] looked up these IP addresses:
   name=127.0.0.1 address=127.0.0.1
@@ -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
-  SMTP>> HELO myhost.test.ex
+127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+  SMTP>> EHLO myhost.test.ex
   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>
@@ -109,6 +111,7 @@ wrote positive callout cache address record
 ----------- end verify ------------
 sender x@y verified ok
 accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT
 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
@@ -123,6 +126,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]
@@ -165,7 +169,6 @@ routed by r1 router
   transport: t1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
-fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 get[host|ipnode]byname[2] looked up these IP addresses:
   name=127.0.0.1 address=127.0.0.1
@@ -183,6 +186,7 @@ callout cache: address record is positive
 ----------- end verify ------------
 sender x@y verified ok
 accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT
 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
@@ -206,7 +210,6 @@ search_tidyup called
 >>> calling r1 router
 >>> routed by r1 router
 >>> local host found for non-MX address
->>> fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=127.0.0.1 address=127.0.0.1
@@ -216,6 +219,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: address record is positive
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in ACL "mail"
+>>> end of ACL "mail": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -232,7 +236,6 @@ MUNGED: ::1 will be omitted in what follows
 >>> calling r1 router
 >>> routed by r1 router
 >>> local host found for non-MX address
->>> fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=127.0.0.1 address=127.0.0.1
@@ -242,8 +245,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<< 250 OK
+>>> 127.0.0.1 in hosts_require_auth? no (option unset)
 >>>   SMTP>> MAIL FROM:<>
 >>>   SMTP<< 250 OK
 >>>   SMTP>> RCPT TO:<a@b>
@@ -254,6 +259,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> wrote positive callout cache address record
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in ACL "mail"
+>>> end of ACL "mail": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -270,7 +276,6 @@ MUNGED: ::1 will be omitted in what follows
 >>> calling r1 router
 >>> routed by r1 router
 >>> local host found for non-MX address
->>> fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=127.0.0.1 address=127.0.0.1
@@ -280,7 +285,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 timeout
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "mail"