The MySQL and Postgresql tests hadn't been run for a while and needed

updating.

diff --git a/test/stderr/9100 b/test/stderr/9100
index c40a84034d648605f47799157cf22df1d08eb9b2..5070be21cd43a4149e08fc719cdf253f26f97d8a 100644 (file)
--- a/test/stderr/9100
+++ b/test/stderr/9100
@@ -139,10 +139,10 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 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\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< mail from:<a@b>
 smtp_setup_msg entered
 SMTP<< mail from:<a@b>

-SMTP>> 250 OK\r
+SMTP>> 250 OK

 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept"
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept"


@@ -168,11 +168,11 @@ host in "+relay_hosts"? no (end of list)
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded

-SMTP>> 550 relay not permitted\r
+SMTP>> 550 relay not permitted

 LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< quit
 LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< quit

-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection

 LOG: smtp_connection MAIN
   SMTP connection from [10.0.0.0] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from [10.0.0.0] closed by QUIT
 search_tidyup called

diff --git a/test/stderr/9200 b/test/stderr/9200
index bdfbee299d61af289e9610ec0f2de349afb6be2c..1a004b30f766d5ca332880b3f475ff7df2062938 100644 (file)
--- a/test/stderr/9200
+++ b/test/stderr/9200
@@ -100,7 +100,7 @@ internal_search_find: file="NULL"
 database lookup required for select * from them where id='tab';
 PGSQL query: select * from them where id='tab';
 PGSQL using cached connection for localhost/test/CALLER
 database lookup required for select * from them where id='tab';
 PGSQL query: select * from them where id='tab';
 PGSQL using cached connection for localhost/test/CALLER

-lookup yielded: name="x        x" id=tab 
+lookup yielded: name="x x" id=tab 

 search_tidyup called
 close PGSQL connection: localhost/test/CALLER
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 close PGSQL connection: localhost/test/CALLER
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -126,10 +126,10 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 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\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< mail from:<a@b>
 smtp_setup_msg entered
 SMTP<< mail from:<a@b>

-SMTP>> 250 OK\r
+SMTP>> 250 OK

 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept"
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept"


@@ -155,7 +155,7 @@ host in "+relay_hosts"? no (end of list)
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded

-SMTP>> 550 relay not permitted\r
+SMTP>> 550 relay not permitted

 LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< rcpt to:<c@d>
 LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< rcpt to:<c@d>


@@ -181,11 +181,11 @@ host in "+relay_hosts"? no (end of list)
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded

-SMTP>> 550 relay not permitted\r
+SMTP>> 550 relay not permitted

 LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< quit
 LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< quit

-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection

 LOG: smtp_connection MAIN
   SMTP connection from [10.0.0.0] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from [10.0.0.0] closed by QUIT
 search_tidyup called