From owner-svn-src-head@FreeBSD.ORG  Sat Oct 27 17:06:27 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 215105BE;
 Sat, 27 Oct 2012 17:06:27 +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 0974F8FC08;
 Sat, 27 Oct 2012 17:06:27 +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 q9RH6QpP019000;
 Sat, 27 Oct 2012 17:06:26 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9RH6Qu4018997;
 Sat, 27 Oct 2012 17:06:26 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201210271706.q9RH6Qu4018997@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 27 Oct 2012 17:06:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242181 - in head/etc: . rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Oct 2012 17:06:27 -0000

Author: hrs
Date: Sat Oct 27 17:06:26 2012
New Revision: 242181
URL: http://svn.freebsd.org/changeset/base/242181

Log:
  Fix an issue when ipv6_enable=YES && ipv6_gateway_enable=YES which could
  prevent rtadvd(8) from working as intended.
  
  Spotted by:	brian
  Discussed with:	brian

Modified:
  head/etc/network.subr
  head/etc/rc.d/rtadvd

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Sat Oct 27 16:44:41 2012	(r242180)
+++ head/etc/network.subr	Sat Oct 27 17:06:26 2012	(r242181)
@@ -504,7 +504,11 @@ ipv6_autoconfif()
 	# backward compatibility: $ipv6_enable
 	case $ipv6_enable in
 	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-		return 0
+		if checkyesno ipv6_gateway_enable; then
+			return 1
+		else
+			return 0
+		fi
 	;;
 	esac
 

Modified: head/etc/rc.d/rtadvd
==============================================================================
--- head/etc/rc.d/rtadvd	Sat Oct 27 16:44:41 2012	(r242180)
+++ head/etc/rc.d/rtadvd	Sat Oct 27 17:06:26 2012	(r242181)
@@ -51,10 +51,6 @@ rtadvd_precmd()
 		;;
 	esac
 
-	for iface in ${command_args}; do
-		ifconfig ${iface} inet6 -accept_rtadv
-	done
-
 	# Enable Router Renumbering, unicast case
 	# (use correct src/dst addr)
 	# rtadvd -R "in ipsec ah/transport/fec0:0:0:1::1-fec0:0:0:10::1/require" ${ipv6_network_interfaces}