14 Commits

Author SHA1 Message Date
Doug Barton
76f9428757 Remove trailing whitespace 2003-10-13 08:20:55 +00:00
Maxime Henrion
c7b33a84a4 Fix bogon in ipfilter_resync() introduced in my last commit.
Spotted by:	Gennady Proskurin <gpr@nvnpp.vrn.ru>
2003-10-03 11:57:43 +00:00
Maxime Henrion
50e8b3f340 A number of fixes/enhancements for the ipfilter rc script:
- Use a more robust check to determine if we need to load ipl.ko.
- Don't try to run ipf -E if ipfilter is already enabled.  Look at
  the net.inet.ipf.fr_running sysctl to figure this out.  This fixes
  a warning message about ipfilter being already initialized.
- Only one ipf -E command is needed.  We don't need an extra one for
  the -6 case which would only print a warning message about ipfilter
  being already initialized.
- Fix one occurence where we were running /sbin/ipf directly without
  using the ${ipfilter_program} variable if set.
- In ipfilter_stop(), don't try to save the firewall state tables if
  ipfilter is disabled.  Similarly, don't try to disable it if it's
  already disabled.  This fixes some more error messages.
2003-09-27 13:50:47 +00:00
Mike Makonnen
7a34a70b8d tty whacking should occur early, but not so early that the
required commands are not on a mounted file system.

Noticed by: bde
2003-07-30 18:53:59 +00:00
Mike Makonnen
c56836728a o Make the 'Ip-filter module loaded' messages informational
o Make 'No ipnat rules' a warning
o Remove unecessary ' ..'

Approved by:	markm (implicit)
2003-04-30 02:54:17 +00:00
Mike Makonnen
f686a8e864 Running the script with restart or manually stopping and starting
it doesn't work because the start_cmd doesn't enable ipfilter if
it is currently disabled.

Approved by:	markm (mentor) (implicit)
Submitted by:	Michael Lyngbøl <lyngbol@bifrost.lyngbol.dk>
PR:		conf/46103
2003-04-30 02:19:38 +00:00
Mike Makonnen
8cf06adbcb Make ipfilter, ipnat, ipmon, and ipfs behave more like the old rc.
o group them together so they run one right after another
	o use the NetBSD supplied ipfs script instead of tacking
	  it on to the end of ipnat
	o Load the ipl module in ipnat and ipfilter, if it's not already
	  loaded
	o In ipmon and ipnat show a warning if neither ipfilter nor
	  ipnat is enabled or the ipl module is not loaded, and exit

Approved by:	markm (mentor) (implicit)
Tested by:	leafy <leafy@leafy.idv.tw>
2003-04-24 08:20:47 +00:00
Hajimu UMEMOTO
667b217aa3 add missing `ipf -s'.
Submitted by:	Mark Huizer <xaa+freebsd@timewasters.nl>
2003-03-22 14:53:23 +00:00
Hajimu UMEMOTO
b209d7e493 Latest IPFilter requires flushing rules for IPv6 separately
from IPv4.
2003-03-05 17:16:22 +00:00
Hajimu UMEMOTO
7b988fe73c Add IPv6 setup for ipfilter. `ipv6_ipfilter_rules' was added
to specify rules definition file for ipfilter.  The default is
/etc/ipf6.rules.  If there is a file which is specified by
'ipv6_ipfilter_rules', IPv6 rule is installed.

Reviewed by:	Ronald van der Pol <Ronald.vanderPol@rvdp.org>
MFC after:	1 week
2002-11-02 08:21:26 +00:00
Jens Schweikhardt
143085107b Fix style bugs:
* Space -> tabs conversion.
* Removed blanks before semicolon in "if ... ; then".
* Proper indentation of misindented lines.
* Put a full stop after some comments.
* Removed whitespace at end of line.

Approved by:	silence from gordon
2002-10-12 10:31:31 +00:00
Gordon Tetlow
77e55efba0 Convert from ${CMD_OSTYPE} to ${OSTYPE}. This saves a shell invocation on
OS-dependent case switches.
2002-09-06 16:18:05 +00:00
Gordon Tetlow
27bc1b287e Merge in all the changes that Mike Makonnen has been maintaining for a
while. This is only the script pieces, the glue for the build comes next.

Submitted by:	Mike Makonnen <makonnen@pacbell.net>
Reviewed by:	silence on -current and -hackers
Prodded by:	rwatson
2002-06-13 22:14:37 +00:00
David E. O'Brien
9d62501fd8 Import the NetBSD 1.5 RC system.
Note that `rc' and `rc.shutdown' could not be imported because we already
have files with those names.
2001-06-16 07:16:14 +00:00