From owner-svn-src-user@FreeBSD.ORG  Mon Dec 23 22:38:00 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2489795A;
 Mon, 23 Dec 2013 22:38:00 +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 10FB615A8;
 Mon, 23 Dec 2013 22:38:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNMbxQo077885;
 Mon, 23 Dec 2013 22:37:59 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNMbxY1077884;
 Mon, 23 Dec 2013 22:37:59 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201312232237.rBNMbxY1077884@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 23 Dec 2013 22:37:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259798 - user/ae/inet6/sys/netinet6
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: Mon, 23 Dec 2013 22:38:00 -0000

Author: ae
Date: Mon Dec 23 22:37:59 2013
New Revision: 259798
URL: http://svnweb.freebsd.org/changeset/base/259798

Log:
  Remove handling for an impossible case.

Modified:
  user/ae/inet6/sys/netinet6/in6_src.c

Modified: user/ae/inet6/sys/netinet6/in6_src.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_src.c	Mon Dec 23 22:31:40 2013	(r259797)
+++ user/ae/inet6/sys/netinet6/in6_src.c	Mon Dec 23 22:37:59 2013	(r259798)
@@ -644,24 +644,6 @@ oif_found:
 			RO_RTFREE(ro);
 		return (EADDRNOTAVAIL);
 	}
-#if 0
-	/*
-	 * At this point at least one of the addresses belonged to the jail
-	 * but it could still be, that we want to further restrict it, e.g.
-	 * theoratically IN6_IS_ADDR_LOOPBACK.
-	 * It must not be IN6_IS_ADDR_UNSPECIFIED anymore.
-	 * prison_local_ip6() will fix an IN6_IS_ADDR_LOOPBACK but should
-	 * let all others previously selected pass.
-	 * Use tmp to not change ::1 on lo0 to the primary jail address.
-	 */
-	tmp = ia->ia_addr.sin6_addr;
-	if (cred != NULL && prison_local_ip6(cred, &tmp, (inp != NULL &&
-	    (inp->inp_flags & IN6P_IPV6_V6ONLY) != 0)) != 0) {
-		IN6_IFADDR_RUNLOCK();
-		IP6STAT_INC(ip6s_sources_none);
-		return (EADDRNOTAVAIL);
-	}
-#endif
 	*ifpp = ifp;
 	*srcp = best.ia->ia_addr.sin6_addr;