Date: Sun, 8 Aug 2010 13:45:47 +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-7@freebsd.org Subject: svn commit: r211070 - stable/7/etc/rc.d Message-ID: <201008081345.o78Djl5s081546@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jilles Date: Sun Aug 8 13:45:47 2010 New Revision: 211070 URL: http://svn.freebsd.org/changeset/base/211070 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/7/etc/rc.d/ipmon Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.d/ipmon ============================================================================== --- stable/7/etc/rc.d/ipmon Sun Aug 8 13:43:20 2010 (r211069) +++ stable/7/etc/rc.d/ipmon Sun Aug 8 13:45:47 2010 (r211070) @@ -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?201008081345.o78Djl5s081546>