From 37973a13bbc168c09e5f4d1e606f91fd7ffbb41a Mon Sep 17 00:00:00 2001 From: Thomas Mangin Date: Wed, 8 Apr 2020 22:44:02 +0100 Subject: 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. --- src/conf_mode/interfaces-tunnel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/conf_mode') 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: -- cgit v1.2.3