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
Lookups: fix pgsql multiple-row, single-column return
[users/heiko/exim.git]
/
test
/
stderr
/
0294
diff --git
a/test/stderr/0294
b/test/stderr/0294
index 3b09873e20ae303952599d1baf54e025f894530d..f4cd59269339819990ee17cc6aab062b7f5bf6e2 100644
(file)
--- a/
test/stderr/0294
+++ b/
test/stderr/0294
@@
-9,21
+9,28
@@
LOG: smtp_connection MAIN
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
SMTP>> 250 Accepted
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.25 sec
SMTP>> 250 Accepted
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.25 sec
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.263 sec
SMTP>> 250 Accepted
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.263 sec
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.276 sec
SMTP>> 250 Accepted
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.276 sec
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.289 sec
SMTP>> 250 Accepted
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.289 sec
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
>>Headers received:
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
>>Headers received:
@@
-33,6
+40,7
@@
I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
F From: x@y
Date: Tue, 2 Mar 1999 09:44:33 +0000
F From: x@y
Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
@@
-40,7
+48,8
@@
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= x@y U=CALLER P=local-smtp S=sss
Size of headers = sss
LOG: MAIN
<= x@y U=CALLER P=local-smtp S=sss
@@
-49,9
+58,12
@@
SMTP>> 250 OK id=10HmaX-0005vi-00
smtp_setup_msg entered
SMTP<< mail from:<x@y>
rate limit MAIL: delay 1 sec
smtp_setup_msg entered
SMTP<< mail from:<x@y>
rate limit MAIL: delay 1 sec
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<two@z>
SMTP>> 250 Accepted
SMTP>> 250 OK
SMTP<< rcpt to:<two@z>
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
>>Headers received:
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
>>Headers received:
@@
-61,6
+73,7
@@
I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
F From: x@y
Date: Tue, 2 Mar 1999 09:44:33 +0000
F From: x@y
Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
@@
-69,7
+82,8
@@
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
for two@z; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for two@z; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= x@y U=CALLER P=local-smtp S=sss
Size of headers = sss
LOG: MAIN
<= x@y U=CALLER P=local-smtp S=sss
@@
-77,12
+91,14
@@
SMTP>> 250 OK id=10HmaY-0005vi-00
smtp_setup_msg entered
SMTP<< mail from:<x@y>
rate limit MAIL: delay 2 sec
smtp_setup_msg entered
SMTP<< mail from:<x@y>
rate limit MAIL: delay 2 sec
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
SMTP>> 250 OK
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(msg setup toplevel)
terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@
-102,6
+118,8
@@
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
processing "deny"
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
processing "deny"
@@
-110,7
+128,9
@@
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
processing "accept"
accept: condition test succeeded in inline ACL
deny: condition test failed in inline ACL
processing "accept"
accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
SMTP>> 250 Accepted
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
host in smtp_ratelimit_hosts? no (end of list)
processing "deny"
SMTP<< rcpt to:<one@z>
host in smtp_ratelimit_hosts? no (end of list)
processing "deny"
@@
-119,12
+139,14
@@
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
processing "accept"
accept: condition test succeeded in inline ACL
deny: condition test failed in inline ACL
processing "accept"
accept: condition test succeeded in inline ACL
+end of inline ACL: 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 connection from [1.2.3.4] closed by QUIT
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [1.2.3.4] closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(main)
terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@
-144,6
+166,8
@@
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
processing "deny"
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
processing "deny"
@@
-152,7
+176,9
@@
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
processing "accept"
accept: condition test succeeded in inline ACL
deny: condition test failed in inline ACL
processing "accept"
accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
SMTP>> 250 Accepted
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
rate limit RCPT: delay 0.25 sec
SMTP<< rcpt to:<one@z>
host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
rate limit RCPT: delay 0.25 sec
@@
-162,12
+188,14
@@
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
processing "accept"
accept: condition test succeeded in inline ACL
deny: condition test failed in inline ACL
processing "accept"
accept: condition test succeeded in inline ACL
+end of inline ACL: 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 connection from [V4NET.9.8.7] closed by QUIT
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.9.8.7] closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(main)
terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@
-179,6
+207,8
@@
LOG: smtp_connection MAIN
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< mail from:<x@y>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<reject@z>
SMTP>> 550 Administrative prohibition
SMTP>> 250 OK
SMTP<< rcpt to:<reject@z>
SMTP>> 550 Administrative prohibition
@@
-208,6
+238,8
@@
SMTP<< rset
SMTP>> 250 Reset OK
SMTP<< mail from:<x@y>
rate limit MAIL: delay 1 sec
SMTP>> 250 Reset OK
SMTP<< mail from:<x@y>
rate limit MAIL: delay 1 sec
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<reject@z>
SMTP>> 550 Administrative prohibition
SMTP>> 250 OK
SMTP<< rcpt to:<reject@z>
SMTP>> 550 Administrative prohibition
@@
-217,9
+249,11
@@
SMTP<< rset
SMTP>> 250 Reset OK
SMTP<< mail from:<x@y>
rate limit MAIL: delay 2 sec
SMTP>> 250 Reset OK
SMTP<< mail from:<x@y>
rate limit MAIL: delay 2 sec
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
SMTP>> 250 OK
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(msg setup toplevel)
terminating with rc=0 >>>>>>>>>>>>>>>>