hosts_require_helo

[exim.git] / test / stderr / 0432

diff --git a/test/stderr/0432 b/test/stderr/0432
index 0e6a1d952b5844038bb4c17530fe2faebbbb6f69..2f55fa252d0dead8950e3987dce7cd59b9e91f24 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -6,6 +6,7 @@
 >>> 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)
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s
@@ -47,6 +48,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -68,7 +75,7 @@ set transport t1
 queued for t1 transport: local_part = x
 domain = y
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r1 router
   envelope to: x@y
   transport: t1
@@ -84,9 +91,9 @@ Attempting full verification using callout
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=y
-callout cache: no domain record found for y
+ callout cache: no domain record found for y
  dbfn_read: key=x@y
-callout cache: no address record found for x@y
+ callout cache: no address record found for x@y
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=1224
@@ -104,7 +111,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> RCPT TO:<x@y>
 cmd buf flush ddd bytes
-sync_responses expect rcpt
+sync_responses expect rcpt for x@y
   SMTP<< 250 OK
   SMTP>> QUIT
 cmd buf flush ddd bytes
@@ -116,10 +123,10 @@ cmd buf flush ddd bytes
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
  dbfn_write: key=y
-wrote callout cache domain record for y:
-  result=1 postmaster=0 random=0
+ wrote callout cache domain record for y:
+   result=1 postmaster=0 random=0
  dbfn_write: key=x@y
-wrote positive callout cache address record for x@y
+ wrote positive callout cache address record for x@y
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 ----------- end verify ------------
@@ -130,7 +137,7 @@ SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [1.2.3.4] closed by QUIT
+  SMTP connection from (test) [1.2.3.4] closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -157,6 +164,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -178,7 +191,7 @@ set transport t1
 queued for t1 transport: local_part = x
 domain = y
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r1 router
   envelope to: x@y
   transport: t1
@@ -194,10 +207,10 @@ Attempting full verification using callout
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=y
-callout cache: found domain record for y
+ callout cache: found domain record for y
  dbfn_read: key=x@y
-callout cache: found address record for x@y
-callout cache: address record is positive
+ callout cache: found address record for x@y
+ callout cache: address record is positive
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 ----------- end verify ------------
@@ -208,7 +221,7 @@ SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [1.2.3.4] closed by QUIT
+  SMTP connection from (test) [1.2.3.4] closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>> host in hosts_connection_nolog? no (option unset)
@@ -219,6 +232,7 @@ search_tidyup called
 >>> 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)
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s
@@ -245,6 +259,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> 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)
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s
@@ -291,6 +306,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> 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)
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s
@@ -315,5 +331,5 @@ MUNGED: ::1 will be omitted in what follows
 >>> SMTP timeout
 >>> ----------- end verify ------------
 >>> 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: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex
-LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout
+LOG: H=(test) [1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex
+LOG: H=(test) [1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout