Module Name:	syssrc
Committed By:	veego
Date:		Mon Jun 12 10:23:12 UTC 2000

Update of /cvsroot/syssrc
In directory nb00:/tmp/cvs-serv26725

Log Message:
Import IP Filter 3.4.6


Vendor Tag:	DARRENR
Release Tags:	v3-4-6
		
C syssrc/sys/netinet/fil.c
U syssrc/sys/netinet/ip_auth.c
U syssrc/sys/netinet/ip_auth.h
U syssrc/sys/netinet/ip_compat.h
C syssrc/sys/netinet/ip_fil.c
C syssrc/sys/netinet/ip_fil.h
C syssrc/sys/netinet/ip_frag.c
U syssrc/sys/netinet/ip_frag.h
U syssrc/sys/netinet/ip_ftp_pxy.c
U syssrc/sys/netinet/ip_log.c
C syssrc/sys/netinet/ip_nat.c
C syssrc/sys/netinet/ip_nat.h
U syssrc/sys/netinet/ip_proxy.c
U syssrc/sys/netinet/ip_proxy.h
U syssrc/sys/netinet/ip_raudio_pxy.c
U syssrc/sys/netinet/ip_rcmd_pxy.c
U syssrc/sys/netinet/ip_state.c
U syssrc/sys/netinet/ip_state.h
C syssrc/sys/netinet/ipl.h
U syssrc/sys/lkm/netinet/if_ipl/mln_ipl.c

7 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jDARRENR:yesterday -jDARRENR syssrc