From 525239c16e35d7bf893e0e2232f4c4c4a7c75447 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 12 Jun 2012 22:50:52 +0100 Subject: Use custom variables for ACL args, up to nine. Add an arg-count variable. --- doc/doc-docbook/spec.xfpt | 12 +++++++----- doc/doc-txt/ChangeLog | 2 +- doc/doc-txt/NewStuff | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index cde80a17c..29aacf61c 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -8759,13 +8759,15 @@ This item inserts &"basic"& header lines. It is described with the &%header%& expansion item below. -.vitem "&*${acl{*&<&'name'&>&*}{*&<&'string'&>&*}}*&" +.vitem "&*${acl{*&<&'name'&>&*}{*&<&'arg'&>&*}...}*&" .cindex "expansion" "calling an acl" .cindex "&%acl%&" "call from expansion" -The name and <&'string'&> are first expanded separately. The expanded -<&'string'&> is assigned to the &$address_data$& variable. If {<&'string'&>} -is omitted, &$address_data$& is made empty. The named ACL (see chapter -&<>&) is called and may use &$address_data$&. If the ACL sets +The name and zero to nine argument strings are first expanded separately. The expanded +arguments are assigned to the variables &$acl_arg1$& to &$acl_arg9$& in order. +Any used are made empty. The variable &$acl_narg$& is set to the number of +arguments. The named ACL (see chapter &<>&) is called +and may use the variables; if another acl expansion is used the values +are overwritten. If the ACL sets a value using a "message =" modifier and returns accept, the value becomes the result of the expansion. If no message was set but the ACL returned accept, or if the ACL returned defer, diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 4a2215956..504c3f551 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -44,7 +44,7 @@ NM/01 Bugzilla 1197 - Spec typo JH/03 Add expansion operators ${listnamed:name} and ${listcount:string} -JH/04 Add expansion item ${acl {name}{argument}} +JH/04 Add expansion item ${acl {name}{arg}...} Exim version 4.80 ----------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index b13a5a0f2..3c5c4913b 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -87,9 +87,10 @@ Version 4.81 8. New expansion operators ${listnamed:name} to get the content of a named list and ${listcount:string} to count the items in a list. - 9. New expansion item ${acl {name}{argument}} to call an ACL. The argument can - be accessed by the ACL in $address_data. The expansion result is set by - a "message =" modifier and an "accept" return from the ACL. + 9. New expansion item ${acl {name}{arg}...} to call an ACL. The argument can + be accessed by the ACL in $acl_arg1 to $acl_arg9. $acl_narg will be the + number of arguments. The expansion result is set by a "message =" modifier + and an "accept" return from the ACL. Version 4.80 ------------ -- cgit v1.2.3