diff options
| author | jilles <jilles@FreeBSD.org> | 2010-08-01 15:41:00 +0000 |
|---|---|---|
| committer | jilles <jilles@FreeBSD.org> | 2010-08-01 15:41:00 +0000 |
| commit | 3c2469212a3c454f067ae11dbbdd9af10d56b851 (patch) | |
| tree | bfb029bd1539cd45a8c3136fe9e1d3d7d14fb4b3 /etc/rc.d | |
| parent | 176b515672593c00c04c3e9d3f6c40940ff6be30 (diff) | |
| download | FreeBSD-src-3c2469212a3c454f067ae11dbbdd9af10d56b851.zip FreeBSD-src-3c2469212a3c454f067ae11dbbdd9af10d56b851.tar.gz | |
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
Diffstat (limited to 'etc/rc.d')
| -rwxr-xr-x | etc/rc.d/ipmon | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon index 74ed092..cbed453 100755 --- a/etc/rc.d/ipmon +++ b/etc/rc.d/ipmon @@ -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 |
