Yet another (hope the last for now) minor test tweak.

diff --git a/test/log/0372 b/test/log/0372
index e3c6b8a5c212d5ccb7709826fb72d34c1ead7525..3830932ef822b50b5e7f87da8a5091082e5bdebb 100644 (file)
--- a/test/log/0372
+++ b/test/log/0372
@@ -1,7 +1,8 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => x <x@y> R=r1 T=t1
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 => a <a@b> R=r1 T=t1
+1999-03-02 09:44:33 10HmaY-0005vi-00 => x <x@y> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=host2.name [4.3.2.1] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => a <a@b> R=r1 T=t1
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=host2.name [4.3.2.1] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: failed to expand "  acl_c0="$acl_c0"\n  acl_c1="$acl_c1"\n  acl_c2="$acl_c2"\n  acl_c3="$acl_c3"\n  acl_c4="$acl_c4"\n  acl_c5="$acl_c5"\n  acl_c6="$acl_c6"\n  acl_c7="$acl_c7"\n  acl_c8="$acl_c8"\n  acl_c9="$acl_c9"\n  acl_m0="$acl_m0"\n  acl_m1="$acl_m1"\n  acl_m2="$acl_m2"\n  acl_m3="$acl_m3"\n  acl_m4="$acl_m4"\n  acl_m5="$acl_m5"\n  acl_m6="$acl_m6"\n  acl_m7="$acl_m7"\n  acl_m8="$acl_m8"\n  acl_m9="$acl_m9"\n  acl_m_foo="$acl_m_foo"\n  acl_m_bar="$acl_m_bar"\n  acl_c_foo="$acl_c_foo"\n  acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set)

diff --git a/test/scripts/0000-Basic/0372 b/test/scripts/0000-Basic/0372
index f64899e31601c8b4fb164a4fdacda0f20bc8ac00..246c9bbda1fa8c41e7aabc445a928dcfe76e06ca 100644 (file)
--- a/test/scripts/0000-Basic/0372
+++ b/test/scripts/0000-Basic/0372
@@ -10,7 +10,7 @@ data
 .
 quit
 ****
-exim -DSTRICT=strict_acl_vars -bs -oMa 4.3.2.1 -oMs host2.name
+exim -DSTRICT=strict_acl_vars -odi -bs -oMa 4.3.2.1 -oMs host2.name
 mail from:<>
 rcpt to:<a@b>
 data

diff --git a/test/stderr/0372 b/test/stderr/0372
index 771c7a4910c599933ec384418f071a40972b5cf0..c30c476b28bdd5d0f179010aad1de4a80cef0a37 100644 (file)
--- a/test/stderr/0372
+++ b/test/stderr/0372
@@ -2,7 +2,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
   <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
-delivering 10HmaX-0005vi-00
+delivering 10HmaY-0005vi-00
 ----- System filter -----
   acl_c0="value for c0 is ip: 1.2.3.4"
   acl_c1=""
@@ -63,7 +63,7 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
-delivering 10HmaY-0005vi-00
+delivering 10HmaZ-0005vi-00
 ----- System filter -----
   acl_c0="value for c0 is ip: 1.2.3.4"
   acl_c1=""
@@ -123,4 +123,4 @@ LOG: MAIN
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 ----- System filter -----
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Error in system filter: failed to expand "  acl_c0="$acl_c0"\n  acl_c1="$acl_c1"\n  acl_c2="$acl_c2"\n  acl_c3="$acl_c3"\n  acl_c4="$acl_c4"\n  acl_c5="$acl_c5"\n  acl_c6="$acl_c6"\n  acl_c7="$acl_c7"\n  acl_c8="$acl_c8"\n  acl_c9="$acl_c9"\n  acl_m0="$acl_m0"\n  acl_m1="$acl_m1"\n  acl_m2="$acl_m2"\n  acl_m3="$acl_m3"\n  acl_m4="$acl_m4"\n  acl_m5="$acl_m5"\n  acl_m6="$acl_m6"\n  acl_m7="$acl_m7"\n  acl_m8="$acl_m8"\n  acl_m9="$acl_m9"\n  acl_m_foo="$acl_m_foo"\n  acl_m_bar="$acl_m_bar"\n  acl_c_foo="$acl_c_foo"\n  acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set)
+1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: failed to expand "  acl_c0="$acl_c0"\n  acl_c1="$acl_c1"\n  acl_c2="$acl_c2"\n  acl_c3="$acl_c3"\n  acl_c4="$acl_c4"\n  acl_c5="$acl_c5"\n  acl_c6="$acl_c6"\n  acl_c7="$acl_c7"\n  acl_c8="$acl_c8"\n  acl_c9="$acl_c9"\n  acl_m0="$acl_m0"\n  acl_m1="$acl_m1"\n  acl_m2="$acl_m2"\n  acl_m3="$acl_m3"\n  acl_m4="$acl_m4"\n  acl_m5="$acl_m5"\n  acl_m6="$acl_m6"\n  acl_m7="$acl_m7"\n  acl_m8="$acl_m8"\n  acl_m9="$acl_m9"\n  acl_m_foo="$acl_m_foo"\n  acl_m_bar="$acl_m_bar"\n  acl_c_foo="$acl_c_foo"\n  acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set)

diff --git a/test/stdout/0372 b/test/stdout/0372
index b4331b65c0a839e6952c3b100162665e142f370f..d5a6b438bb0d33f0e0ee84c85d6a39d85888155c 100644 (file)
--- a/test/stdout/0372
+++ b/test/stdout/0372
@@ -2,15 +2,15 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaY-0005vi-00\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaZ-0005vi-00\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaX-0005vi-00\r
 221 myhost.test.ex closing connection\r