summaryrefslogtreecommitdiff
path: root/doc/doc-txt
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2012-06-12 22:50:52 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2012-06-12 22:50:52 +0100
commit525239c16e35d7bf893e0e2232f4c4c4a7c75447 (patch)
treee61d7715ff4f7e35bdb4eb04659d0a99809edc4d /doc/doc-txt
parent723c72e64c04d3b7bdf03b26c65761c1ae569312 (diff)
Use custom variables for ACL args, up to nine. Add an arg-count variable.
Diffstat (limited to 'doc/doc-txt')
-rw-r--r--doc/doc-txt/ChangeLog2
-rw-r--r--doc/doc-txt/NewStuff7
2 files changed, 5 insertions, 4 deletions
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
------------