String handling: refactor the expanding-string routines and users to use a descriptor...

[users/jgh/exim.git] / test / stderr / 0372

diff --git a/test/stderr/0372 b/test/stderr/0372
index 86eee6d6893885f1ba19745bb09edb3e936f8ce1..096049ec80fe4c4fbf774eaa8b10274af242adcb 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
   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=""
 ----- System filter -----
   acl_c0="value for c0 is ip: 1.2.3.4"
   acl_c1=""


@@ -26,6 +26,10 @@ there!"
   acl_m7=""
   acl_m8=""
   acl_m9="value for m9 is domain: y"
   acl_m7=""
   acl_m8=""
   acl_m9="value for m9 is domain: y"

+  acl_m_foo="value for mfoo is local_part: x"
+  acl_m_bar="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=""
 -------------------------
 acl_c0="value for c0 is ip: 1.2.3.4"
 acl_c1=""


@@ -49,13 +53,17 @@ acl_m6=""
 acl_m7=""
 acl_m8=""
 acl_m9="value for m9 is domain: y"
 acl_m7=""
 acl_m8=""
 acl_m9="value for m9 is domain: y"

+acl_m_foo="value for mfoo is local_part: x"
+acl_m_bar="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
   Completed
 LOG: MAIN
   <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
 LOG: MAIN
   => x <x@y> R=r1 T=t1
 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=""
 ----- System filter -----
   acl_c0="value for c0 is ip: 1.2.3.4"
   acl_c1=""


@@ -78,6 +86,10 @@ there!"
   acl_m7=""
   acl_m8=""
   acl_m9="value for m9 is domain: b"
   acl_m7=""
   acl_m8=""
   acl_m9="value for m9 is domain: b"

+  acl_m_foo=""
+  acl_m_bar=""
+  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=""
 -------------------------
 acl_c0="value for c0 is ip: 1.2.3.4"
 acl_c1=""


@@ -100,9 +112,17 @@ acl_m6=""
 acl_m7=""
 acl_m8=""
 acl_m9="value for m9 is domain: b"
 acl_m7=""
 acl_m8=""
 acl_m9="value for m9 is domain: b"

+acl_m_foo=""
+acl_m_bar=""
+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
 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 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)
+
+******** SERVER ********