Date: Sun, 1 Aug 2010 15:41:01 +0000 (UTC) From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r210734 - head/etc/rc.d Message-ID: <201008011541.o71Ff1kQ043414@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jilles Date: Sun Aug 1 15:41:00 2010 New Revision: 210734 URL: http://svn.freebsd.org/changeset/base/210734 Log: Allow starting /etc/rc.d/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 MFC after: 1 week Modified: head/etc/rc.d/ipmon Modified: head/etc/rc.d/ipmon ============================================================================== --- head/etc/rc.d/ipmon Sun Aug 1 15:34:29 2010 (r210733) +++ head/etc/rc.d/ipmon Sun Aug 1 15:41:00 2010 (r210734) @@ -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?201008011541.o71Ff1kQ043414>