git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EXPERIMENTAL_DSN: use the SMTP return messsage for Diagnostic-Code lines. Bug 1559
[users/heiko/exim.git]
/
test
/
stderr
/
5410
diff --git
a/test/stderr/5410
b/test/stderr/5410
index 98ba3cb8fa30d37ea29aa3ee1674cfcc1abbff07..0f655c4160cbd6fc5e81e128305540ce23369ae8 100644
(file)
--- a/
test/stderr/5410
+++ b/
test/stderr/5410
@@
-6,6
+6,7
@@
LOG: smtp_connection MAIN
SMTP connection from CALLER
expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP connection from CALLER
expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts? yes (matched "*")
in tls_advertise_hosts? yes (matched "*")
expanding: SERVER
in pipelining_advertise_hosts? yes (matched "*")
in tls_advertise_hosts? yes (matched "*")
expanding: SERVER
@@
-32,6
+33,7
@@
expanding: $local_part
domain.com in "*"? yes (matched "*")
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
domain.com in "*"? yes (matched "*")
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
+end of ACL "cutthrough": ACCEPT
----------- start cutthrough setup ------------
domain.com in "test.ex : *.test.ex"? no (end of list)
domain.com in "! +local_domains"? yes (end of list)
----------- start cutthrough setup ------------
domain.com in "test.ex : *.test.ex"? no (end of list)
domain.com in "! +local_domains"? yes (end of list)
@@
-80,19
+82,25
@@
expanding: ${if eq {$address_data}{userz}{*}{:}}
127.0.0.1 in hosts_verify_avoid_tls? no (end of list)
SMTP>> STARTTLS
SMTP<< 220 TLS go ahead
127.0.0.1 in hosts_verify_avoid_tls? no (end of list)
SMTP>> STARTTLS
SMTP<< 220 TLS go ahead
+127.0.0.1 in hosts_require_ocsp? no (option unset)
+127.0.0.1 in hosts_request_ocsp? yes (matched "*")
+127.0.0.1 in tls_verify_hosts? no (option unset)
+127.0.0.1 in tls_try_verify_hosts? no (end of list)
SMTP>> EHLO myhost.test.ex
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
250-8BITMIME
250-PIPELINING
250 HELP
SMTP>> EHLO myhost.test.ex
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
250-8BITMIME
250-PIPELINING
250 HELP
- SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+127.0.0.1 in hosts_require_auth? no (option unset)
+ SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
SMTP<< 250 OK
SMTP>> RCPT TO:<userx@domain.com>
SMTP<< 250 Accepted
----------- end cutthrough setup ------------
processing "accept"
accept: condition test succeeded in inline ACL
SMTP<< 250 OK
SMTP>> RCPT TO:<userx@domain.com>
SMTP<< 250 Accepted
----------- end cutthrough setup ------------
processing "accept"
accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
expanding: ${tod_full}
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
expanding: ${tod_full}
@@
-136,13
+144,14
@@
expanding:
for $received_for
result:
for userx@domain.com
for $received_for
result:
for userx@domain.com
-PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+----------- start cutthrough headers send -----------
+----------- done cutthrough headers send ------------
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> .
SMTP<< 250 OK id=10HmaX-0005vi-00
LOG: MAIN
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> .
SMTP<< 250 OK id=10HmaX-0005vi-00
LOG: MAIN
- >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 C="250 OK id=10HmaX-0005vi-00"
+ >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 C
V=no C
="250 OK id=10HmaX-0005vi-00"
SMTP>> QUIT
----------- cutthrough shutdown (delivered) ------------
LOG: MAIN
SMTP>> QUIT
----------- cutthrough shutdown (delivered) ------------
LOG: MAIN
@@
-160,6
+169,7
@@
LOG: smtp_connection MAIN
SMTP connection from CALLER
expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP connection from CALLER
expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts? yes (matched "*")
in tls_advertise_hosts? yes (matched "*")
expanding: SERVER
in pipelining_advertise_hosts? yes (matched "*")
in tls_advertise_hosts? yes (matched "*")
expanding: SERVER
@@
-186,6
+196,7
@@
expanding: $local_part
domain.com in "*"? yes (matched "*")
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
domain.com in "*"? yes (matched "*")
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
+end of ACL "cutthrough": ACCEPT
----------- start cutthrough setup ------------
domain.com in "test.ex : *.test.ex"? no (end of list)
domain.com in "! +local_domains"? yes (end of list)
----------- start cutthrough setup ------------
domain.com in "test.ex : *.test.ex"? no (end of list)
domain.com in "! +local_domains"? yes (end of list)
@@
-218,13
+229,15
@@
skipping: result is not used
expanding: ${if eq {$address_data}{usery}{*}{:}}
result: *
127.0.0.1 in hosts_avoid_tls? yes (matched "*")
expanding: ${if eq {$address_data}{usery}{*}{:}}
result: *
127.0.0.1 in hosts_avoid_tls? yes (matched "*")
- SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+127.0.0.1 in hosts_require_auth? no (option unset)
+ SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
SMTP<< 250 OK
SMTP>> RCPT TO:<usery@domain.com>
SMTP<< 250 Accepted
----------- end cutthrough setup ------------
processing "accept"
accept: condition test succeeded in inline ACL
SMTP<< 250 OK
SMTP>> RCPT TO:<usery@domain.com>
SMTP<< 250 Accepted
----------- end cutthrough setup ------------
processing "accept"
accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
expanding: ${tod_full}
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
expanding: ${tod_full}
@@
-268,7
+281,8
@@
expanding:
for $received_for
result:
for usery@domain.com
for $received_for
result:
for usery@domain.com
-PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+----------- start cutthrough headers send -----------
+----------- done cutthrough headers send ------------
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> .
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> .
@@
-292,6
+306,7
@@
LOG: smtp_connection MAIN
SMTP connection from CALLER
expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP connection from CALLER
expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts? yes (matched "*")
in tls_advertise_hosts? yes (matched "*")
expanding: SERVER
in pipelining_advertise_hosts? yes (matched "*")
in tls_advertise_hosts? yes (matched "*")
expanding: SERVER
@@
-318,6
+333,7
@@
expanding: $local_part
domain.com in "*"? yes (matched "*")
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
domain.com in "*"? yes (matched "*")
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
+end of ACL "cutthrough": ACCEPT
----------- start cutthrough setup ------------
domain.com in "test.ex : *.test.ex"? no (end of list)
domain.com in "! +local_domains"? yes (end of list)
----------- start cutthrough setup ------------
domain.com in "test.ex : *.test.ex"? no (end of list)
domain.com in "! +local_domains"? yes (end of list)
@@
-350,13
+366,15
@@
skipping: result is not used
expanding: ${if eq {$address_data}{usery}{*}{:}}
result: *
127.0.0.1 in hosts_avoid_tls? yes (matched "*")
expanding: ${if eq {$address_data}{usery}{*}{:}}
result: *
127.0.0.1 in hosts_avoid_tls? yes (matched "*")
- SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+127.0.0.1 in hosts_require_auth? no (option unset)
+ SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
SMTP<< 250 OK
SMTP>> RCPT TO:<usery@domain.com>
SMTP<< 250 Accepted
----------- end cutthrough setup ------------
processing "accept"
accept: condition test succeeded in inline ACL
SMTP<< 250 OK
SMTP>> RCPT TO:<usery@domain.com>
SMTP<< 250 Accepted
----------- end cutthrough setup ------------
processing "accept"
accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
expanding: ${tod_full}
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
expanding: ${tod_full}
@@
-400,7
+418,8
@@
expanding:
for $received_for
result:
for usery@domain.com
for $received_for
result:
for usery@domain.com
-PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+----------- start cutthrough headers send -----------
+----------- done cutthrough headers send ------------
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> .
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> .