From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 5 Feb 2021 17:46:18 +0000 (+0100)
Subject: nss-resolve: shortcut fixing of ifindex if it's zero anyway
X-Git-Tag: v248-rc1~197^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18482%2Fhead;p=thirdparty%2Fsystemd.git

nss-resolve: shortcut fixing of ifindex if it's zero anyway
---

diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index 458eb487a5f..fb1d61fea98 100644
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -68,7 +68,7 @@ static int connect_to_resolved(Varlink **ret) {
 static uint32_t ifindex_to_scopeid(int family, const void *a, int ifindex) {
         struct in6_addr in6;
 
-        if (family != AF_INET6)
+        if (family != AF_INET6 || ifindex == 0)
                 return 0;
 
         /* Some apps can't deal with the scope ID attached to non-link-local addresses. Hence, let's suppress that. */