From a07b4d26d51d97e9032c91225f65beb582e21c6b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 20 Dec 2022 12:34:07 +0100
Subject: [PATCH] dns/bind: fix menu depth (only 3 levels) and ACL

---
 .../src/opnsense/mvc/app/models/OPNsense/Bind/ACL/ACL.xml | 1 +
 .../opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml   | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/ACL/ACL.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/ACL/ACL.xml
index 83205c526..76c52ef6c 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/ACL/ACL.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/ACL/ACL.xml
@@ -4,6 +4,7 @@
       <patterns>
          <pattern>ui/bind/*</pattern>
          <pattern>api/bind/*</pattern>
+         <pattern>api/diagnostics/log/named/*</pattern>
       </patterns>
    </page-services-bind>
 </acl>
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
index 5ff8fe460..06ed53ca8 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
@@ -1,12 +1,8 @@
 <menu>
   <Services>
     <BIND cssClass="fa fa-tags">
-      <Configuration url="/ui/bind/general/index" order="10"/>
-      <Logs VisibleName="Log Files" order="60" url="/ui/bind/logs">
-        <GeneralLog VisibleName="General" order="10" url="/ui/bind/logs"/>
-        <QueryLog VisibleName="Query" order="20" url="/ui/bind/log/core/query/"/>
-        <BlockedLog VisibleName="Blocked" order="30" url="/ui/bind/log/core/blocked/"/>
-      </Logs>
+      <Configuration url="/ui/bind/general/index"/>
+      <LogFiles VisibleName="Log Files" url="/ui/bind/logs"/>
     </BIND>
   </Services>
 </menu>