diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-09-30 05:24:03 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-10-07 02:44:42 +0900 |
| commit | fd773a11d8e2b01e9e6d234ca5693417c0101fca (patch) | |
| tree | 14916216db1b3d0599964937143ccf4da0a136d8 /src/network/networkd-ipv6-proxy-ndp.c | |
| parent | 5823a48993188e0308a7274d794ff6f893c5e1d8 (diff) | |
| download | systemd-fd773a11d8e2b01e9e6d234ca5693417c0101fca.tar.gz | |
network: propagate errors in ipv6_proxy_ndp_set()
And ignore IPv6ProxyNDPAddress= settings if proxy_ndp is zero.
Diffstat (limited to 'src/network/networkd-ipv6-proxy-ndp.c')
| -rw-r--r-- | src/network/networkd-ipv6-proxy-ndp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c index f0870becac..fb8464ff2f 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) { |