From owner-svn-src-all@FreeBSD.ORG  Sun Mar 13 16:27:36 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 66175106564A;
	Sun, 13 Mar 2011 16:27:36 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5521B8FC19;
	Sun, 13 Mar 2011 16:27:36 +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 p2DGRaaF059806;
	Sun, 13 Mar 2011 16:27:36 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2DGRaI6059804;
	Sun, 13 Mar 2011 16:27:36 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201103131627.p2DGRaI6059804@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 13 Mar 2011 16:27:36 +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: r219612 - head/etc
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2011 16:27:36 -0000

Author: dougb
Date: Sun Mar 13 16:27:36 2011
New Revision: 219612
URL: http://svn.freebsd.org/changeset/base/219612

Log:
  Revert r219578

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Sun Mar 13 16:20:38 2011	(r219611)
+++ head/etc/rc.subr	Sun Mar 13 16:27:36 2011	(r219612)
@@ -998,8 +998,9 @@ load_rc_config()
 		err 3 'USAGE: load_rc_config name'
 	fi
 
-	if [ -z "$_rc_conf_loaded" ]; then
-		set -o allexport
+	if ${_rc_conf_loaded:-false}; then
+		:
+	else
 		if [ -r /etc/defaults/rc.conf ]; then
 			debug "Sourcing /etc/defaults/rc.conf"
 			. /etc/defaults/rc.conf
@@ -1009,7 +1010,6 @@ load_rc_config()
 			. /etc/rc.conf
 		fi
 		_rc_conf_loaded=true
-		set +o allexport
 	fi
 	if [ -f /etc/rc.conf.d/"$_name" ]; then
 		debug "Sourcing /etc/rc.conf.d/${_name}"