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
spamd: Use macro for default priority. Bug 2694
[users/heiko/exim.git]
/
test
/
stderr
/
0294
diff --git
a/test/stderr/0294
b/test/stderr/0294
index f4cd59269339819990ee17cc6aab062b7f5bf6e2..cd0424eb80fafeb3871770e522dea6fec84ad5be 100644
(file)
--- a/
test/stderr/0294
+++ b/
test/stderr/0294
@@
-14,23
+14,18
@@
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:
@@
-46,9
+41,7
@@
Data file written for message 10HmaX-0005vi-00
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
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: TESTSUITE/spool//input//hdr.pppp
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
LOG: MAIN
Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
LOG: MAIN
@@
-63,7
+56,6
@@
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:
@@
-80,9
+72,7
@@
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaY-0005vi-00
for two@z; Tue, 2 Mar 1999 09:44:33 +0000
(envelope-from <x@y>)
id 10HmaY-0005vi-00
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: TESTSUITE/spool//input//hdr.pppp
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
LOG: MAIN
Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
LOG: MAIN
@@
-98,7
+88,7
@@
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (
msg setup toplevel
) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (
fresh-exec
) 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
@@
-122,31
+112,29
@@
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
-processing "deny"
+processing "deny"
(TESTSUITE/test-config 35)
check local_parts = reject
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
check local_parts = reject
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
-processing "accept"
+processing "accept"
(TESTSUITE/test-config 35)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
-DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
host in smtp_ratelimit_hosts? no (end of list)
SMTP<< rcpt to:<one@z>
host in smtp_ratelimit_hosts? no (end of list)
-processing "deny"
+processing "deny"
(TESTSUITE/test-config 35)
check local_parts = reject
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
check local_parts = reject
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
-processing "accept"
+processing "accept"
(TESTSUITE/test-config 35)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
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 (
main
) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (
fresh-exec
) 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
@@
-170,32
+158,30
@@
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
-processing "deny"
+processing "deny"
(TESTSUITE/test-config 35)
check local_parts = reject
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
check local_parts = reject
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
-processing "accept"
+processing "accept"
(TESTSUITE/test-config 35)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
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
-processing "deny"
+processing "deny"
(TESTSUITE/test-config 35)
check local_parts = reject
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
check local_parts = reject
one in "reject"? no (end of list)
deny: condition test failed in inline ACL
-processing "accept"
+processing "accept"
(TESTSUITE/test-config 35)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
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 (
main
) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (
fresh-exec
) 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
@@
-256,4
+242,4
@@
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (
msg setup toplevel
) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (
fresh-exec
) terminating with rc=0 >>>>>>>>>>>>>>>>