From owner-svn-src-stable-6@FreeBSD.ORG  Sun Aug  8 14:13:11 2010
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 040DA106568B;
	Sun,  8 Aug 2010 14:13:11 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E6A978FC1B;
	Sun,  8 Aug 2010 14:13:10 +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 o78EDAOl087893;
	Sun, 8 Aug 2010 14:13:10 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o78EDAmp087891;
	Sun, 8 Aug 2010 14:13:10 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201008081413.o78EDAmp087891@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 8 Aug 2010 14:13:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211072 - stable/6/etc/rc.d
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Aug 2010 14:13:11 -0000

Author: jilles
Date: Sun Aug  8 14:13:10 2010
New Revision: 211072
URL: http://svn.freebsd.org/changeset/base/211072

Log:
  MFC r210734: Allow starting ipmon if ipnat is enabled but ipfilter is not
  (in /etc/rc.conf).
  
  This fixes an apparent confusion between test(1) and sh(1) syntax for
  AND/OR.
  
  PR:		conf/149036
  Submitted by:	pluknet

Modified:
  stable/6/etc/rc.d/ipmon
Directory Properties:
  stable/6/etc/   (props changed)

Modified: stable/6/etc/rc.d/ipmon
==============================================================================
--- stable/6/etc/rc.d/ipmon	Sun Aug  8 14:00:21 2010	(r211071)
+++ stable/6/etc/rc.d/ipmon	Sun Aug  8 14:13:10 2010	(r211072)
@@ -20,7 +20,7 @@ ipmon_precmd()
 	# Continue only if ipfilter or ipnat is enabled and the
 	# ipfilter module is loaded.
 	#
-	if ! checkyesno ipfilter_enable -o ! checkyesno ipnat_enable ; then
+	if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable ; then
 		err 1  "${name} requires either ipfilter or ipnat enabled"
 	fi
 	if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1; then