From owner-svn-src-all@FreeBSD.ORG  Mon Oct 17 13:05:58 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 28B0D106564A;
	Mon, 17 Oct 2011 13:05:57 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D3F568FC0A;
	Mon, 17 Oct 2011 13:05:57 +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 p9HD5v1c024415;
	Mon, 17 Oct 2011 13:05:57 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9HD5v2O024413;
	Mon, 17 Oct 2011 13:05:57 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201110171305.p9HD5v2O024413@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 17 Oct 2011 13:05:57 +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: r226464 - head/etc/rc.d
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: Mon, 17 Oct 2011 13:05:58 -0000

Author: des
Date: Mon Oct 17 13:05:57 2011
New Revision: 226464
URL: http://svn.freebsd.org/changeset/base/226464

Log:
  The rc_force test was inverted in the previous commit, so that dhclient ran
  for interfaces which were not configured for DHCP *unless* rc_force was set;
  the correct logic is to run dhclient for those interfaces *only if* rc_force
  is set.
  
  Broken by:	des@
  Noticed by:	everybody and his dog
  Submitted by:	rea@
  PR:		bin/161733

Modified:
  head/etc/rc.d/dhclient

Modified: head/etc/rc.d/dhclient
==============================================================================
--- head/etc/rc.d/dhclient	Mon Oct 17 12:22:09 2011	(r226463)
+++ head/etc/rc.d/dhclient	Mon Oct 17 13:05:57 2011	(r226464)
@@ -41,7 +41,7 @@ if [ -z $ifn ] ; then
 		echo 1>&2 "$0: no interface specified"
 		return 1
 	fi
-elif [ -n "${rc_force}" ] && ! dhcpif $ifn; then
+elif [ -z "${rc_force}" ] && ! dhcpif $ifn; then
 	return 1
 fi