diff options
| author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-08 22:44:02 +0100 |
|---|---|---|
| committer | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-08 22:44:02 +0100 |
| commit | 37973a13bbc168c09e5f4d1e606f91fd7ffbb41a (patch) | |
| tree | d41fdf84966cde07127787f6f86fa81e58f38076 /src/conf_mode | |
| parent | 3d65f12e38f721ae37b65e058f0c59a24d6a6886 (diff) | |
| download | vyos-1x-37973a13bbc168c09e5f4d1e606f91fd7ffbb41a.tar.gz vyos-1x-37973a13bbc168c09e5f4d1e606f91fd7ffbb41a.zip | |
tunnel: T2028: prevent single 'remote' keyword
When the remote keywrod is ommited, the default value of ''
is still set, therefore the ip command will include it.
Remote is now removed if unset.
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/interfaces-tunnel.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py index 646e61c53..4a042f1b9 100755 --- a/src/conf_mode/interfaces-tunnel.py +++ b/src/conf_mode/interfaces-tunnel.py @@ -420,9 +420,9 @@ def verify(conf): incompatible = [] if afi_local == IP6: - incompatible.extend(['ttl', 'tos', 'key',]) + incompatible.extend(['remote','ttl', 'tos', 'key',]) if afi_local == IP4: - incompatible.extend(['encaplimit', 'flowlabel', 'hoplimit', 'tclass']) + incompatible.extend(['remote','encaplimit', 'flowlabel', 'hoplimit', 'tclass']) for option in incompatible: if option in options: |