Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 03/27/1997 15:20:02
darrenr
Thu Mar 27 07:14:37 PST 1997
Update of /cvsroot/.
In directory netbsd1:/home/darrenr/32a2/ipfilter

Log Message:
Bring in entire 3.2alpha2 source tree

Status:

Vendor Tag:	DARRENR
Release Tags:	V3_2ALPHA2
		
C ./src/sbin/ipf/ipf.c
C ./src/sbin/ipf/parse.c
U ./src/sbin/ipf/opt.c
U ./src/sbin/ipf/ipf.h
U ./src/sbin/ipf/ipf.4
U ./src/sbin/ipf/ipf.5
U ./src/sbin/ipf/ipl.4
U ./src/sbin/ipf/ipf.8
C ./src/sbin/ipf/Makefile
C ./src/sys/netinet/ip_fil.c
C ./src/sys/netinet/fil.c
C ./src/sys/netinet/ip_nat.c
C ./src/sys/netinet/ip_frag.c
C ./src/sys/netinet/ip_state.c
C ./src/sys/netinet/ip_fil.h
C ./src/sys/netinet/ip_compat.h
C ./src/sys/netinet/ip_frag.h
C ./src/sys/netinet/ip_nat.h
C ./src/sys/netinet/ip_state.h
C ./src/sys/lkm/netinet/if_ipl/mln_ipl.c
C ./src/sys/lkm/netinet/if_ipl/ipl.h
C ./src/sys/lkm/netinet/if_ipl/Makefile
N ./src/usr.sbin/ipfstat/kmem.c
N ./src/usr.sbin/ipfstat/kmem.h
N ./src/usr.sbin/ipfstat/fils.c
N ./src/usr.sbin/ipfstat/ipfstat.8
N ./src/usr.sbin/ipfstat/Makefile
N ./src/usr.sbin/ipmon/ipmon.c
N ./src/usr.sbin/ipmon/ipmon.8
N ./src/usr.sbin/ipmon/Makefile
N ./src/usr.sbin/ipftest/ipt.c
N ./src/usr.sbin/ipftest/ipft_sn.c
N ./src/usr.sbin/ipftest/ipft_ef.c
N ./src/usr.sbin/ipftest/ipft_td.c
N ./src/usr.sbin/ipftest/ipft_pc.c
N ./src/usr.sbin/ipftest/opt.c
N ./src/usr.sbin/ipftest/ipft_tx.c
N ./src/usr.sbin/ipftest/misc.c
N ./src/usr.sbin/ipftest/ip_frag.c
N ./src/usr.sbin/ipftest/ip_state.c
N ./src/usr.sbin/ipftest/ip_nat.c
N ./src/usr.sbin/ipftest/ipft_hx.c
N ./src/usr.sbin/ipftest/ipt.h
N ./src/usr.sbin/ipftest/snoop.h
N ./src/usr.sbin/ipftest/Makefile
N ./src/usr.sbin/ipftest/test/.cvsignore
N ./src/usr.sbin/ipftest/test/Makefile
N ./src/usr.sbin/ipftest/test/dotest
N ./src/usr.sbin/ipftest/test/hextest
N ./src/usr.sbin/ipftest/test/itest
N ./src/usr.sbin/ipftest/test/test.sed
N ./src/usr.sbin/ipftest/test/expected/1
N ./src/usr.sbin/ipftest/test/expected/10
N ./src/usr.sbin/ipftest/test/expected/11
N ./src/usr.sbin/ipftest/test/expected/12
N ./src/usr.sbin/ipftest/test/expected/2
N ./src/usr.sbin/ipftest/test/expected/3
N ./src/usr.sbin/ipftest/test/expected/4
N ./src/usr.sbin/ipftest/test/expected/5
N ./src/usr.sbin/ipftest/test/expected/6
N ./src/usr.sbin/ipftest/test/expected/7
N ./src/usr.sbin/ipftest/test/expected/8
N ./src/usr.sbin/ipftest/test/expected/9
N ./src/usr.sbin/ipftest/test/expected/expected.sed
N ./src/usr.sbin/ipftest/test/expected/i1
N ./src/usr.sbin/ipftest/test/expected/i10
N ./src/usr.sbin/ipftest/test/expected/i11
N ./src/usr.sbin/ipftest/test/expected/i2
N ./src/usr.sbin/ipftest/test/expected/i3
N ./src/usr.sbin/ipftest/test/expected/i4
N ./src/usr.sbin/ipftest/test/expected/i5
N ./src/usr.sbin/ipftest/test/expected/i6
N ./src/usr.sbin/ipftest/test/expected/i7
N ./src/usr.sbin/ipftest/test/expected/i8
N ./src/usr.sbin/ipftest/test/expected/i9
N ./src/usr.sbin/ipftest/test/input/1
N ./src/usr.sbin/ipftest/test/input/10
N ./src/usr.sbin/ipftest/test/input/11
N ./src/usr.sbin/ipftest/test/input/12
N ./src/usr.sbin/ipftest/test/input/13
N ./src/usr.sbin/ipftest/test/input/2
N ./src/usr.sbin/ipftest/test/input/3
N ./src/usr.sbin/ipftest/test/input/4
N ./src/usr.sbin/ipftest/test/input/5
N ./src/usr.sbin/ipftest/test/input/6
N ./src/usr.sbin/ipftest/test/input/7
N ./src/usr.sbin/ipftest/test/input/8
N ./src/usr.sbin/ipftest/test/input/9
N ./src/usr.sbin/ipftest/test/input/input.sed
N ./src/usr.sbin/ipftest/test/regress/1
N ./src/usr.sbin/ipftest/test/regress/10
N ./src/usr.sbin/ipftest/test/regress/11
N ./src/usr.sbin/ipftest/test/regress/12
N ./src/usr.sbin/ipftest/test/regress/13
N ./src/usr.sbin/ipftest/test/regress/2
N ./src/usr.sbin/ipftest/test/regress/3
N ./src/usr.sbin/ipftest/test/regress/4
N ./src/usr.sbin/ipftest/test/regress/5
N ./src/usr.sbin/ipftest/test/regress/6
N ./src/usr.sbin/ipftest/test/regress/7
N ./src/usr.sbin/ipftest/test/regress/8
N ./src/usr.sbin/ipftest/test/regress/9
N ./src/usr.sbin/ipftest/test/regress/i1
N ./src/usr.sbin/ipftest/test/regress/i10
N ./src/usr.sbin/ipftest/test/regress/i11
N ./src/usr.sbin/ipftest/test/regress/i2
N ./src/usr.sbin/ipftest/test/regress/i3
N ./src/usr.sbin/ipftest/test/regress/i4
N ./src/usr.sbin/ipftest/test/regress/i5
N ./src/usr.sbin/ipftest/test/regress/i6
N ./src/usr.sbin/ipftest/test/regress/i7
N ./src/usr.sbin/ipftest/test/regress/i8
N ./src/usr.sbin/ipftest/test/regress/i9
N ./src/usr.sbin/ipftest/test/regress/regress.sed
N ./src/usr.sbin/ipnat/ipnat.c
N ./src/usr.sbin/ipnat/ipnat.4
N ./src/usr.sbin/ipnat/ipnat.5
N ./src/usr.sbin/ipnat/ipnat.8
N ./src/usr.sbin/ipnat/Makefile

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

	cvs checkout -jDARRENR:yesterday -jDARRENR .