git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unbreak transport-filters & bounce-generation.
[users/jgh/exim.git]
/
test
/
stderr
/
0022
diff --git
a/test/stderr/0022
b/test/stderr/0022
index deab48a24d360ccbe0e63ce23bfb3bd14fd7ddfa..c51b15bda27489d5f92c6cb8bcb7bf7e360ed49c 100644
(file)
--- a/
test/stderr/0022
+++ b/
test/stderr/0022
@@
-5,6
+5,9
@@
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: accept propagating DSN
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
sender_fullhost = [V4NET.9.8.7]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
sender_fullhost = [V4NET.9.8.7]
@@
-27,10
+30,12
@@
SMTP>> 250 OK
SMTP<< rcpt to:<warn_empty@test.ex>
using ACL "warn_empty"
processing "warn"
SMTP<< rcpt to:<warn_empty@test.ex>
using ACL "warn_empty"
processing "warn"
-warn: condition test succeeded
+warn: condition test succeeded
in ACL "warn_empty"
processing "accept"
processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in ACL "warn_empty"
+end of ACL "warn_empty": ACCEPT
SMTP>> 250 Accepted
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@
-40,6
+45,7
@@
host in ignore_fromline_hosts? no (option unset)
search_tidyup called
>>Headers after rewriting and local additions:
search_tidyup called
>>Headers after rewriting and local additions:
+Data file name: TESTSUITE/spool//input//10HmbF-0005vi-00-D
Data file written for message 10HmbF-0005vi-00
>>Generated Received: header line
P Received: from [V4NET.9.8.7]
Data file written for message 10HmbF-0005vi-00
>>Generated Received: header line
P Received: from [V4NET.9.8.7]
@@
-66,6
+72,9
@@
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: accept propagating DSN
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
sender_fullhost = [V4NET.9.8.7]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
sender_fullhost = [V4NET.9.8.7]
@@
-88,12
+97,15
@@
SMTP>> 250 OK
SMTP<< rcpt to:<warn_log@test.ex>
using ACL "warn_log"
processing "warn"
SMTP<< rcpt to:<warn_log@test.ex>
using ACL "warn_log"
processing "warn"
-warn: condition test succeeded
+l_message: warn log message
+warn: condition test succeeded in ACL "warn_log"
LOG: MAIN
H=[V4NET.9.8.7] Warning: warn log message
processing "accept"
LOG: MAIN
H=[V4NET.9.8.7] Warning: warn log message
processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in ACL "warn_log"
+end of ACL "warn_log": ACCEPT
SMTP>> 250 Accepted
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@
-103,6
+115,7
@@
host in ignore_fromline_hosts? no (option unset)
search_tidyup called
>>Headers after rewriting and local additions:
search_tidyup called
>>Headers after rewriting and local additions:
+Data file name: TESTSUITE/spool//input//10HmbG-0005vi-00-D
Data file written for message 10HmbG-0005vi-00
>>Generated Received: header line
P Received: from [V4NET.9.8.7]
Data file written for message 10HmbG-0005vi-00
>>Generated Received: header line
P Received: from [V4NET.9.8.7]
@@
-129,6
+142,9
@@
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: accept propagating DSN
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
sender_fullhost = [V4NET.9.8.7]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
sender_fullhost = [V4NET.9.8.7]
@@
-151,10
+167,13
@@
SMTP>> 250 OK
SMTP<< rcpt to:<warn_user@test.ex>
using ACL "warn_user"
processing "warn"
SMTP<< rcpt to:<warn_user@test.ex>
using ACL "warn_user"
processing "warn"
-warn: condition test succeeded
+ message: warn user message
+warn: condition test succeeded in ACL "warn_user"
processing "accept"
processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in ACL "warn_user"
+end of ACL "warn_user": ACCEPT
SMTP>> 250 Accepted
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@
-164,6
+183,7
@@
host in ignore_fromline_hosts? no (option unset)
search_tidyup called
>>Headers after rewriting and local additions:
search_tidyup called
>>Headers after rewriting and local additions:
+Data file name: TESTSUITE/spool//input//10HmbH-0005vi-00-D
Data file written for message 10HmbH-0005vi-00
>>Generated Received: header line
P Received: from [V4NET.9.8.7]
Data file written for message 10HmbH-0005vi-00
>>Generated Received: header line
P Received: from [V4NET.9.8.7]
@@
-197,14
+217,19
@@
LOG: SMTP connection from [V4NET.9.8.7]
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "defer"
>>> processing "defer"
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "defer"
>>> processing "defer"
->>> defer: condition test succeeded
+>>> message: forcibly deferred
+>>> defer: condition test succeeded in ACL "defer"
+>>> end of ACL "defer": DEFER
LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
>>> using ACL "accept"
>>> processing "accept"
LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
>>> using ACL "accept"
>>> processing "accept"
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "accept"
+>>> end of ACL "accept": ACCEPT
>>> using ACL "drop"
>>> processing "drop"
>>> using ACL "drop"
>>> processing "drop"
->>> drop: condition test succeeded
+>>> message: forcibly dropped
+>>> drop: condition test succeeded in ACL "drop"
+>>> end of ACL "drop": DROP
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
>>> host in hosts_connection_nolog? no (end of list)
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
>>> host in hosts_connection_nolog? no (end of list)
@@
-220,7
+245,8
@@
LOG: SMTP connection from [V4NET.9.8.7]
>>> processing "defer"
>>> check senders = :
>>> in ":"? yes (matched "")
>>> processing "defer"
>>> check senders = :
>>> in ":"? yes (matched "")
->>> defer: condition test succeeded
+>>> defer: condition test succeeded in ACL "defer_senders"
+>>> end of ACL "defer_senders": DEFER
LOG: H=[V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y>
LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
>>> host in hosts_connection_nolog? no (end of list)
LOG: H=[V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y>
LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
>>> host in hosts_connection_nolog? no (end of list)
@@
-237,15
+263,17
@@
LOG: SMTP connection from [V4NET.9.8.7]
>>> check delay = 1s
>>> delay modifier requests 1-second delay
>>> delay skipped in -bh checking mode
>>> check delay = 1s
>>> delay modifier requests 1-second delay
>>> delay skipped in -bh checking mode
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "delay_accept"
+>>> end of ACL "delay_accept": ACCEPT
>>> using ACL "delay_warn"
>>> processing "warn"
>>> check delay = 1s
>>> delay modifier requests 1-second delay
>>> delay skipped in -bh checking mode
>>> using ACL "delay_warn"
>>> processing "warn"
>>> check delay = 1s
>>> delay modifier requests 1-second delay
>>> delay skipped in -bh checking mode
->>> warn: condition test succeeded
+>>> warn: condition test succeeded
in ACL "delay_warn"
>>> processing "accept"
>>> processing "accept"
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "delay_warn"
+>>> end of ACL "delay_warn": ACCEPT
LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
>>> host in hosts_connection_nolog? no (end of list)
LOG: SMTP connection from [V4NET.9.8.7]
LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
>>> host in hosts_connection_nolog? no (end of list)
LOG: SMTP connection from [V4NET.9.8.7]
@@
-260,30
+288,40
@@
LOG: SMTP connection from [V4NET.9.8.7]
>>> processing "deny"
>>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
>>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
>>> processing "deny"
>>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
>>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
->>> deny: condition test succeeded
+>>> message: host data >$host_data<
+>>> deny: condition test succeeded in ACL "host_check"
+>>> end of ACL "host_check": DENY
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
>>> using ACL "host_check"
>>> processing "deny"
>>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
>>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
>>> using ACL "host_check"
>>> processing "deny"
>>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
>>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
->>> deny: condition test succeeded
+>>> message: host data >$host_data<
+>>> deny: condition test succeeded in ACL "host_check"
+>>> end of ACL "host_check": DENY
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
>>> using ACL "host_check2"
>>> processing "deny"
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
>>> using ACL "host_check2"
>>> processing "deny"
+>>> message: host data >$host_data<
>>> check hosts = +some_hosts
>>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
>>> host in "+some_hosts"? yes (matched "+some_hosts")
>>> check hosts = +some_hosts
>>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
>>> host in "+some_hosts"? yes (matched "+some_hosts")
->>> deny: condition test succeeded
+>>> deny: condition test succeeded in ACL "host_check2"
+>>> end of ACL "host_check2": DENY
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
>>> using ACL "host_check2"
>>> processing "deny"
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
>>> using ACL "host_check2"
>>> processing "deny"
+>>> message: host data >$host_data<
>>> check hosts = +some_hosts
>>> host in "+some_hosts"? yes (matched "+some_hosts" - cached)
>>> check hosts = +some_hosts
>>> host in "+some_hosts"? yes (matched "+some_hosts" - cached)
->>> deny: condition test succeeded
+>>> deny: condition test succeeded in ACL "host_check2"
+>>> end of ACL "host_check2": DENY
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
LOG: smtp_connection MAIN
SMTP connection from CALLER
+LOG: MAIN
+ Connections=0
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local-smtp S=sss
LOG: MAIN
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local-smtp S=sss
LOG: MAIN
@@
-322,8
+360,10
@@
LOG: SMTP connection from [V4NET.9.8.7]
>>> check acl = drop
>>> using ACL "drop"
>>> processing "drop"
>>> check acl = drop
>>> using ACL "drop"
>>> processing "drop"
->>> drop: condition test succeeded
->>> accept: condition test yielded "drop"
+>>> message: forcibly dropped
+>>> drop: condition test succeeded in ACL "drop"
+>>> end of ACL "drop": DROP
+>>> accept: condition test yielded "drop" in ACL "nested_drop"
>>> accept: endpass encountered - denying access
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped
LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
>>> accept: endpass encountered - denying access
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped
LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
@@
-341,8
+381,11
@@
LOG: SMTP connection from [V4NET.9.8.7]
>>> check acl = drop
>>> using ACL "drop"
>>> processing "drop"
>>> check acl = drop
>>> using ACL "drop"
>>> processing "drop"
->>> drop: condition test succeeded
->>> require: condition test yielded "drop"
+>>> message: forcibly dropped
+>>> drop: condition test succeeded in ACL "drop"
+>>> end of ACL "drop": DROP
+>>> require: condition test yielded "drop" in ACL "nested_drop_require"
+>>> end of ACL "nested_drop_require": not OK
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped
LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped
LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL