From owner-svn-src-releng@FreeBSD.ORG  Sat Oct 27 20:18:00 2012
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3E495F8A;
 Sat, 27 Oct 2012 20:18:00 +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 23D7B8FC12;
 Sat, 27 Oct 2012 20:18:00 +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 q9RKHxxR050960;
 Sat, 27 Oct 2012 20:17:59 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9RKHxcH050958;
 Sat, 27 Oct 2012 20:17:59 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201210272017.q9RKHxcH050958@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 27 Oct 2012 20:17:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r242189 - releng/9.1/etc
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Oct 2012 20:18:00 -0000

Author: hrs
Date: Sat Oct 27 20:17:59 2012
New Revision: 242189
URL: http://svn.freebsd.org/changeset/base/242189

Log:
  MFC of r242187:
  
  Fix an issue when ipv6_enable=YES && ipv6_gateway_enable=YES which could
  prevent rtadvd(8) from working as intended.
  
  Approved by:	re (kib)

Modified:
  releng/9.1/etc/network.subr
Directory Properties:
  releng/9.1/etc/   (props changed)

Modified: releng/9.1/etc/network.subr
==============================================================================
--- releng/9.1/etc/network.subr	Sat Oct 27 19:56:57 2012	(r242188)
+++ releng/9.1/etc/network.subr	Sat Oct 27 20:17:59 2012	(r242189)
@@ -109,7 +109,9 @@ ifconfig_up()
 		# backward compatibility: $ipv6_enable
 		case $ipv6_enable in
 		[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-			_ipv6_opts="${_ipv6_opts} accept_rtadv"
+			if ! checkyesno ipv6_gateway_enable; then
+				_ipv6_opts="${_ipv6_opts} accept_rtadv"
+			fi
 			;;
 		esac
 
@@ -488,7 +490,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