From a25d59392260f04322215c307de1a236aa5f6e79 Mon Sep 17 00:00:00 2001 From: Martin von Gagern Date: Tue, 10 Sep 2024 21:54:19 +0100 Subject: [PATCH] core: fix dhcp leases in l3cd cloning. 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: 55b722820dc2 ('l3cfg: fix nm_l3_config_data_new_clone() to make exact copy') --- src/core/nm-l3-config-data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c index 1985e609f..b82b2864b 100644 --- a/src/core/nm-l3-config-data.c +++ b/src/core/nm-l3-config-data.c @@ -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;