0b6031033d
fix fragment cache security hole
2001-04-06 15:32:40 +00:00
fb2dc295a6
Resolve conflicts.
2001-03-26 06:11:46 +00:00
09cb38f22b
expose the definitions of MIN() and MAX() in sys/param.h to the kernel
...
and use those in favor of a dozen copies scattered around the source tree.
2001-02-05 10:42:40 +00:00
b3d0df91fb
Resolve conflicts.
2000-08-09 21:00:39 +00:00
c02ef5cc85
Resolve conflicts.
2000-05-23 06:07:42 +00:00
4c4ad1d1a5
Resolve conflicts.
2000-05-21 18:45:53 +00:00
21dea2100c
Resolve conflicts.
2000-05-03 11:12:03 +00:00
8529438fe6
Remove register declarations.
2000-03-30 12:51:13 +00:00
aa4732525f
Fix from Darren Reed for the test failure of f11.
2000-02-07 13:58:00 +00:00
b3bffdf856
Resolve conflicts.
2000-02-01 21:29:15 +00:00
a7c3d2263b
Fix a panic which was mentioned on the ipfilter mailing list.
...
Patch from Darren send to the mailing list after he released 3.3.6 and
did a bad job with using the wrong way to update the NetBSD version
of ipfilter.
1999-12-29 08:19:07 +00:00
1904e0a218
update ipfilter code to 3.3.6
1999-12-28 07:14:53 +00:00
64b2c34646
Resolve conflicts and small fixes.
1999-12-12 11:11:15 +00:00
8befad84b1
Remove SCCS markers and make these compile in $NetBSD$ IDs.
1999-02-02 19:57:30 +00:00
78db9d7d95
merge ipf 3.2.10
1998-11-22 15:17:18 +00:00
97ab1bd53b
Resolve conflicts from the import.
1998-07-12 15:23:59 +00:00
6250554a65
Fix compiler warnings: Add missing ()'s.
1998-05-29 20:28:17 +00:00
a4c89e3e2e
Resolve conflicts from the import of IPFilter 3.2.7.
1998-05-29 20:24:36 +00:00
82423e3d01
Resolve conflicts
1998-05-17 16:50:15 +00:00
84ecff38c2
merge ip-filter 3.2.1
1997-11-14 12:40:06 +00:00
60c28e1f95
sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.
1997-10-30 16:08:54 +00:00
4508fb4354
Resolve conflicts from the merge of ipf 3.2beta5.
1997-09-21 18:00:54 +00:00
b19b36aff5
Restore original RCS IDs.
1997-07-06 05:29:13 +00:00
729f0dc597
fix conflicts from import
1997-07-05 05:38:14 +00:00
41d4822677
Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some
...
silly differences between the NetBSD copy of the code and the
vendor branch, keeping only those which are necessary. Of those
differences that currently exist, several "portability to NetBSD"
issues, which will be fed back to the ipfilter author.
1997-05-28 00:17:11 +00:00
67a6c44c15
Make this compile on 32-bit architectures again:
...
- Pull in includes to get appropriate prototypes.
1997-05-27 01:24:31 +00:00
29fab67628
fix conflicts
1997-05-25 12:40:11 +00:00
f30d8f327f
Resolve conflicts from merge.
...
XXX !!! XXX !!!
I noticed a few semi-serious bugs while doing this merge, one of which
has existed for a fairly long time. Some of them are addressed in this
commit (because they caused the kernel to not compile), and are annoted
by "XXX" and "--thorpej". The other one will be addressed shortly in
a future commit, and, as far as I can tell, affects all operating systems
which IP Filter supports.
1997-03-29 00:54:55 +00:00
473d4f54d1
Add $NetBSD$ id's and restore the orginal Id's.
1997-01-05 21:32:18 +00:00
c1067a3f4b
initial import of darren reed's ip-filter, version 3.1.2.
1997-01-05 13:47:59 +00:00
darrenr