From owner-svn-src-all@FreeBSD.ORG Mon Sep 13 19:52:47 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59A0A1065670; Mon, 13 Sep 2010 19:52:47 +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 2E81F8FC12; Mon, 13 Sep 2010 19:52:47 +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 o8DJqlj4028466; Mon, 13 Sep 2010 19:52:47 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8DJql40028462; Mon, 13 Sep 2010 19:52:47 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201009131952.o8DJql40028462@svn.freebsd.org> From: Hiroki Sato Date: Mon, 13 Sep 2010 19:52:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r212576 - in head: etc/defaults etc/rc.d share/man/man5 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2010 19:52:47 -0000 Author: hrs Date: Mon Sep 13 19:52:46 2010 New Revision: 212576 URL: http://svn.freebsd.org/changeset/base/212576 Log: Add $ipv6_privacy to support net.inet6.ip6.use_tempaddr. Note that this will be replaced with a per-IF version later. Based on: changes in r206408 by dougb Modified: head/etc/defaults/rc.conf head/etc/rc.d/netoptions head/share/man/man5/rc.conf.5 Modified: head/etc/defaults/rc.conf ============================================================================== --- head/etc/defaults/rc.conf Mon Sep 13 19:52:04 2010 (r212575) +++ head/etc/defaults/rc.conf Mon Sep 13 19:52:46 2010 (r212576) @@ -453,6 +453,8 @@ ipv6_static_routes="" # Set to static r # route toward loopback interface. #ipv6_route_xxx="fec0:0000:0000:0006:: -prefixlen 64 ::1" ipv6_gateway_enable="NO" # Set to YES if this host will be a gateway. +ipv6_privacy="NO" # Use privacy address on RA-receiving IFs + # (RFC 4193) route6d_enable="NO" # Set to YES to enable an IPv6 routing daemon. route6d_program="/usr/sbin/route6d" # Name of IPv6 routing daemon. Modified: head/etc/rc.d/netoptions ============================================================================== --- head/etc/rc.d/netoptions Mon Sep 13 19:52:04 2010 (r212575) +++ head/etc/rc.d/netoptions Mon Sep 13 19:52:46 2010 (r212576) @@ -99,6 +99,13 @@ netoptions_inet6() else ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null fi + + if checkyesno ipv6_privacy; then + netoptions_init + echo -n " IPv6 Privacy Addresses" + ${SYSCTL_W} net.inet6.ip6.use_tempaddr=1 >/dev/null + ${SYSCTL_W} net.inet6.ip6.prefer_tempaddr=1 >/dev/null + fi } load_rc_config $name Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Mon Sep 13 19:52:04 2010 (r212575) +++ head/share/man/man5/rc.conf.5 Mon Sep 13 19:52:46 2010 (r212576) @@ -1304,6 +1304,12 @@ flag and keywords see .Xr ifconfig 8 . .Pp +.It Va ipv6_privacy +.Pq Vt bool +If the variable is +.Dq Li YES +privacy addresses will be generated for each IPv6 +interface as described in RFC 4193. .It Va ipv6_network_interfaces .Pq Vt str This is the IPv6 equivalent of