Source Format Enforcement (#532)

[thirdparty/squid.git] / src / acl / AclDenyInfoList.h

diff --git a/src/acl/AclDenyInfoList.h b/src/acl/AclDenyInfoList.h
index 3aa8bfc48dbaacc08946b3f5d3a37322adb7a3bf..003030df1738af8b307b138280635c301f21ca1d 100644 (file)
--- a/src/acl/AclDenyInfoList.h
+++ b/src/acl/AclDenyInfoList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -9,10 +9,11 @@
 #ifndef SQUID_ACLDENYINFOLIST_H_
 #define SQUID_ACLDENYINFOLIST_H_
 
-#include "acl/AclNameList.h"
+#include "acl/forward.h"
 #include "err_type.h"
 #include "errorpage.h"
 #include "mem/forward.h"
+#include "sbuf/forward.h"
 
 /// deny_info representation. Currently a POD.
 class AclDenyInfoList
@@ -20,13 +21,12 @@ class AclDenyInfoList
     MEMPROXY_CLASS(AclDenyInfoList);
 
 public:
-    AclDenyInfoList(const char *t) {
+    AclDenyInfoList(const char *t, const SBuf &aCfgLocation) {
         err_page_name = xstrdup(t);
-        err_page_id = errorReservePageId(t);
+        err_page_id = errorReservePageId(t, aCfgLocation);
     }
     ~AclDenyInfoList() {
         xfree(err_page_name);
-        delete acl_list;
         while (next) {
             auto *a = next;
             next = a->next;
@@ -36,7 +36,7 @@ public:
     }
     err_type err_page_id = ERR_NONE;
     char *err_page_name = nullptr;
-    AclNameList *acl_list = nullptr;
+    SBufList acl_list; ///< ACL names in configured order
     AclDenyInfoList *next = nullptr;
 };