From 96d846d27ac818ee9a23bb7194bb58cfb7093387 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Tue, 16 May 2023 20:49:59 -0500
Subject: T5226: Combine ipv4-address and ipv6-address validators

Use a single ip-address validator to combine and replace ipv4-address
and ipv6-address validators.
---
 interface-definitions/dns-domain-name.xml.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'interface-definitions/dns-domain-name.xml.in')

diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in
index e93c49ebd..9eb1a208f 100644
--- a/interface-definitions/dns-domain-name.xml.in
+++ b/interface-definitions/dns-domain-name.xml.in
@@ -23,8 +23,7 @@
           </valueHelp>
           <multi/>
           <constraint>
-            <validator name="ipv4-address"/>
-            <validator name="ipv6-address"/>
+            <validator name="ip-address"/>
             #include <include/constraint/interface-name.xml.i>
           </constraint>
         </properties>
-- 
cgit v1.2.3


From 97f8933e7bf8bbc14f3176e0b86adb3e1d7cc424 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Tue, 16 May 2023 20:54:44 -0500
Subject: T5226: Make host-name constraints to consistent everywhere

Make host-name constraints consistent across all definitions
---
 interface-definitions/dns-domain-name.xml.in               | 4 ++--
 interface-definitions/include/interface/dhcp-options.xml.i | 4 ++++
 interface-definitions/vpn-l2tp.xml.in                      | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'interface-definitions/dns-domain-name.xml.in')

diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in
index 9eb1a208f..ef34ecbf5 100644
--- a/interface-definitions/dns-domain-name.xml.in
+++ b/interface-definitions/dns-domain-name.xml.in
@@ -73,9 +73,9 @@
             <properties>
               <help>Host name for static address mapping</help>
               <constraint>
-                <regex>[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]</regex>
+                #include <include/constraint/host-name.xml.i>
               </constraint>
-              <constraintErrorMessage>invalid hostname</constraintErrorMessage>
+              <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage>
             </properties>
             <children>
               <leafNode name="alias">
diff --git a/interface-definitions/include/interface/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i
index 2ed5fd403..8027769ff 100644
--- a/interface-definitions/include/interface/dhcp-options.xml.i
+++ b/interface-definitions/include/interface/dhcp-options.xml.i
@@ -12,6 +12,10 @@
     <leafNode name="host-name">
       <properties>
         <help>Override system host-name sent to DHCP server</help>
+        <constraint>
+          #include <include/constraint/host-name.xml.i>
+        </constraint>
+        <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage>
       </properties>
     </leafNode>
     <leafNode name="mtu">
diff --git a/interface-definitions/vpn-l2tp.xml.in b/interface-definitions/vpn-l2tp.xml.in
index ec186cd23..ee0edc3e3 100644
--- a/interface-definitions/vpn-l2tp.xml.in
+++ b/interface-definitions/vpn-l2tp.xml.in
@@ -38,8 +38,9 @@
                     <properties>
                       <help>Sent to the client (LAC) in the Host-Name attribute</help>
                       <constraint>
-                        <regex>[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]</regex>
+                        #include <include/constraint/host-name.xml.i>
                       </constraint>
+                      <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage>
                     </properties>
                   </leafNode>
                 </children>
-- 
cgit v1.2.3