diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2012-07-01 16:01:29 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2012-07-01 16:01:29 +0100 |
| commit | 3e8abda0fa92b78c4a3dfbad940b12fc90c241e3 (patch) | |
| tree | 856bfe57a0869370207b86139455ce3a8eb51303 /doc/doc-txt | |
| parent | ad0192a86e59a2c3cef2945d68dc22e52258d085 (diff) | |
| parent | bef3ea7f5de507f4eda7f32ac767ec6ac0441d57 (diff) | |
Merge branch 'acl'
Diffstat (limited to 'doc/doc-txt')
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/doc-txt/NewStuff | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index d1beab6e0..a9c9abed8 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -49,6 +49,9 @@ PP/09 Add gnutls_enable_pkcs11 option. PP/10 Let Linux makefile inherit CFLAGS/CFLAGS_DYNAMIC. Pulled from Debian 30_dontoverridecflags.dpatch by Andreas Metzler. +JH/04 Add expansion item ${acl {name}{arg}...}, expansion condition + "acl {{name}{arg}...}", and optional args on acl condition + "acl = name arg..." Exim version 4.80 ----------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index c56256bdd..53d533dea 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -96,6 +96,15 @@ Version 4.81 through, thus breakage. So we explicitly inhibit the PKCS11 initialisation unless this new option is set. +10. The "acl = name" condition on an ACL now supports optional arguments. + New expansion item "${acl {name}{arg}...}" and expansion condition + "acl {{name}{arg}...}" are added. In all cases up to nine arguments + can be used, appearing in $acl_arg1 to $acl_arg9 for the called ACL. + Variable $acl_narg contains the number of arguments. If the ACL sets + a "message =" value this becomes the result of the expansion item, + or the value of $value for the expansion condition. If the ACL returns + accept the expansion condition is true; if reject, false. A defer + return results in a forced fail. Version 4.80 ------------ |