Module Name:	src
Committed By:	bouyer
Date:		Mon Jun  4 19:50:30 UTC 2007

Modified Files:
	src/regress/sys/kern/ipf/expected [netbsd-4]: ni2
	src/regress/sys/kern/ipf/input [netbsd-4]: ni2
	src/sys/dist/ipf/netinet [netbsd-4]: ip_nat.c

Log Message:
Pull up following revision(s) (requested by darrenr in ticket #690):
	regress/sys/kern/ipf/input/ni2: revision 1.2
	regress/sys/kern/ipf/expected/ni2: revision 1.2
	sys/dist/ipf/netinet/ip_nat.c: revision 1.29
The wrong condition was being tested for when deciding which fields to
update in ICMP error messages.  In the test case for this, the wrong
input was actually being used (it should be the headers from the previous
packet output) and therefore the expected results were also wildly wrong.
kern/36309


To generate a diff of this commit:
cvs rdiff -r1.1.1.3.10.1 -r1.1.1.3.10.2 src/regress/sys/kern/ipf/expected/ni2
cvs rdiff -r1.1.1.3 -r1.1.1.3.10.1 src/regress/sys/kern/ipf/input/ni2
cvs rdiff -r1.19.2.3 -r1.19.2.4 src/sys/dist/ipf/netinet/ip_nat.c

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