Testsuite: avoid assuming 127.0.0.2 is a viable sending address

[users/heiko/exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index cfa58eb8ee49adc874c159fb63db03eb58b8920f..f86dc46e82997405c3e636fef2852bd68cdd5ca1 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -1,6 +1,8 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -8,6 +10,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
+set_process_info: pppp accepting a local SMTP message from <CALLER>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -29,6 +32,8 @@ exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not all
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -36,6 +41,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
+set_process_info: pppp accepting a local SMTP message from <CALLER>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -45,8 +51,10 @@ SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
@@ -69,10 +77,15 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
-accept: condition test succeeded
+accept: condition test succeeded in ACL "check_data"
+end of ACL "check_data": ACCEPT
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |abc@domain| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
 Size of headers = sss
 LOG: MAIN
   <= <> U=CALLER P=local-smtp S=sss
@@ -88,6 +101,8 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -95,6 +110,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
+set_process_info: pppp accepting a local SMTP message from <CALLER>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -104,8 +120,10 @@ SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
@@ -128,7 +146,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
-accept: condition test failed
+accept: condition test failed in ACL "check_data"
 end of ACL "check_data": implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT