Date: Sun, 8 Aug 2010 14:13:10 +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-6@freebsd.org Subject: svn commit: r211072 - stable/6/etc/rc.d Message-ID: <201008081413.o78EDAmp087891@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008081413.o78EDAmp087891>