Module Name: src
Committed By: snj
Date: Thu Jul 6 15:25:57 UTC 2017
Modified Files:
src/usr.sbin/traceroute6 [netbsd-6]: traceroute6.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.2.1 src/usr.sbin/traceroute6/traceroute6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/traceroute6/traceroute6.c
diff -u src/usr.sbin/traceroute6/traceroute6.c:1.42 src/usr.sbin/traceroute6/traceroute6.c:1.42.2.1
--- src/usr.sbin/traceroute6/traceroute6.c:1.42 Wed Jan 4 16:09:44 2012
+++ src/usr.sbin/traceroute6/traceroute6.c Thu Jul 6 15:25:57 2017
@@ -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 @@ static char sccsid[] = "@(#)traceroute.c
#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 @@ main(int argc, char *argv[])
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;
