From 8e4e129e2ea99f1380a83f76a8d7a4fc3a1c035b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 3 Apr 2017 07:31:21 +0200
Subject: [PATCH] dynamic dns: pluggable ACLs, consolidation...

* RFC2136 missed the edit page completely
* DynDNS ACLs merged, we do it by feature
---
 plist                                          |  2 ++
 .../mvc/app/models/OPNsense/Core/ACL/ACL.xml   | 18 ------------------
 .../app/models/OPNsense/DynamicDNS/ACL/ACL.xml |  9 +++++++++
 .../app/models/OPNsense/RFC2136/ACL/ACL.xml    |  9 +++++++++
 4 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 src/opnsense/mvc/app/models/OPNsense/DynamicDNS/ACL/ACL.xml
 create mode 100644 src/opnsense/mvc/app/models/OPNsense/RFC2136/ACL/ACL.xml

diff --git a/plist b/plist
index 885771468..b045d9b25 100644
--- a/plist
+++ b/plist
@@ -445,6 +445,7 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/DynamicDNS/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/DynamicDNS/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/IDS/IDS.php
@@ -458,6 +459,7 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/Migrations/M1_0_0.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/RFC2136/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/RFC2136/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
index 3d9c4ef0a..c14574aad 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
@@ -551,24 +551,6 @@
             <pattern>services_unbound_host_edit.php*</pattern>
         </patterns>
     </page-services-dnsresolver-edithost>
-    <page-services-dynamicdnsclient>
-        <name>Services: Dynamic DNS client</name>
-        <patterns>
-            <pattern>services_dyndns_edit.php*</pattern>
-        </patterns>
-    </page-services-dynamicdnsclient>
-    <page-services-dynamicdnsclients>
-        <name>Services: Dynamic DNS clients</name>
-        <patterns>
-            <pattern>services_dyndns.php*</pattern>
-        </patterns>
-    </page-services-dynamicdnsclients>
-    <page-services-rfc2136clients>
-        <name>Services: RFC 2136 clients</name>
-        <patterns>
-            <pattern>services_rfc2136.php*</pattern>
-        </patterns>
-    </page-services-rfc2136clients>
     <page-services-router-advertisements>
         <name>Services: Router advertisements</name>
         <patterns>
diff --git a/src/opnsense/mvc/app/models/OPNsense/DynamicDNS/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/DynamicDNS/ACL/ACL.xml
new file mode 100644
index 000000000..108e7e653
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/DynamicDNS/ACL/ACL.xml
@@ -0,0 +1,9 @@
+<acl>
+    <page-services-dynamicdnsclients>
+        <name>Services: Dynamic DNS clients</name>
+        <patterns>
+            <pattern>services_dyndns.php*</pattern>
+            <pattern>services_dyndns_edit.php*</pattern>
+        </patterns>
+    </page-services-dynamicdnsclients>
+</acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/RFC2136/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/RFC2136/ACL/ACL.xml
new file mode 100644
index 000000000..ce0a0ba79
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/RFC2136/ACL/ACL.xml
@@ -0,0 +1,9 @@
+<acl>
+    <page-services-rfc2136clients>
+        <name>Services: RFC 2136 clients</name>
+        <patterns>
+            <pattern>services_rfc2136.php*</pattern>
+            <pattern>services_rfc2136_edit.php*</pattern>
+        </patterns>
+    </page-services-rfc2136clients>
+</acl>