Rspamd: add $authenticated_id as User to scan command

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

diff --git a/test/stderr/0464 b/test/stderr/0464
index 67645cde0a9464f0385333a60db96a3a39726d66..cf094ce218df683330b1596cb5f0bdcf1ce5ec29 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -5,6 +5,8 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp

+DSN: r1 propagating DSN
+DSN: r2 propagating DSN

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex>
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex>


@@ -23,7 +25,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="domain1" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="domain1" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="domain1"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="domain1"


@@ -70,7 +72,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"


@@ -94,7 +96,7 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------

-require: condition test succeeded
+require: condition test succeeded in ACL "rcpt"

 processing "require"
 check domains = +special_domains
 cached yes match for +special_domains
 processing "require"
 check domains = +special_domains
 cached yes match for +special_domains


@@ -137,7 +139,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"


@@ -160,10 +162,12 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------

-require: condition test succeeded
+require: condition test succeeded in ACL "rcpt"

 processing "accept"
 processing "accept"

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

 SMTP>> 250 Accepted
 SMTP>> 250 Accepted

+DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN