From ec4cd7ce25d34c8a85f6d88e34fcb11c708bea59 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com>
Date: Mon, 8 Jul 2019 16:29:18 +0200
Subject: [PATCH] fix #2267: delete address(6) and netmas(6) with cidr(6)

otherwise a user cannot delete an ip from an interface

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
(cherry picked from commit b350268a1b59ed6513d5ad7b05bee3f55ca5afab)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/API2/Network.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm
index 7919756c..df9c91b3 100644
--- a/PVE/API2/Network.pm
+++ b/PVE/API2/Network.pm
@@ -435,6 +435,13 @@ __PACKAGE__->register_method({
 		delete $ifaces->{$iface}->{$k};
 		@$families = grep(!/^inet$/, @$families) if $k eq 'address';
 		@$families = grep(!/^inet6$/, @$families) if $k eq 'address6';
+		if ($k eq 'cidr') {
+		    delete $ifaces->{$iface}->{netmask};
+		    delete $ifaces->{$iface}->{address};
+		} elsif ($k eq 'cidr6') {
+		    delete $ifaces->{$iface}->{netmask6};
+		    delete $ifaces->{$iface}->{address6};
+		}
 	    }
 
 	    $map_cidr_to_address_netmask->($param);