Remove empty lines from .mailmap, fix root

[exim.git] / test / stderr / 0537

diff --git a/test/stderr/0537 b/test/stderr/0537
index a4c766269deedbb8cb19a3bd7e03eb2fab1d2ece..a892e736d6a8a8c3874919d9212bad7644296610 100644 (file)
--- a/test/stderr/0537
+++ b/test/stderr/0537
@@ -39,8 +39,10 @@ LOG: sender_host_name=
 >>> check logwrite = sender_ident=$sender_ident
 >>>                = sender_ident=
 LOG: sender_ident=
 >>> check logwrite = sender_ident=$sender_ident
 >>>                = sender_ident=
 LOG: sender_ident=

->>> accept: condition test succeeded
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "log"
+>>> end of ACL "log": ACCEPT
+>>> accept: condition test succeeded in ACL "connect"
+>>> end of ACL "connect": ACCEPT

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -80,8 +82,11 @@ LOG: sender_host_name=hostname
 >>> check logwrite = sender_ident=$sender_ident
 >>>                = sender_ident=ident
 LOG: sender_ident=ident
 >>> check logwrite = sender_ident=$sender_ident
 >>>                = sender_ident=ident
 LOG: sender_ident=ident

->>> accept: condition test succeeded
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "log"
+>>> end of ACL "log": ACCEPT
+>>> accept: condition test succeeded in ACL "connect"
+>>> end of ACL "connect": ACCEPT
+>>> host in dsn_advertise_hosts? no (option unset)

 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "mail"
 >>> processing "accept"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "mail"
 >>> processing "accept"


@@ -114,7 +119,8 @@ LOG: sender_host_name=hostname
 >>> check logwrite = sender_ident=$sender_ident
 >>>                = sender_ident=ident
 LOG: sender_ident=ident
 >>> check logwrite = sender_ident=$sender_ident
 >>>                = sender_ident=ident
 LOG: sender_ident=ident

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "log"
+>>> end of ACL "log": ACCEPT

 >>> check acl = auth
 >>> using ACL "auth"
 >>> processing "accept"
 >>> check acl = auth
 >>> using ACL "auth"
 >>> processing "accept"


@@ -122,8 +128,10 @@ LOG: sender_ident=ident
 >>> authname in "*"? yes (matched "*")
 >>> check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++
 >>> authname in "*"? yes (matched "*")
 >>> check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++

->>> accept: condition test succeeded
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "auth"
+>>> end of ACL "auth": ACCEPT
+>>> accept: condition test succeeded in ACL "mail"
+>>> end of ACL "mail": ACCEPT

 >>> using ACL "mail"
 >>> processing "accept"
 >>> check acl = log
 >>> using ACL "mail"
 >>> processing "accept"
 >>> check acl = log


@@ -155,7 +163,8 @@ LOG: sender_host_name=hostname
 >>> check logwrite = sender_ident=$sender_ident
 >>>                = sender_ident=ident
 LOG: sender_ident=ident
 >>> check logwrite = sender_ident=$sender_ident
 >>>                = sender_ident=ident
 LOG: sender_ident=ident

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "log"
+>>> end of ACL "log": ACCEPT

 >>> check acl = auth
 >>> using ACL "auth"
 >>> processing "accept"
 >>> check acl = auth
 >>> using ACL "auth"
 >>> processing "accept"


@@ -163,5 +172,7 @@ LOG: sender_ident=ident
 >>> authname in "*"? yes (matched "*")
 >>> check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++
 >>> authname in "*"? yes (matched "*")
 >>> check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++

->>> accept: condition test succeeded
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "auth"
+>>> end of ACL "auth": ACCEPT
+>>> accept: condition test succeeded in ACL "mail"
+>>> end of ACL "mail": ACCEPT