From bda4784c4831980d06d6ded08268cd590a6bfa0e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 5 Oct 2020 19:17:51 +0200
Subject: dhcp(v6)-server: T2961: use fqdn validator wnd move to include
 snipped

Migrate the domain-search node (which occurs three times) to an includable
snippet. Also re-use the fqdn validator to keep the regex patterns to as few
locations as possible.
---
 interface-definitions/dhcp-server.xml.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'interface-definitions/dhcp-server.xml.in')

diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index e8bdff3df..ca8abc036 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -140,15 +140,14 @@
                   </leafNode>
                   <leafNode name="domain-name">
                     <properties>
-                      <help>Client domain name</help>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="domain-search">
-                    <properties>
-                      <help>Client domain search</help>
-                      <multi/>
+                      <help>Client Domain Name</help>
+                      <constraint>
+                        <validator name="fqdn"/>
+                      </constraint>
+                      <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
                     </properties>
                   </leafNode>
+                  #include <include/dhcp-server-domain-search.xml.i>
                   <leafNode name="exclude">
                     <properties>
                       <help>IP address to exclude from DHCP lease range</help>
-- 
cgit v1.2.3