From owner-svn-src-user@FreeBSD.ORG  Fri Dec 27 02:49:57 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 646719B0;
 Fri, 27 Dec 2013 02:49:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BECC1654;
 Fri, 27 Dec 2013 02:49:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBR2nvZ4003635;
 Fri, 27 Dec 2013 02:49:57 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBR2nvri003634;
 Fri, 27 Dec 2013 02:49:57 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201312270249.rBR2nvri003634@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 27 Dec 2013 02:49:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259931 - user/ae/inet6/usr.sbin/jail
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2013 02:49:57 -0000

Author: ae
Date: Fri Dec 27 02:49:56 2013
New Revision: 259931
URL: http://svnweb.freebsd.org/changeset/base/259931

Log:
  Use struct sockaddr_in6 instead of in6_addr in jail(8).

Modified:
  user/ae/inet6/usr.sbin/jail/config.c

Modified: user/ae/inet6/usr.sbin/jail/config.c
==============================================================================
--- user/ae/inet6/usr.sbin/jail/config.c	Fri Dec 27 02:49:04 2013	(r259930)
+++ user/ae/inet6/usr.sbin/jail/config.c	Fri Dec 27 02:49:56 2013	(r259931)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <arpa/inet.h>
+#include <net/if.h>
 #include <netinet/in.h>
 
 #include <err.h>
@@ -456,9 +457,8 @@ check_intparams(struct cfjail *j)
 	char avalue4[INET_ADDRSTRLEN];
 #endif
 #ifdef INET6
-	struct in6_addr addr6;
 	int ip6ok;
-	char avalue6[INET6_ADDRSTRLEN];
+	char avalue6[INET6_ADDRSTRLEN + IF_NAMESIZE + 1];
 #endif
 
 	error = 0;
@@ -556,14 +556,11 @@ check_intparams(struct cfjail *j)
 #endif
 #ifdef INET6
 					case AF_INET6:
-						memcpy(&addr6,
-						    &((struct sockaddr_in6 *)
-						    (void *)ai->ai_addr)->
-						    sin6_addr, sizeof(addr6));
-						if (inet_ntop(AF_INET6,
-						    &addr6, avalue6,
-						    INET6_ADDRSTRLEN) == NULL)
-							err(1, "inet_ntop");
+						if (getnameinfo(ai->ai_addr,
+						    ai->ai_addrlen, avalue6,
+						    sizeof(avalue6), NULL, 0,
+						    NI_NUMERICHOST) != 0)
+							err(1, "getnameinfo");
 						add_param(j, NULL, KP_IP6_ADDR,
 						    avalue6);
 						break;