summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorhagbard <vyosdev@derith.de>2019-03-20 13:21:56 -0700
committerhagbard <vyosdev@derith.de>2019-03-20 13:21:56 -0700
commitdea25e199fc095aa64dc2f8b80aa152a2f4c6870 (patch)
tree9a04412113511267b50ff457be5a5a93f88208c6 /src/conf_mode
parent0a10a3bd9d346b1abdf88301d6904a5346ffe6d0 (diff)
downloadvyos-1x-dea25e199fc095aa64dc2f8b80aa152a2f4c6870.tar.gz
vyos-1x-dea25e199fc095aa64dc2f8b80aa152a2f4c6870.zip
[arp] bugfix for 'del prot static arp <ip> hwaddr'
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/arp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/arp.py b/src/conf_mode/arp.py
index 88c054010..aeca08432 100755
--- a/src/conf_mode/arp.py
+++ b/src/conf_mode/arp.py
@@ -65,7 +65,7 @@ def generate(c):
config_data['remove'].append(ip_addr)
else:
for ip_addr in c_eff_cnf:
- if not ip_addr in c:
+ if not ip_addr in c or c[ip_addr] == None:
config_data['remove'].append(ip_addr)
### add/update
@@ -74,7 +74,7 @@ def generate(c):
if not ip_addr in c_eff_cnf:
config_data['update'][ip_addr] = c[ip_addr]
if ip_addr in c_eff_cnf:
- if c[ip_addr] != c_eff_cnf[ip_addr]:
+ if c[ip_addr] != c_eff_cnf[ip_addr] and c[ip_addr] != None:
config_data['update'][ip_addr] = c[ip_addr]
return config_data