From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 16 01:41:35 2012
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 24BBB106566C;
	Thu, 16 Feb 2012 01:41:35 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1384E8FC08;
	Thu, 16 Feb 2012 01:41:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1G1fYGZ092585;
	Thu, 16 Feb 2012 01:41:34 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1G1fYqM092582;
	Thu, 16 Feb 2012 01:41:34 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201202160141.q1G1fYqM092582@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 16 Feb 2012 01:41:34 +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: r231803 - stable/8/etc/rc.d
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: Thu, 16 Feb 2012 01:41:35 -0000

Author: hrs
Date: Thu Feb 16 01:41:34 2012
New Revision: 231803
URL: http://svn.freebsd.org/changeset/base/231803

Log:
  Add static routes to ::ffff:0.0.0.0/96 and ::0.0.0.0/96 unconditionally when
  the kernel supports PF_INET6.
  
  PR:	kern/161899

Modified:
  stable/8/etc/rc.d/network_ipv6
  stable/8/etc/rc.d/routing

Modified: stable/8/etc/rc.d/network_ipv6
==============================================================================
--- stable/8/etc/rc.d/network_ipv6	Thu Feb 16 01:32:23 2012	(r231802)
+++ stable/8/etc/rc.d/network_ipv6	Thu Feb 16 01:41:34 2012	(r231803)
@@ -41,10 +41,6 @@ start_cmd="network_ipv6_start"
 
 network_ipv6_start()
 {
-	# disallow "internal" addresses to appear on the wire
-	route add -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
-	route add -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
-
 	case ${ipv6_network_interfaces} in
 	[Aa][Uu][Tt][Oo])
 		# Get a list of network interfaces

Modified: stable/8/etc/rc.d/routing
==============================================================================
--- stable/8/etc/rc.d/routing	Thu Feb 16 01:32:23 2012	(r231802)
+++ stable/8/etc/rc.d/routing	Thu Feb 16 01:41:34 2012	(r231803)
@@ -57,6 +57,14 @@ static_start()
 			atmconfig natm add ${route_args}
 		done
 	fi
+
+	# Disallow "internal" addresses to appear on the wire if inet6
+	# is enabled.
+	if afexists inet6; then
+		# disallow "internal" addresses to appear on the wire
+		route add -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
+		route add -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
+	fi
 }
 
 _ropts_initdone=