From: Jeremy Harris Date: Sun, 1 Jul 2012 15:01:29 +0000 (+0100) Subject: Merge branch 'acl' X-Git-Tag: exim-4_81_RC1~50 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/3e8abda0fa92b78c4a3dfbad940b12fc90c241e3 Merge branch 'acl' --- 3e8abda0fa92b78c4a3dfbad940b12fc90c241e3 diff --cc doc/doc-txt/ChangeLog index d1beab6e0,9dbc65c09..a9c9abed8 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@@ -44,11 -44,9 +44,14 @@@ NM/01 Bugzilla 1197 - Spec typ JH/03 Add expansion operators ${listnamed:name} and ${listcount:string} +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 --cc doc/doc-txt/NewStuff index c56256bdd,df2ede807..53d533dea --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@@ -87,15 -87,15 +87,24 @@@ Version 4.8 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. The "acl = name" condition on an ACL now supports optional arguments. + 9. New global option "gnutls_enable_pkcs11", defaults false. The GnuTLS + rewrite in 4.80 combines with GnuTLS 2.12.0 or later, to autoload PKCS11 + modules. For some situations this is desirable, but we expect admin in + those situations to know they want the feature. More commonly, it means + that GUI user modules get loaded and are broken by the setuid Exim being + unable to access files specified in environment variables and passed + 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 ------------