Remove the X_ prefix from the PIPE_CONNECT SMTP service extension keyword.

[users/heiko/exim.git] / test / stderr / 0294

diff --git a/test/stderr/0294 b/test/stderr/0294
index a1525db2d06a41b86da3649e840ef3b42df96405..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,7 +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

-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


@@ -61,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:


@@ -78,7 +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

-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


@@ -94,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


@@ -126,7 +120,6 @@ 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)
 processing "deny" (TESTSUITE/test-config 35)
 SMTP<< rcpt to:<one@z>
 host in smtp_ratelimit_hosts? no (end of list)
 processing "deny" (TESTSUITE/test-config 35)


@@ -137,12 +130,11 @@ 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


@@ -174,7 +166,6 @@ 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


@@ -186,12 +177,11 @@ 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


@@ -252,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 >>>>>>>>>>>>>>>>