summaryrefslogtreecommitdiff
path: root/interface-definitions/include
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-05 07:42:56 +0200
committerChristian Poessinger <christian@poessinger.com>2020-06-05 07:42:56 +0200
commitd692b330838f4ee87cda2a52dcb3f32129a293d8 (patch)
treee95a804b1a2f00baac2e8289c31f43e92bfda999 /interface-definitions/include
parente98dd388824f326e00ead34e6de466e67e08acd0 (diff)
downloadvyos-1x-d692b330838f4ee87cda2a52dcb3f32129a293d8.tar.gz
vyos-1x-d692b330838f4ee87cda2a52dcb3f32129a293d8.zip
T2548: interface address does not support IP network definition
When migrating all single instances of the IP address XML definition to the reusable include file an error was ported, too. This allowed an interface be assigned an IPv4/IPv6 network address es e.g. 192.0.2.0/24 which is invalid. The validator has been fixed to only allow IPv4/IPv6 host addresses instead.
Diffstat (limited to 'interface-definitions/include')
-rw-r--r--interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i2
-rw-r--r--interface-definitions/include/address-ipv4-ipv6.xml.i2
2 files changed, 2 insertions, 2 deletions
diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
index fb46f2c09..cca824d89 100644
--- a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
+++ b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
@@ -21,7 +21,7 @@
<description>Dynamic Host Configuration Protocol for IPv6</description>
</valueHelp>
<constraint>
- <validator name="ip-cidr"/>
+ <validator name="ip-host"/>
<regex>(dhcp|dhcpv6)</regex>
</constraint>
<multi/>
diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/address-ipv4-ipv6.xml.i
index aa84a5640..a891085bd 100644
--- a/interface-definitions/include/address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/address-ipv4-ipv6.xml.i
@@ -10,7 +10,7 @@
<description>IPv6 address and prefix length</description>
</valueHelp>
<constraint>
- <validator name="ip-cidr"/>
+ <validator name="ip-host"/>
</constraint>
<multi/>
</properties>