fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-28 04:00:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fix dhcp leases in l3cd cloning.

Browse source 
This will copy DHCP lease from src (not self), fixing an assertion in
nm_l3_config_data_new_clone.

Resolves: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1620
Fixes: 55b722820d ('l3cfg: fix nm_l3_config_data_new_clone() to make exact copy')
(cherry picked from commit a25d593922)
(cherry picked from commit 61e781c4f5)
(cherry picked from commit fdc909741d)
This commit is contained in:
Martin von Gagern 2024-09-10 21:54:19 +01:00 • committed by Íñigo Huguet
parent 14d6b7be3e
commit a009cabcb4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/nm-l3-config-data.c
View file

@ -3470,8 +3470,8 @@ nm_l3_config_data_merge(NML3ConfigData *self,
g_steal_pointer(&self->dhcp_lease_x[1]);
self->source = src->source;
self->dhcp_lease_x[0] = nm_dhcp_lease_ref(self->dhcp_lease_x[0]);
self->dhcp_lease_x[1] = nm_dhcp_lease_ref(self->dhcp_lease_x[1]);
self->dhcp_lease_x[0] = nm_dhcp_lease_ref(src->dhcp_lease_x[0]);
self->dhcp_lease_x[1] = nm_dhcp_lease_ref(src->dhcp_lease_x[1]);
}
if (!src->allow_routes_without_address_4)
self->allow_routes_without_address_4 = FALSE;