ph10 2007/07/05 11:26:52 BST
Modified files:
exim-test/log 0372
exim-test/scripts/0000-Basic 0372
exim-test/stderr 0372
exim-test/stdout 0372
Log:
Yet another (hope the last for now) minor test tweak.
Revision Changes Path
1.3 +6 -5 exim/exim-test/log/0372
1.3 +1 -1 exim/exim-test/scripts/0000-Basic/0372
1.4 +3 -3 exim/exim-test/stderr/0372
1.3 +3 -3 exim/exim-test/stdout/0372
Index: 0372
===================================================================
RCS file: /home/cvs/exim/exim-test/log/0372,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0372 19 Sep 2006 11:28:45 -0000 1.2
+++ 0372 5 Jul 2007 10:26:52 -0000 1.3
@@ -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)
Index: 0372
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0372,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0372 19 Sep 2006 11:28:45 -0000 1.2
+++ 0372 5 Jul 2007 10:26:52 -0000 1.3
@@ -10,7 +10,7 @@
.
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
Index: 0372
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0372,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0372 19 Sep 2006 14:31:07 -0000 1.3
+++ 0372 5 Jul 2007 10:26:52 -0000 1.4
@@ -2,7 +2,7 @@
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 @@
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: 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)
Index: 0372
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0372,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0372 19 Sep 2006 11:28:45 -0000 1.2
+++ 0372 5 Jul 2007 10:26:52 -0000 1.3
@@ -2,15 +2,15 @@
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaY-0005vi-00
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
