From owner-svn-src-stable@FreeBSD.ORG  Wed Mar 24 12:12:00 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1DA92106564A;
	Wed, 24 Mar 2010 12:12:00 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C4758FC1E;
	Wed, 24 Mar 2010 12:12:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2OCBxd6092252;
	Wed, 24 Mar 2010 12:11:59 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2OCBxUp092250;
	Wed, 24 Mar 2010 12:11:59 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201003241211.o2OCBxUp092250@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 24 Mar 2010 12:11:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205585 - stable/8/usr.sbin/jls
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Mar 2010 12:12:00 -0000

Author: ed
Date: Wed Mar 24 12:11:59 2010
New Revision: 205585
URL: http://svn.freebsd.org/changeset/base/205585

Log:
  MFC r205296:
  
    Properly progress through the list of IPv6 addresses using in6_addr size.
  
    Right now if a jail has multiple IPv6 addresses, it will print them
    shifting only 4 bytes at a time. Example:
  
          2001:4dd0:ff41::b23f:a9
          2001:4dd0:ff41::b23f:aa
  
    Becomes:
  
          2001:4dd0:ff41::b23f:a9
          ff41::b23f:a9:2001:4dd0
  
    By casting to in6_addr, it uses the correct offsets.

Modified:
  stable/8/usr.sbin/jls/jls.c
Directory Properties:
  stable/8/usr.sbin/jls/   (props changed)

Modified: stable/8/usr.sbin/jls/jls.c
==============================================================================
--- stable/8/usr.sbin/jls/jls.c	Wed Mar 24 11:21:33 2010	(r205584)
+++ stable/8/usr.sbin/jls/jls.c	Wed Mar 24 12:11:59 2010	(r205585)
@@ -355,7 +355,7 @@ print_jail(int pflags, int jflags)
 			count = params[7].jp_valuelen / sizeof(struct in6_addr);
 			for (ai = 0; ai < count; ai++)
 				if (inet_ntop(AF_INET6,
-				    &((struct in_addr *)params[7].jp_value)[ai],
+				    &((struct in6_addr *)params[7].jp_value)[ai],
 				    ipbuf, sizeof(ipbuf)) == NULL)
 					err(1, "inet_ntop");
 				else