From: Selva Nair Date: Wed, 22 Mar 2023 15:15:50 +0000 (-0400) Subject: Make error in setting metric for IPv6 interface non-fatal X-Git-Tag: v2.6.2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5babbc78fa27f84039e94b545d03c7049c8bd9c9;p=thirdparty%2Fopenvpn.git Make error in setting metric for IPv6 interface non-fatal - Unfortunately there are still users out there who disable IPv6 on tun/tap/dco interfaces or even system-wide. Github: fixes OpenVPN/openvpn#294 Signed-off-by: Selva Nair Acked-by: Gert Doering Message-Id: <20230322151550.1596669-1-selva.nair@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26477.html Signed-off-by: Gert Doering (cherry picked from commit b8ee8c43fd81988a58343da466999d2e30ae6221) --- diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index a3d437521..ec1962740 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -847,8 +847,13 @@ AddBlockDNS(const block_dns_message_t *msg, undo_lists_t *lists) BLOCK_DNS_IFACE_METRIC); if (!err) { - err = set_interface_metric(msg->iface.index, AF_INET6, - BLOCK_DNS_IFACE_METRIC); + /* for IPv6, we intentionally ignore errors, because + * otherwise block-dns activation will fail if a user or + * admin has disabled IPv6 on the tun/tap/dco interface + * (if OpenVPN wants IPv6 ifconfig, we'll fail there) + */ + set_interface_metric(msg->iface.index, AF_INET6, + BLOCK_DNS_IFACE_METRIC); } if (err) {