From ff83e858d9269db01b70c863dff1dc699d03c184 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Thu, 12 Nov 2020 23:08:42 +0100
Subject: [PATCH] dns/bind: relax ACL name mask

---
 dns/bind/pkg-descr                                         | 1 +
 dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr
index 545d1b6b6..4c59d1e86 100644
--- a/dns/bind/pkg-descr
+++ b/dns/bind/pkg-descr
@@ -13,6 +13,7 @@ Plugin Changelog
 * Reject built-in ACL names
 * Fix truncated checkboxes
 * Add button to delete selected items
+* Relax ACL name mask (allow underscores and hyphens)
 
 1.13
 
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
index 51eb97422..6abff3a73 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
@@ -12,8 +12,8 @@
                 <name type="TextField">
                     <default></default>
                     <Required>Y</Required>
-                    <mask>/^(?!any$|localhost$|localnets$|none$)[0-9a-zA-Z]{1,32}$/u</mask>
-                    <ValidationMessage>Should be a string between 1 and 32 characters. Allowed characters are 0-9a-zA-Z. Built-in ACL names must not be used: any, localhost, localnets, none.</ValidationMessage>
+                    <mask>/^(?!any$|localhost$|localnets$|none$)[0-9a-zA-Z_\-]{1,32}$/u</mask>
+                    <ValidationMessage>Should be a string between 1 and 32 characters. Allowed characters are 0-9a-zA-Z_-. Built-in ACL names must not be used: any, localhost, localnets, none.</ValidationMessage>
                 </name>
                 <networks type="NetworkField">
                     <default></default>