Module Name:	src
Committed By:	darrenr
Date:		Thu Dec 16 17:01:02 UTC 2004

Modified Files:
	src/dist/ipf/tools: ipnat_y.y
	src/sys/dist/ipf/netinet: ip_nat.c ip_nat.h

Log Message:
Expand out an unused byte to give each NAT rule a protocol version field,
allowing rules to be set to match only ipv4/ipv6. And so ipnat must be updated
to actually set this field correctly but to keep things working for old
versions of ipnat (that will set this to 0), make the ioctl handler "update"
the 0 to a 4 to keep things working when people just upgrade kernels.  This
forces NAT rule matching to be limited to ipv4 only, here forward, fixing
kern/28662


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 src/dist/ipf/tools/ipnat_y.y
cvs rdiff -r1.2 -r1.3 src/sys/dist/ipf/netinet/ip_nat.c
cvs rdiff -r1.1 -r1.2 src/sys/dist/ipf/netinet/ip_nat.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.