shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

Revert "network: address: drop deprecated temporary address"

Browse Source 
This reverts commit 528da64a0c.

The commit is a bad way to fix #19838, and introduces #21593.

Fixes #21593.
This commit is contained in:
Yu Watanabe 2021-12-02 09:53:49 +09:00
parent bf1e65a4fd
commit 4a410adae6
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/networkd-address.c
View File

@ -1394,20 +1394,6 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
address->scope = tmp->scope;
address_set_lifetime(address, &cinfo);
address_enter_configured(address);
if (address->family == AF_INET6 &&
address->source == NETWORK_CONFIG_SOURCE_FOREIGN &&
FLAGS_SET(address->flags, IFA_F_SECONDARY | IFA_F_DEPRECATED)) {
/* The temporary address became deprecated, i.e. preferred lifetime == 0. */
log_address_debug(address, "Received deprecated", link);
r = address_remove(address);
if (r < 0)
link_enter_failed(link);
return 0;
}
log_address_debug(address, "Received updated", link);
} else {
address_set_lifetime(tmp, &cinfo);