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 ++++++-------
 interface-definitions/dhcpv6-server.xml.in         | 22 ++--------------------
 .../include/dhcp-server-domain-search.xml.i        | 12 ++++++++++++
 3 files changed, 20 insertions(+), 27 deletions(-)
 create mode 100644 interface-definitions/include/dhcp-server-domain-search.xml.i

(limited to 'interface-definitions')

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>
diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in
index acc33d40f..0b4bcf9ea 100644
--- a/interface-definitions/dhcpv6-server.xml.in
+++ b/interface-definitions/dhcpv6-server.xml.in
@@ -60,16 +60,7 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="domain-search">
-                    <properties>
-                      <help>Domain name for client to search</help>
-                      <constraint>
-                        <regex>[-_a-zA-Z0-9.]+</regex>
-                      </constraint>
-                      <constraintErrorMessage>Invalid domain name. May only contain letters, numbers and .-_</constraintErrorMessage>
-                      <multi/>
-                    </properties>
-                  </leafNode>
+                  #include <include/dhcp-server-domain-search.xml.i>
                   <leafNode name="name-server">
                     <properties>
                       <help>IPv6 address of a Recursive DNS Server</help>
@@ -150,16 +141,7 @@
                       </tagNode>
                     </children>
                   </node>
-                  <leafNode name="domain-search">
-                    <properties>
-                      <help>Domain name for client to search</help>
-                      <constraint>
-                        <regex>[-_a-zA-Z0-9.]+</regex>
-                      </constraint>
-                      <constraintErrorMessage>Invalid domain name. May only contain letters, numbers and .-_</constraintErrorMessage>
-                      <multi/>
-                    </properties>
-                  </leafNode>
+                  #include <include/dhcp-server-domain-search.xml.i>
                   <node name="lease-time">
                     <properties>
                       <help>Parameters relating to the lease time</help>
diff --git a/interface-definitions/include/dhcp-server-domain-search.xml.i b/interface-definitions/include/dhcp-server-domain-search.xml.i
new file mode 100644
index 000000000..8b76c4e70
--- /dev/null
+++ b/interface-definitions/include/dhcp-server-domain-search.xml.i
@@ -0,0 +1,12 @@
+<!-- included start from dhcp-server-domain-search.xml.i -->
+<leafNode name="domain-search">
+  <properties>
+    <help>Client Domain Name search list</help>
+    <constraint>
+      <validator name="fqdn"/>
+    </constraint>
+    <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- included end -->
-- 
cgit v1.2.3