Merge from trunk

diff --cc src/AccessLogEntry.h
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/acl/Acl.cc
Simple merge

diff --cc src/acl/Acl.h
Simple merge

diff --cc src/acl/Checklist.h
index fd1413f521afa82b8d094fd6b5e3222df205cfab,4ccbb4f0c780e9215c0625f9188e326c215be888..025e3a5e6ef9720e79d8233ca023dabfd85af151
--- 1/src/acl/Checklist.h
--- 2/src/acl/Checklist.h
+++ b/src/acl/Checklist.h
@@@ -157,8 -163,18 +163,19 @@@ public
      // for ACL::checklistMatches to use
      virtual bool hasRequest() const = 0;
      virtual bool hasReply() const = 0;
 +    virtual bool hasAleXXX() const = 0;
  
+     /// change the current ACL list
+     /// \return a pointer to the old list value (may be nullptr)
+     const Acl::Tree *changeAcl(const Acl::Tree *t) {
+         const Acl::Tree *old = accessList;
+         if (t != accessList) {
+             cbdataReferenceDone(accessList);
+             accessList = cbdataReference(t);
+         }
+         return old;
+     }
+ 
  private:
      /// Calls non-blocking check callback with the answer and destroys self.
      void checkCallback(allow_t answer);

diff --cc src/acl/FilledChecklist.h
index 67a566f80aa2a9f4bf53d90a2f0426dc736b8aa5,8a3bbaf450fb7b2ea527a9764223ca947cdf2886..211fc5adbac6154167bd99fcb49ae781c167fdd9
--- 1/src/acl/FilledChecklist.h
--- 2/src/acl/FilledChecklist.h
+++ b/src/acl/FilledChecklist.h
@@@ -86,10 -85,10 +86,10 @@@ public
      /// SSL [certificate validation] errors, in undefined order
      Ssl::CertErrors *sslErrors;
      /// The peer certificate
-     Ssl::X509_Pointer serverCert;
+     Security::CertPointer serverCert;
  #endif
  
 -    AccessLogEntry::Pointer al; ///< info for the future access.log entry
 +    AccessLogEntry::Pointer al; ///< info for the future access.log, and external ACL
  
      ExternalACLEntryPointer extacl_entry;
  

diff --cc src/cf.data.pre
Simple merge