From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 29 Sep 2020 20:24:03 +0000 (+0900)
Subject: network: propagate errors in ipv6_proxy_ndp_set()
X-Git-Tag: v247-rc1~117^2~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd773a11d8e2b01e9e6d234ca5693417c0101fca;p=thirdparty%2Fsystemd.git

network: propagate errors in ipv6_proxy_ndp_set()

And ignore IPv6ProxyNDPAddress= settings if proxy_ndp is zero.
---

diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c
index f0870becac8..fb8464ff2fa 100644
--- a/src/network/networkd-ipv6-proxy-ndp.c
+++ b/src/network/networkd-ipv6-proxy-ndp.c
@@ -84,9 +84,9 @@ static int ipv6_proxy_ndp_set(Link *link) {
 
         r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "proxy_ndp", v);
         if (r < 0)
-                log_link_warning_errno(link, r, "Cannot configure proxy NDP for interface: %m");
+                return log_link_warning_errno(link, r, "Cannot configure proxy NDP for the interface: %m");
 
-        return 0;
+        return v;
 }
 
 /* configure all ipv6 proxy ndp addresses */
@@ -99,7 +99,7 @@ int link_set_ipv6_proxy_ndp_addresses(Link *link) {
 
         /* enable or disable proxy_ndp itself depending on whether ipv6_proxy_ndp_addresses are set or not */
         r = ipv6_proxy_ndp_set(link);
-        if (r < 0)
+        if (r <= 0)
                 return r;
 
         SET_FOREACH(address, link->network->ipv6_proxy_ndp_addresses) {