diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-10-05 19:17:51 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-10-05 19:17:51 +0200 |
commit | bda4784c4831980d06d6ded08268cd590a6bfa0e (patch) | |
tree | c8e12c3f73fbb9045a77c53771ac46cba3b2a576 /interface-definitions/dhcp-server.xml.in | |
parent | a093620f1525c46f5b63453ca703a9b027a01748 (diff) | |
download | vyos-1x-bda4784c4831980d06d6ded08268cd590a6bfa0e.tar.gz vyos-1x-bda4784c4831980d06d6ded08268cd590a6bfa0e.zip |
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.
Diffstat (limited to 'interface-definitions/dhcp-server.xml.in')
-rw-r--r-- | interface-definitions/dhcp-server.xml.in | 13 |
1 files changed, 6 insertions, 7 deletions
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> |