network: fix IPv6PrivacyExtensions=kernel handling

flokli · yuwata · commit d3ccb1b4ba71 · 2020-12-24T08:54:20.000+09:00
When set to "kernel", systemd is not supposed to touch that sysctl. 5e0534f, part of systemd/systemd#17240 forgot to handle that case. Fixes systemd/systemd#18003
diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
@@ -100,6 +100,10 @@ static int link_set_ipv6_privacy_extensions(Link *link) {
         if (!link->network)
                 return 0;
 
+        // this is the special "kernel" value
+        if (link->network->ipv6_privacy_extensions == _IPV6_PRIVACY_EXTENSIONS_INVALID)
+                return 0;
+
         return sysctl_write_ip_property_int(AF_INET6, link->ifname, "use_tempaddr", (int) link->network->ipv6_privacy_extensions);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,10 @@ static int link_set_ipv6_privacy_extensions(Link *link) {`
`100`	`100`	`if (!link->network)`
`101`	`101`	`return 0;`
`102`	`102`
	`103`	`+ // this is the special "kernel" value`
	`104`	`+ if (link->network->ipv6_privacy_extensions == _IPV6_PRIVACY_EXTENSIONS_INVALID)`
	`105`	`+ return 0;`
	`106`	`+`
`103`	`107`	`return sysctl_write_ip_property_int(AF_INET6, link->ifname, "use_tempaddr", (int) link->network->ipv6_privacy_extensions);`
`104`	`108`	`}`
`105`	`109`