From owner-svn-src-stable@FreeBSD.ORG  Sat Feb  9 20:13:30 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id AB152AEF;
 Sat,  9 Feb 2013 20:13:30 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9DA9110A;
 Sat,  9 Feb 2013 20:13:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r19HuvTp018614;
 Sat, 9 Feb 2013 17:56:57 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r19Huva2018613;
 Sat, 9 Feb 2013 17:56:57 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201302091756.r19Huva2018613@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sat, 9 Feb 2013 17:56:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r246598 - stable/9/etc/rc.d
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sat, 09 Feb 2013 20:13:30 -0000

Author: ume
Date: Sat Feb  9 17:56:57 2013
New Revision: 246598
URL: http://svnweb.freebsd.org/changeset/base/246598

Log:
  MFC r246255: Use the default policy table of RFC 6724.

Modified:
  stable/9/etc/rc.d/ip6addrctl
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/rc.d/ip6addrctl
==============================================================================
--- stable/9/etc/rc.d/ip6addrctl	Sat Feb  9 17:34:48 2013	(r246597)
+++ stable/9/etc/rc.d/ip6addrctl	Sat Feb  9 17:56:57 2013	(r246598)
@@ -29,11 +29,15 @@ ip6addrctl_prefer_ipv6()
 	afexists inet6 || return 0
 
 	ip6addrctl flush >/dev/null 2>&1
-	ip6addrctl add ::1/128		50	0
-	ip6addrctl add ::/0		40	1
-	ip6addrctl add 2002::/16	30	2
-	ip6addrctl add ::/96		20	3
-	ip6addrctl add ::ffff:0:0/96	10	4
+	ip6addrctl add ::1/128		 50	 0
+	ip6addrctl add ::/0		 40	 1
+	ip6addrctl add ::ffff:0:0/96	 35	 4
+	ip6addrctl add 2002::/16	 30	 2
+	ip6addrctl add 2001::/32	  5	 5
+	ip6addrctl add fc00::/7		  3	13
+	ip6addrctl add ::/96		  1	 3
+	ip6addrctl add fec0::/10	  1	11
+	ip6addrctl add 3ffe::/16	  1	12
 	checkyesno ip6addrctl_verbose && ip6addrctl
 }
 
@@ -42,11 +46,15 @@ ip6addrctl_prefer_ipv4()
 	afexists inet6 || return 0
 
 	ip6addrctl flush >/dev/null 2>&1
-	ip6addrctl add ::ffff:0:0/96	50	0
-	ip6addrctl add ::1/128		40	1
-	ip6addrctl add ::/0		30	2
-	ip6addrctl add 2002::/16	20	3
-	ip6addrctl add ::/96		10	4
+	ip6addrctl add ::1/128		 50	 0
+	ip6addrctl add ::/0		 40	 1
+	ip6addrctl add ::ffff:0:0/96	100	 4
+	ip6addrctl add 2002::/16	 30	 2
+	ip6addrctl add 2001::/32	  5	 5
+	ip6addrctl add fc00::/7		  3	13
+	ip6addrctl add ::/96		  1	 3
+	ip6addrctl add fec0::/10	  1	11
+	ip6addrctl add 3ffe::/16	  1	12
 	checkyesno ip6addrctl_verbose && ip6addrctl
 }