summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-09 12:20:42 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-09 12:20:42 +0200
commit4254a170a397e0605a471d81a14d65e510e24811 (patch)
tree5a70f9d1340d96b62e60ae3d4e9b74511a0a52c6 /src/conf_mode
parentd7c1bab9b99689be5b99a5bdac3999229ea788ab (diff)
downloadvyos-1x-4254a170a397e0605a471d81a14d65e510e24811.tar.gz
vyos-1x-4254a170a397e0605a471d81a14d65e510e24811.zip
Revert "tunnel: T2028: prevent single 'remote' keyword"
This reverts commit 37973a13bbc168c09e5f4d1e606f91fd7ffbb41a.
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-tunnel.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py
index 38d490c3c..28b1cf60f 100755
--- a/src/conf_mode/interfaces-tunnel.py
+++ b/src/conf_mode/interfaces-tunnel.py
@@ -567,9 +567,9 @@ def verify(conf):
incompatible = []
if afi_local == IP6:
- incompatible.extend(['remote','ttl', 'tos', 'key',])
+ incompatible.extend(['ttl', 'tos', 'key',])
if afi_local == IP4:
- incompatible.extend(['remote','encaplimit', 'flowlabel', 'hoplimit', 'tclass'])
+ incompatible.extend(['encaplimit', 'flowlabel', 'hoplimit', 'tclass'])
for option in incompatible:
if option in options: