From 584881d0a5f49cc6edac9c505d335dc5f6d13231 Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Fri, 16 Nov 2018 19:45:41 +0000 Subject: Don't fatal if IPV6_LEAVE_GROUP fails. The underlying interface might have been destroyed or detached and rad(8) will just cope with that. OK florian@ --- usr.sbin/rad/frontend.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/rad/frontend.c b/usr.sbin/rad/frontend.c index c452a845fd3..6b96623fb47 100644 --- a/usr.sbin/rad/frontend.c +++ b/usr.sbin/rad/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.16 2018/08/15 16:48:20 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.17 2018/11/16 19:45:40 reyk Exp $ */ /* * Copyright (c) 2018 Florian Obser @@ -647,13 +647,13 @@ leave_all_routers_mcast_group(struct ra_iface *ra_iface) { log_debug("leaving multicast group on %s", ra_iface->name); all_routers.ipv6mr_interface = ra_iface->if_index; - if (setsockopt(icmp6sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP, - &all_routers, sizeof(all_routers)) == -1) - fatal("IPV6_LEAVE_GROUP(%s)", ra_iface->name); + setsockopt(icmp6sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP, + &all_routers, sizeof(all_routers)); } struct ra_iface* -find_ra_iface_by_id(uint32_t if_index) { +find_ra_iface_by_id(uint32_t if_index) +{ struct ra_iface *ra_iface; TAILQ_FOREACH(ra_iface, &ra_interfaces, entry) { -- cgit v1.2.3