svn commit: r211069 - stable/8/etc/rc.d

[Jilles Tjoelker]

Author: jilles
Date: Sun Aug  8 13:43:20 2010
New Revision: 211069
URL: http://svn.freebsd.org/changeset/base/211069

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/8/etc/rc.d/ipmon
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/rc.d/ipmon
==============================================================================
--- stable/8/etc/rc.d/ipmon	Sun Aug  8 12:23:02 2010	(r211068)
+++ stable/8/etc/rc.d/ipmon	Sun Aug  8 13:43:20 2010	(r211069)
@@ -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