21dea2100c
Resolve conflicts.
2000-05-03 11:12:03 +00:00
2e825f9c4e
Resolve conflicts and change the Makefile to reflect the move of ipl.h
...
to sys/netinet (we need it now in usr.sbin/ipf).
1999-12-12 11:18:46 +00:00
c890eba0b7
Change NOMAN=yep to MKMAN=no.
1999-02-12 05:41:57 +00:00
54013b0a5c
add ipmon(8) support, from Matthias Scheler in PR kern/4860
1998-02-04 07:38:55 +00:00
4508fb4354
Resolve conflicts from the merge of ipf 3.2beta5.
1997-09-21 18:00:54 +00:00
928ff81b87
Need ip_auth.o
1997-07-06 22:12:56 +00:00
a7a52d12c8
fix conflicts from import
1997-07-05 05:52:39 +00:00
6ef2799147
Garbage-collect unneeded CFLAGS.
1997-05-28 02:10:28 +00:00
9062a97000
Resolve conflicts from merge of 3.2a7, take 2.
1997-05-28 00:22:15 +00:00
85a327bb3b
Make this compile again in light of recent changes:
...
- adjust for new ipl_attach()/ipl_detach() names.
- In ipl_load(), so not implicitly call ipl_attach(), since
doing so would be inconsistent with the behavior exhibited
by the statically-configured version.
1997-03-29 03:03:08 +00:00
99f4b72f6c
Resolve conflicts from merge.
...
XXX doesn't compile yet, but that will require some other changes, which
XXX I want to make separately.
1997-03-29 01:42:33 +00:00
fe3bc025d0
Bring in entire 3.2alpha2 source tree
1997-03-27 15:13:58 +00:00
85f84f08cd
initial import of darren reed's ip-filter, version 3.1.2.
1997-01-05 13:26:10 +00:00
veego