Bugtrack 1290 - Spec grammar fixes.

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

diff --git a/test/stderr/0303 b/test/stderr/0303
index f017d84eca51c93c2a050d41adf457e92ab20d03..bd6f78c4bdeafa8f579fb3e537e68cb66bfdef7f 100644 (file)
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -43,6 +43,8 @@ MUNGED: ::1 will be omitted in what follows
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp

+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user


@@ -73,13 +75,14 @@ set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.
 host in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
 250-SIZE 52428800
 host in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
 250-SIZE 52428800

+250-8BITMIME

 250-PIPELINING
 250 HELP
 SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in inline ACL

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself


@@ -110,6 +113,8 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp

+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user


@@ -139,13 +144,14 @@ set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.
 host in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
 250-SIZE 52428800
 host in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
 250-SIZE 52428800

+250-8BITMIME

 250-PIPELINING
 250 HELP
 SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in inline ACL

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself