Use C99 initialisations for iterators

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

diff --git a/test/stderr/0021 b/test/stderr/0021
index 70391fd128ed03bde709ab6f7ee31a908091f429..7ddedfee3ad748b07f418f7feb4df42846c4a8ef 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -16,42 +16,46 @@ using ACL "connect"
 processing "deny"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 processing "deny"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)

-deny: condition test failed
+deny: condition test failed in ACL "connect"

 processing "drop"
 processing "drop"

+l_message: forcibly dropped

 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)

-drop: condition test failed
+drop: condition test failed in ACL "connect"

 processing "accept"
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL
 processing "accept"
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL

-accept: condition test succeeded
+accept: condition test succeeded in ACL "connect"
+end of ACL "connect": ACCEPT

 using ACL "mail"
 processing "warn"
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 check senders = ok@test3

-address match: subject=bad@test1 pattern=ok@test3
+address match test: subject=bad@test1 pattern=ok@test3

 bad@test1 in "ok@test3"? no (end of list)
 bad@test1 in "ok@test3"? no (end of list)

-warn: condition test failed
+warn: condition test failed in ACL "mail"

 processing "accept"
 check senders = ok@test1 : ok@test3
 processing "accept"
 check senders = ok@test1 : ok@test3

-address match: subject=bad@test1 pattern=ok@test1
-address match: subject=bad@test1 pattern=ok@test3
+address match test: subject=bad@test1 pattern=ok@test1
+address match test: subject=bad@test1 pattern=ok@test3

 bad@test1 in "ok@test1 : ok@test3"? no (end of list)
 bad@test1 in "ok@test1 : ok@test3"? no (end of list)

-accept: condition test failed
+accept: condition test failed in ACL "mail"

 end of ACL "mail": implicit DENY
 LOG: MAIN REJECT
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 using ACL "mail"
 processing "warn"
 end of ACL "mail": implicit DENY
 LOG: MAIN REJECT
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 check senders = ok@test3

-address match: subject=ok@test1 pattern=ok@test3
+address match test: subject=ok@test1 pattern=ok@test3

 test1 in "test3"? no (end of list)
 ok@test1 in "ok@test3"? no (end of list)
 test1 in "test3"? no (end of list)
 ok@test1 in "ok@test3"? no (end of list)

-warn: condition test failed
+warn: condition test failed in ACL "mail"

 processing "accept"
 check senders = ok@test1 : ok@test3
 processing "accept"
 check senders = ok@test1 : ok@test3

-address match: subject=ok@test1 pattern=ok@test1
+address match test: subject=ok@test1 pattern=ok@test1

 test1 in "test1"? yes (matched "test1")
 ok@test1 in "ok@test1 : ok@test3"? yes (matched "ok@test1")
 check verify = sender
 test1 in "test1"? yes (matched "test1")
 ok@test1 in "ok@test1 : ok@test3"? yes (matched "ok@test1")
 check verify = sender


@@ -62,23 +66,26 @@ check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu
                = :main,reject: mail accepted "mail from:<ok@test1>" "<ok@test1>"
 LOG: MAIN REJECT
   mail accepted "mail from:<ok@test1>" "<ok@test1>"
                = :main,reject: mail accepted "mail from:<ok@test1>" "<ok@test1>"
 LOG: MAIN REJECT
   mail accepted "mail from:<ok@test1>" "<ok@test1>"

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT

 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders
 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders

-address match: subject=ok@test1 pattern=ok@somewhere
+address match test: subject=ok@test1 pattern=ok@somewhere

 test1 in "somewhere"? no (end of list)
 test1 in "somewhere"? no (end of list)

-address match: subject=ok@test1 pattern=ok@test1
+address match test: subject=ok@test1 pattern=ok@test1

 test1 in "test1"? yes (matched "test1")
 ok@test1 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test1")
 ok@test1 in "+ok_senders"? yes (matched "+ok_senders")
 check sender_domains = +ok_sender_domains
 test1 in "somewhere : test1 : test3"? yes (matched "test1")
 test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
 test1 in "test1"? yes (matched "test1")
 ok@test1 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test1")
 ok@test1 in "+ok_senders"? yes (matched "+ok_senders")
 check sender_domains = +ok_sender_domains
 test1 in "somewhere : test1 : test3"? yes (matched "test1")
 test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")

-check logwrite = :panic: rcpt accepted
+check logwrite = :panic: rcpt accepted C=$smtp_command_history
+               = :panic: rcpt accepted C=MAIL,MAIL,RCPT

 LOG: PANIC
 LOG: PANIC

-  rcpt accepted
-accept: condition test succeeded
+  rcpt accepted C=MAIL,MAIL,RCPT
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT

 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders
 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders


@@ -88,13 +95,15 @@ ok@test1 in "+ok_senders"? yes (matched "+ok_senders" - cached)
 check sender_domains = +ok_sender_domains
 cached yes match for +ok_sender_domains
 test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains" - cached)
 check sender_domains = +ok_sender_domains
 cached yes match for +ok_sender_domains
 test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains" - cached)

-check logwrite = :panic: rcpt accepted
+check logwrite = :panic: rcpt accepted C=$smtp_command_history
+               = :panic: rcpt accepted C=MAIL,MAIL,RCPT,RCPT

 LOG: PANIC
 LOG: PANIC

-  rcpt accepted
-accept: condition test succeeded
+  rcpt accepted C=MAIL,MAIL,RCPT,RCPT
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT

 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 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 >>>>>>>>>>>>>>>>

 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -114,29 +123,32 @@ using ACL "connect"
 processing "deny"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 processing "deny"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)

-deny: condition test failed
+deny: condition test failed in ACL "connect"

 processing "drop"
 processing "drop"

+l_message: forcibly dropped

 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)

-drop: condition test failed
+drop: condition test failed in ACL "connect"

 processing "accept"
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL
 processing "accept"
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL

-accept: condition test succeeded
+accept: condition test succeeded in ACL "connect"
+end of ACL "connect": ACCEPT

 using ACL "mail"
 processing "warn"
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 check senders = ok@test3

-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3

 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test3"? yes (matched "ok@test3")
 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test3"? yes (matched "ok@test3")

-warn: condition test succeeded
+warn: condition test succeeded in ACL "mail"

 processing "accept"
 check senders = ok@test1 : ok@test3
 processing "accept"
 check senders = ok@test1 : ok@test3

-address match: subject=ok@test3 pattern=ok@test1
+address match test: subject=ok@test3 pattern=ok@test1

 test3 in "test1"? no (end of list)
 test3 in "test1"? no (end of list)

-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3

 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test1 : ok@test3"? yes (matched "ok@test3")
 check verify = sender
 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test1 : ok@test3"? yes (matched "ok@test3")
 check verify = sender


@@ -147,26 +159,28 @@ check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu
                = :main,reject: mail accepted "mail from:<ok@test3>" "<ok@test3>"
 LOG: MAIN REJECT
   mail accepted "mail from:<ok@test3>" "<ok@test3>"
                = :main,reject: mail accepted "mail from:<ok@test3>" "<ok@test3>"
 LOG: MAIN REJECT
   mail accepted "mail from:<ok@test3>" "<ok@test3>"

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT

 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders
 using ACL "rcpt"
 processing "accept"
 check senders = +ok_senders

-address match: subject=ok@test3 pattern=ok@somewhere
+address match test: subject=ok@test3 pattern=ok@somewhere

 test3 in "somewhere"? no (end of list)
 test3 in "somewhere"? no (end of list)

-address match: subject=ok@test3 pattern=ok@test1
+address match test: subject=ok@test3 pattern=ok@test1

 test3 in "test1"? no (end of list)
 test3 in "test1"? no (end of list)

-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3

 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test3")
 ok@test3 in "+ok_senders"? yes (matched "+ok_senders")
 check sender_domains = +ok_sender_domains
 test3 in "somewhere : test1 : test3"? yes (matched "test3")
 test3 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test3")
 ok@test3 in "+ok_senders"? yes (matched "+ok_senders")
 check sender_domains = +ok_sender_domains
 test3 in "somewhere : test1 : test3"? yes (matched "test3")
 test3 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")

-check logwrite = :panic: rcpt accepted
+check logwrite = :panic: rcpt accepted C=$smtp_command_history
+               = :panic: rcpt accepted C=MAIL,RCPT

 LOG: PANIC
 LOG: PANIC

-  rcpt accepted
-accept: condition test succeeded
-host in ignore_fromline_hosts? no (option unset)
+  rcpt accepted C=MAIL,RCPT
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT

 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: added header line
 >>
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: added header line
 >>


@@ -176,15 +190,15 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-skipping ACL configuration - not needed

 x in "!bad"? yes (end of list)
 LOG: MAIN
   => x <x@y> R=accept T=appendfile
 LOG: MAIN
   Completed
 x in "!bad"? yes (end of list)
 LOG: MAIN
   => x <x@y> R=accept T=appendfile
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 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 >>>>>>>>>>>>>>>>

 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored

-1999-03-02 09:44:33 rcpt accepted
+1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT
+1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers