Merge branch 'acl'

diff --cc doc/doc-docbook/spec.xfpt
Simple merge

diff --cc doc/doc-txt/ChangeLog
index d1beab6e025f57558bbf36093b8ef1e9b0c64275,9dbc65c09375bbaa46acdbb7b47f5d74710641ce..a9c9abed8c4c66873267ede00eb0751cb27414b1
--- 1/doc/doc-txt/ChangeLog
--- 2/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 c56256bdd86e69ed922349295ef133219a2673bf,df2ede807eed72c88291d99a9f62f7d4177b0e5c..53d533dea2e658e6233616ecf8347babec05ca77
--- 1/doc/doc-txt/NewStuff
--- 2/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
  ------------

diff --cc src/src/globals.c
Simple merge

diff --cc src/src/globals.h
Simple merge