5 Commits

Author	SHA1	Message	Date
darrenr	29fab67628	fix conflicts	1997-05-25 12:40:11 +00:00
christos	ae60a7c343	Fix SPLNET() conditional to work for NetBSD1_0+, not just the named versions.	1997-04-15 00:42:54 +00:00
thorpej	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
veego	25bcda3b52	Add $NetBSD$ id's and restore the orginal Id's.	1997-01-05 21:32:17 +00:00
mrg	c1067a3f4b	initial import of darren reed's ip-filter, version 3.1.2.	1997-01-05 13:47:59 +00:00