===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/show.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- src/usr.bin/netstat/show.c	2020/09/15 20:28:27	1.56
+++ src/usr.bin/netstat/show.c	2021/01/16 17:42:52	1.57
@@ -1,4 +1,4 @@
-/*	$OpenBSD: show.c,v 1.56 2020/09/15 20:28:27 pamela Exp $	*/
+/*	$OpenBSD: show.c,v 1.57 2021/01/16 17:42:52 claudio Exp $	*/
 /*	$NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $	*/
 
 /*
@@ -341,9 +341,10 @@
 		 * XXX: This is a special workaround for KAME kernels.
 		 * sin6_scope_id field of SA should be set in the future.
 		 */
-		if (IN6_IS_ADDR_LINKLOCAL(in6) ||
+		if ((IN6_IS_ADDR_LINKLOCAL(in6) ||
 		    IN6_IS_ADDR_MC_LINKLOCAL(in6) ||
-		    IN6_IS_ADDR_MC_INTFACELOCAL(in6)) {
+		    IN6_IS_ADDR_MC_INTFACELOCAL(in6)) &&
+		    sa6->sin6_scope_id == 0) {
 			/* XXX: override is ok? */
 			sa6->sin6_scope_id = (u_int32_t)ntohs(*(u_short *)
 			    &in6->s6_addr[2]);