]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "network: address: drop deprecated temporary address"
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 2 Dec 2021 00:53:49 +0000 (09:53 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 2 Dec 2021 06:41:45 +0000 (15:41 +0900)
This reverts commit 528da64a0c734bd45e953b5c57d82e2a727435ef.

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

Fixes #21593.

src/network/networkd-address.c

index f1bda88eeb2e60d9583207768aa564cdb7c43763..826b061f24e2214c080f11f96a24613159a57c10 100644 (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);