From owner-svn-src-user@FreeBSD.ORG  Wed Dec 18 14:40:33 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 806A6E62;
 Wed, 18 Dec 2013 14:40:33 +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 6DB5C13DB;
 Wed, 18 Dec 2013 14:40:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBIEeX0U032007;
 Wed, 18 Dec 2013 14:40:33 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBIEeXGo032006;
 Wed, 18 Dec 2013 14:40:33 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201312181440.rBIEeXGo032006@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 18 Dec 2013 14:40:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259552 - user/ae/inet6/sys/kern
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: Wed, 18 Dec 2013 14:40:33 -0000

Author: ae
Date: Wed Dec 18 14:40:32 2013
New Revision: 259552
URL: http://svnweb.freebsd.org/changeset/base/259552

Log:
  Initialize sin6_scope_id for global addresses.

Modified:
  user/ae/inet6/sys/kern/kern_jail.c

Modified: user/ae/inet6/sys/kern/kern_jail.c
==============================================================================
--- user/ae/inet6/sys/kern/kern_jail.c	Wed Dec 18 14:36:44 2013	(r259551)
+++ user/ae/inet6/sys/kern/kern_jail.c	Wed Dec 18 14:40:32 2013	(r259552)
@@ -3369,6 +3369,8 @@ prison_check_in6(struct ucred *cred, con
 	addr.sin6_addr = *ia6;
 	if (IN6_IS_ADDR_LINKLOCAL(ia6))
 		addr.sin6_scope_id = zoneid;
+	else
+		addr.sin6_scope_id = 0;
 	return (prison_check_ip6(cred, &addr));
 }