[src/netbsd-6]: src/usr.sbin/traceroute6 Pull up following revision(s) (reque...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b8469e8a887
branches:  netbsd-6
changeset: 777174:6b8469e8a887
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Jul 06 15:25:57 2017 +0000

description:
Pull up following revision(s) (requested by is in ticket #1427):
        usr.sbin/traceroute6/traceroute6.c: revision 1.43
PR/47304: Kouki Ooyatsu: -s (source IPv6 address to be used) option does not
work because the wrong variable is used.

diffstat:

 usr.sbin/traceroute6/traceroute6.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r d0d7df62e3dc -r 6b8469e8a887 usr.sbin/traceroute6/traceroute6.c
--- a/usr.sbin/traceroute6/traceroute6.c        Thu Jul 06 15:22:41 2017 +0000
+++ b/usr.sbin/traceroute6/traceroute6.c        Thu Jul 06 15:25:57 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: traceroute6.c,v 1.42 2012/01/04 16:09:44 drochner Exp $        */
+/*     $NetBSD: traceroute6.c,v 1.42.2.1 2017/07/06 15:25:57 snj Exp $ */
 /*     $KAME: traceroute6.c,v 1.67 2004/01/25 03:24:39 itojun Exp $    */
 
 /*
@@ -75,7 +75,7 @@
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: traceroute6.c,v 1.42 2012/01/04 16:09:44 drochner Exp $");
+__RCSID("$NetBSD: traceroute6.c,v 1.42.2.1 2017/07/06 15:25:57 snj Exp $");
 #endif
 #endif
 
@@ -724,10 +724,10 @@
                if (error0)
                        errx(1, "Cannot get address for `%s' (%s)", source,
                            gai_strerror(error0));
-               if (res->ai_addrlen > sizeof(Src))
+               if (res0->ai_addrlen > sizeof(Src))
                        errx(1, "Bad incompatible address length");
-               memcpy(&Src, res->ai_addr, res->ai_addrlen);
-               freeaddrinfo(res);
+               memcpy(&Src, res0->ai_addr, res0->ai_addrlen);
+               freeaddrinfo(res0);
        } else {
                struct sockaddr_in6 Nxt;
                int dummy;