SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13565 from yuwata/network-drop-ipv6ll-address

Browse Source 
network: drop IPv6LL address when LinkLocalAddressing=no|ipv4
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2019-09-17 09:57:21 +02:00
committed by GitHub
parent 8dd2fb558f 7b3770a75f
commit e8c36cc596
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+2 -2
View File
@@ -2389,7 +2389,7 @@ static int link_drop_foreign_config(Link *link) {
SET_FOREACH(address, link->addresses_foreign, i) {
/* we consider IPv6LL addresses to be managed by the kernel */
if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1)
if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1 && link_ipv6ll_enabled(link))
continue;
if (link_address_is_dynamic(link, address)) {
@@ -2466,7 +2466,7 @@ static int link_drop_config(Link *link) {
SET_FOREACH(address, link->addresses, i) {
/* we consider IPv6LL addresses to be managed by the kernel */
if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1)
if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1 && link_ipv6ll_enabled(link))
continue;
r = address_remove(address, link, NULL);