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/include/ipsec | |
| 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/include/ipsec')
| -rw-r--r-- | interface-definitions/include/ipsec/local-address.xml.i | 3 | ||||
| -rw-r--r-- | interface-definitions/include/ipsec/remote-address.xml.i | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/interface-definitions/include/ipsec/local-address.xml.i b/interface-definitions/include/ipsec/local-address.xml.i index 9d267f3f7..71f514950 100644 --- a/interface-definitions/include/ipsec/local-address.xml.i +++ b/interface-definitions/include/ipsec/local-address.xml.i @@ -19,8 +19,7 @@ <description>Allow any IPv4 address present on the system to be used for VPN</description> </valueHelp> <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> + <validator name="ip-address"/> <regex>(any)</regex> </constraint> </properties> diff --git a/interface-definitions/include/ipsec/remote-address.xml.i b/interface-definitions/include/ipsec/remote-address.xml.i index ba96290d0..91decba3c 100644 --- a/interface-definitions/include/ipsec/remote-address.xml.i +++ b/interface-definitions/include/ipsec/remote-address.xml.i @@ -19,8 +19,7 @@ <description>Allow any IP address of the remote peer</description> </valueHelp> <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> + <validator name="ip-address"/> <validator name="fqdn"/> <regex>(any)</regex> </constraint> |