diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/aux-var-src/0372.F | 4 | ||||
| -rw-r--r-- | test/confs/0372 | 13 | ||||
| -rw-r--r-- | test/log/0372 | 1 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0372 | 8 | ||||
| -rw-r--r-- | test/stderr/0372 | 18 | ||||
| -rw-r--r-- | test/stdout/0372 | 6 |
6 files changed, 46 insertions, 4 deletions
diff --git a/test/aux-var-src/0372.F b/test/aux-var-src/0372.F index a5c6f6780..c24183786 100644 --- a/test/aux-var-src/0372.F +++ b/test/aux-var-src/0372.F @@ -9,7 +9,9 @@ logwrite " acl_c0=\"$acl_c0\"\n acl_c1=\"$acl_c1\"\n acl_c2=\"$acl_c2\"\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\"" + acl_m8=\"$acl_m8\"\n acl_m9=\"$acl_m9\"\n \ + acl_mfoo=\"$acl_mfoo\"\n acl_mbar=\"$acl_mbar\"\n \ + acl_c_foo=\"$acl_c_foo\"\n acl_c_bar=\"$acl_c_bar\"\n" logwrite "-------------------------" # End diff --git a/test/confs/0372 b/test/confs/0372 index 34fc1aa24..682eb91a8 100644 --- a/test/confs/0372 +++ b/test/confs/0372 @@ -1,5 +1,7 @@ # Exim test configuration 0372 +STRICT= + exim_path = EXIM_PATH host_lookup_order = bydns primary_hostname = myhost.test.ex @@ -17,7 +19,7 @@ acl_smtp_connect = a2 system_filter = DIR/aux-var/TESTNUM.F trusted_users = CALLER - +STRICT # ----- ACL ----- @@ -28,6 +30,8 @@ a1: set acl_m0 = value for m0 is local_part: $local_part set acl_m5 = value for m5 contains newline\nthere! set acl_m9 = value for m9 is domain: $domain + set acl_mfoo = value for mfoo is local_part: $local_part + set acl_mbar = value for mbar is domain: $domain accept local_parts = a set acl_m0 = value for m0 is local_part: $local_part @@ -37,6 +41,8 @@ a2: accept set acl_c0 = value for c0 is ip: $sender_host_address set acl_c5 = c5 has a newline\nthere! set acl_c9 = value for c9 is name: $sender_host_name + set acl_c_foo = value for c_foo is ip: $sender_host_address + set acl_c_bar = value for c_bar is name: $sender_host_name # ----- Routers ----- @@ -51,7 +57,9 @@ r1: acl_c9="$acl_c9"\nacl_m0="$acl_m0"\nacl_m1="$acl_m1"\n\ acl_m2="$acl_m2"\nacl_m3="$acl_m3"\nacl_m4="$acl_m4"\n\ acl_m5="$acl_m5"\nacl_m6="$acl_m6"\nacl_m7="$acl_m7"\n\ - acl_m8="$acl_m8"\nacl_m9="$acl_m9" + acl_m8="$acl_m8"\nacl_m9="$acl_m9"\n\ + acl_mfoo="$acl_mfoo"\nacl_mbar="$acl_mbar"\n\ + acl_c_foo="$acl_c_foo"\nacl_c_bar="$acl_c_bar" transport = t1 @@ -64,5 +72,4 @@ t1: file = /dev/null user = CALLER - # End diff --git a/test/log/0372 b/test/log/0372 index d4be63b9c..e3c6b8a5c 100644 --- a/test/log/0372 +++ b/test/log/0372 @@ -4,3 +4,4 @@ 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 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=host2.name [4.3.2.1] U=CALLER P=smtp S=sss diff --git a/test/scripts/0000-Basic/0372 b/test/scripts/0000-Basic/0372 index 4e670167e..f64899e31 100644 --- a/test/scripts/0000-Basic/0372 +++ b/test/scripts/0000-Basic/0372 @@ -10,3 +10,11 @@ data . quit **** +exim -DSTRICT=strict_acl_vars -bs -oMa 4.3.2.1 -oMs host2.name +mail from:<> +rcpt to:<a@b> +data +. +quit +**** +no_msglog_check diff --git a/test/stderr/0372 b/test/stderr/0372 index 86eee6d68..b0c01f4a4 100644 --- a/test/stderr/0372 +++ b/test/stderr/0372 @@ -26,6 +26,10 @@ there!" acl_m7="" acl_m8="" acl_m9="value for m9 is domain: y" + acl_mfoo="value for mfoo is local_part: x" + acl_mbar="value for mbar is domain: y" + acl_c_foo="value for c_foo is ip: 1.2.3.4" + acl_c_bar="value for c_bar is name: host.name" ------------------------- acl_c0="value for c0 is ip: 1.2.3.4" acl_c1="" @@ -49,6 +53,10 @@ acl_m6="" acl_m7="" acl_m8="" acl_m9="value for m9 is domain: y" +acl_mfoo="value for mfoo is local_part: x" +acl_mbar="value for mbar is domain: y" +acl_c_foo="value for c_foo is ip: 1.2.3.4" +acl_c_bar="value for c_bar is name: host.name" LOG: MAIN => x <x@y> R=r1 T=t1 LOG: MAIN @@ -78,6 +86,10 @@ there!" acl_m7="" acl_m8="" acl_m9="value for m9 is domain: b" + acl_mfoo="" + acl_mbar="" + acl_c_foo="value for c_foo is ip: 1.2.3.4" + acl_c_bar="value for c_bar is name: host.name" ------------------------- acl_c0="value for c0 is ip: 1.2.3.4" acl_c1="" @@ -100,9 +112,15 @@ acl_m6="" acl_m7="" acl_m8="" acl_m9="value for m9 is domain: b" +acl_mfoo="" +acl_mbar="" +acl_c_foo="value for c_foo is ip: 1.2.3.4" +acl_c_bar="value for c_bar is name: host.name" LOG: MAIN => a <a@b> R=r1 T=t1 LOG: MAIN Completed 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_mfoo="$acl_mfoo"\n acl_mbar="$acl_mbar"\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 4d1ea2bd8..b4331b65c 100644 --- a/test/stdout/0372 +++ b/test/stdout/0372 @@ -8,3 +8,9 @@ 354 Enter message, ending with "." on a line by itself
250 OK id=10HmaY-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
+221 myhost.test.ex closing connection
|