summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-11-14 20:31:00 +0100
committerChristian Poessinger <christian@poessinger.com>2021-11-14 20:32:28 +0100
commitaf1cfebaff5e98cf0e50325863def209f965abd4 (patch)
tree6578d04e8c24a3e92794bce310411932faa50a2f
parentac682795b7d69f11076ddf022c3452e411a0fdc5 (diff)
downloadvyos-1x-af1cfebaff5e98cf0e50325863def209f965abd4.tar.gz
vyos-1x-af1cfebaff5e98cf0e50325863def209f965abd4.zip
dhcp-server: T3982: dot (.) is an allowed static-mapping character
This reverts a part of commit ac682795b7d69f11076ddf022c3452e411a0fdc5. (cherry picked from commit 1353757247c027f6352000a9450b502c25c460c8)
-rw-r--r--interface-definitions/dhcp-server.xml.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 45a629181..d1ed579e9 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -254,9 +254,9 @@
<properties>
<help>DHCP lease range</help>
<constraint>
- <regex>[-_a-zA-Z0-9.]+</regex>
+ <regex>^[-_a-zA-Z0-9.]+$</regex>
</constraint>
- <constraintErrorMessage>Invalid DHCP lease range name. May only contain letters, numbers and .-_</constraintErrorMessage>
+ <constraintErrorMessage>Invalid range name, may only be alphanumeric, dot and hyphen</constraintErrorMessage>
</properties>
<children>
<leafNode name="start">
@@ -289,9 +289,9 @@
<properties>
<help>Name of static mapping</help>
<constraint>
- <regex>^[-_a-zA-Z0-9]+$</regex>
+ <regex>^[-_a-zA-Z0-9.]+$</regex>
</constraint>
- <constraintErrorMessage>Invalid static mapping name. May only contain letters, numbers and a hyphen (-)!</constraintErrorMessage>
+ <constraintErrorMessage>Invalid static mapping name, may only be alphanumeric, dot and hyphen</constraintErrorMessage>
</properties>
<children>
#include <include/generic-disable-node.xml.i>