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

merge: branch 'dhcp_lease'

Browse source 
Copy DHCP lease from src, fixing nm_l3_config_data_new_clone assertion

Closes #1620

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2035
This commit is contained in:
Beniamino Galvani 2024-09-12 08:48:15 +00:00
commit 65c4f5e0de
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

@ -3480,8 +3480,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;