Fix crash for verify=helo when no IP address (-bs).

[exim.git] / test / stderr / 0094

diff --git a/test/stderr/0094 b/test/stderr/0094
index 81297b0639d6f295575b7b386468fe85d6c6fe45..cb4a9cc866cc827eeb40aa2f90888447d8e70334 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -67,6 +67,8 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.99.99.90]
@@ -78,8 +80,16 @@ host in host_lookup? yes (matched "0.0.0.0/0")
 looking up host name for V4NET.99.99.90
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
-IP address lookup yielded host1.masq.test.ex
-  alias oneback.test.ex
+IP address lookup yielded oneback.test.ex
+  alias host1.masq.test.ex
+using host_fake_gethostbyname for oneback.test.ex (IPv4)
+DNS lookup of oneback.test.ex (A) using fakens
+DNS lookup of oneback.test.ex (A) succeeded
+MUNGED: ::1 will be omitted in what follows
+get[host|ipnode]byname[2] looked up these IP addresses:
+  name=oneback.test.ex address=V4NET.99.99.90
+checking addresses for oneback.test.ex
+  V4NET.99.99.90 OK
 using host_fake_gethostbyname for host1.masq.test.ex (IPv4)
 DNS lookup of host1.masq.test.ex (A) using fakens
 DNS lookup of host1.masq.test.ex (A) succeeded
@@ -89,14 +99,6 @@ get[host|ipnode]byname[2] looked up these IP addresses:
 checking addresses for host1.masq.test.ex
   V4NET.90.90.90
 no IP address for host1.masq.test.ex matched V4NET.99.99.90
-using host_fake_gethostbyname for oneback.test.ex (IPv4)
-DNS lookup of oneback.test.ex (A) using fakens
-DNS lookup of oneback.test.ex (A) succeeded
-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=oneback.test.ex address=V4NET.99.99.90
-checking addresses for oneback.test.ex
-  V4NET.99.99.90 OK
 sender_fullhost = oneback.test.ex [V4NET.99.99.90]
 sender_rcvhost = oneback.test.ex ([V4NET.99.99.90])
 set_process_info: pppp handling incoming connection from oneback.test.ex [V4NET.99.99.90]
@@ -106,10 +108,10 @@ host in recipient_unqualified_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)
-SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<userx@test.ex>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<userx@test.ex>
 using ACL "check_recipient"
 processing "accept"
@@ -121,7 +123,7 @@ check domains = +local_domains
 test.ex in "test.ex"? yes (matched "test.ex")
 test.ex in "+local_domains"? yes (matched "+local_domains")
 accept: condition test succeeded
-SMTP>> 250 Accepted\r
+SMTP>> 250 Accepted
 SMTP<< rcpt to:<userx@cam.ac.uk>
 using ACL "check_recipient"
 processing "accept"
@@ -140,11 +142,11 @@ host in "+relay_hosts"? no (end of list)
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded
-SMTP>> 550 relay not permitted\r
+SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
   H=oneback.test.ex [V4NET.99.99.90] F=<userx@test.ex> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 SMTP<< quit
-SMTP>> 221 the.local.host.name closing connection\r
+SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
   SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT
 search_tidyup called