More regular logging use of H=<name> [<ip>]

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

diff --git a/test/stderr/0487 b/test/stderr/0487
index 584672a7e2fc1970cb217f527d71b5805767c826..4f2bbc2aa3a142b37a906e69d73c769ccacaaf00 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -12,6 +12,7 @@ seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 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
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER


@@ -21,13 +22,15 @@ SMTP<< ehlo x.y
  in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-myhost.test.ex Hello CALLER at x.y
 250-SIZE 52428800
  in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-myhost.test.ex Hello CALLER at x.y
 250-SIZE 52428800

+250-8BITMIME

 250-PIPELINING
 250 HELP
 SMTP<< mail from:<x@y>
 SMTP>> 250 OK
 SMTP<< rcpt to:<userx@test.ex>
 processing "accept"
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<x@y>
 SMTP>> 250 OK
 SMTP<< rcpt to:<userx@test.ex>
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself