Module Name:	src
Committed By:	martti
Date:		Fri Dec 31 11:30:49 UTC 2004

Update of /cvsroot/src
In directory ivanova.netbsd.org:/tmp/cvs-serv14991

Log Message:
Import IPFilter 4.1.3


Vendor Tag:	DARRENR
Release Tags:	v4-1-3
		
C src/sys/dist/ipf/netinet/ip_auth.c
C src/sys/dist/ipf/netinet/fil.c
C src/sys/dist/ipf/netinet/ip_fil_netbsd.c
C src/sys/dist/ipf/netinet/ip_auth.h
C src/sys/dist/ipf/netinet/ip_compat.h
C src/sys/dist/ipf/netinet/ip_frag.c
C src/sys/dist/ipf/netinet/ip_fil.h
C src/sys/dist/ipf/netinet/ip_h323_pxy.c
C src/sys/dist/ipf/netinet/ip_frag.h
C src/sys/dist/ipf/netinet/ip_ftp_pxy.c
C src/sys/dist/ipf/netinet/ip_ipsec_pxy.c
C src/sys/dist/ipf/netinet/ip_pool.c
C src/sys/dist/ipf/netinet/ip_htable.c
C src/sys/dist/ipf/netinet/ip_htable.h
C src/sys/dist/ipf/netinet/ip_netbios_pxy.c
C src/sys/dist/ipf/netinet/ip_irc_pxy.c
C src/sys/dist/ipf/netinet/ip_log.c
C src/sys/dist/ipf/netinet/ip_lookup.c
C src/sys/dist/ipf/netinet/ip_lookup.h
C src/sys/dist/ipf/netinet/ip_nat.c
C src/sys/dist/ipf/netinet/ip_nat.h
C src/sys/dist/ipf/netinet/ipl.h
C src/sys/dist/ipf/netinet/ip_pool.h
C src/sys/dist/ipf/netinet/ip_pptp_pxy.c
C src/sys/dist/ipf/netinet/ip_proxy.c
C src/sys/dist/ipf/netinet/ip_proxy.h
C src/sys/dist/ipf/netinet/ip_raudio_pxy.c
C src/sys/dist/ipf/netinet/ip_rcmd_pxy.c
C src/sys/dist/ipf/netinet/ip_rpcb_pxy.c
C src/sys/dist/ipf/netinet/ip_scan.c
C src/sys/dist/ipf/netinet/ip_scan.h
C src/sys/dist/ipf/netinet/ip_state.c
C src/sys/dist/ipf/netinet/ip_state.h
C src/sys/dist/ipf/netinet/ip_sync.c
C src/sys/dist/ipf/netinet/ip_sync.h

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

	cvs checkout -jDARRENR:yesterday -jDARRENR src