misc/147887: Invalid extension type displayed with setkey

[Alex]

>Number:         147887
>Category:       misc
>Synopsis:       Invalid extension type displayed with setkey
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 15 19:30:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Alex
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD orion 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #4: Sun Jun
13 20:18:56 EDT 2010 alex at orion:/usr/obj/usr/src/sys/ORION amd64

>Description:
After setting up an ESP tunnel with racoon2, setkey -D displays
"Invalid extension type" in place of the actual SAD entries that would
otherwise be displayed. This is caused by libipsec.

>How-To-Repeat:
Set up a racoon2 IKE2 exchange and look at the output from setkey -D.

>Fix:
See attached patch.
--MP_/dATNuk_1h8Sa8B9ELA1QyCA
Content-Type: text/x-patch
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=pkfey.patch

--- orig/pfkey.c	2010-06-15 14:53:12.000000000 -0400
+++ pfkey.c	2010-06-15 14:51:04.000000000 -0400
@@ -1776,6 +1776,11 @@
 		case SADB_EXT_SPIRANGE:
 		case SADB_X_EXT_POLICY:
 		case SADB_X_EXT_SA2:
+		case SADB_X_EXT_NAT_T_TYPE:
+		case SADB_X_EXT_NAT_T_SPORT:
+		case SADB_X_EXT_NAT_T_DPORT:
+		case SADB_X_EXT_NAT_T_OAI:
+		case SADB_X_EXT_NAT_T_OAR:
 			mhp[ext->sadb_ext_type] =3D (caddr_t)ext;
 			break;
 		default:

--MP_/dATNuk_1h8Sa8B9ELA1QyCA--
>Release-Note:
>Audit-Trail:
>Unformatted:
 --MP_/dATNuk_1h8Sa8B9ELA1QyCA
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline