Date: Sun, 8 Aug 2010 13:43:21 +0000 (UTC) From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r211069 - stable/8/etc/rc.d Message-ID: <201008081343.o78DhLVn080940@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008081343.o78DhLVn080940>