]> git.proxmox.com Git - pve-manager.git/commitdiff
fix #2267: delete address(6) and netmas(6) with cidr(6)
authorDominik Csapak <d.csapak@proxmox.com>
Mon, 8 Jul 2019 14:29:18 +0000 (16:29 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Mon, 8 Jul 2019 17:19:15 +0000 (19:19 +0200)
otherwise a user cannot delete an ip from an interface

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
PVE/API2/Network.pm

index 00337fe2b9e6015049b65392b74691957039b6cd..5e2abda134540478bcbbeef82d0a73b090866be8 100644 (file)
@@ -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);