From 4e986fcbe31a300f0ea9c9ea3a6be1e57bc59702 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 22 Jul 2025 10:09:50 +0200 Subject: [PATCH] dhcp6: fix accessor macro for t2 sd_dhcp6_lease_get_t2() was returning t1, and so sometimes the client was going directly to the rebind state skipping the lease renewal. See the systemd PR: https://github.com/systemd/systemd/pull/38275 Fixes: a14a033efbaa ('systemd: update code from upstream (2024-02-12)') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2246 (cherry picked from commit 4938507de8f0ecfc532e6c4d6e37b52e17ee0f65) --- src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c index 9569af58a8..ecbc763338 100644 --- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c +++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c @@ -114,7 +114,7 @@ static void dhcp6_lease_set_lifetime(sd_dhcp6_lease *lease) { } DEFINE_GET_TIME_FUNCTIONS(t1, lifetime_t1); -DEFINE_GET_TIME_FUNCTIONS(t2, lifetime_t1); +DEFINE_GET_TIME_FUNCTIONS(t2, lifetime_t2); DEFINE_GET_TIME_FUNCTIONS(valid_lifetime, lifetime_valid); static void dhcp6_lease_set_server_address(sd_dhcp6_lease *lease, const struct in6_addr *server_address) {