diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-05-17 15:46:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 15:46:13 +0200 |
| commit | 0c91c356183bb33dea0b24c9ccd77b55c15e7ea0 (patch) | |
| tree | 29c396833fb8f4a955651b61dce2ff09d13a5566 /interface-definitions/dns-domain-name.xml.in | |
| parent | d9c495144d1bcd22e5450fdaa268f34e0c70e636 (diff) | |
| parent | b6e780e05893c92e6bc36bdc452c31cf94673719 (diff) | |
| download | vyos-1x-0c91c356183bb33dea0b24c9ccd77b55c15e7ea0.tar.gz vyos-1x-0c91c356183bb33dea0b24c9ccd77b55c15e7ea0.zip | |
Merge pull request #2008 from indrajitr/misc-conf-mode-fixes
T5226: Standardize hostname and IP address validators and constraints
Diffstat (limited to 'interface-definitions/dns-domain-name.xml.in')
| -rw-r--r-- | interface-definitions/dns-domain-name.xml.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index e93c49ebd..ef34ecbf5 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> @@ -74,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"> |