From owner-svn-src-stable@FreeBSD.ORG  Sun May 20 20:25:23 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71518106566C;
	Sun, 20 May 2012 20:25:23 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B7958FC14;
	Sun, 20 May 2012 20:25:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4KKPNPB014172;
	Sun, 20 May 2012 20:25:23 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4KKPNAx014170;
	Sun, 20 May 2012 20:25:23 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201205202025.q4KKPNAx014170@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 20 May 2012 20:25:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235696 - stable/9/lib/libipsec
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 May 2012 20:25:23 -0000

Author: bz
Date: Sun May 20 20:25:22 2012
New Revision: 235696
URL: http://svn.freebsd.org/changeset/base/235696

Log:
  MFC r231532:
  
   MFp4 204292:
  
   Ignore the NAT_T extension types so we can at least dump the SADB from
   the in-base libipsec/setkey without error when NAT_T support is present
   in the kernel, though not printing the additional information yet.
   However in case there is no NAT_T support in kernel still consider them
   to be an error.

Modified:
  stable/9/lib/libipsec/pfkey.c
Directory Properties:
  stable/9/lib/libipsec/   (props changed)

Modified: stable/9/lib/libipsec/pfkey.c
==============================================================================
--- stable/9/lib/libipsec/pfkey.c	Sun May 20 18:25:45 2012	(r235695)
+++ stable/9/lib/libipsec/pfkey.c	Sun May 20 20:25:22 2012	(r235696)
@@ -1778,6 +1778,18 @@ pfkey_align(msg, mhp)
 		case SADB_X_EXT_SA2:
 			mhp[ext->sadb_ext_type] = (caddr_t)ext;
 			break;
+		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_OA: is OAI */
+		case SADB_X_EXT_NAT_T_OAI:
+		case SADB_X_EXT_NAT_T_OAR:
+		case SADB_X_EXT_NAT_T_FRAG:
+			if (feature_present("ipsec_natt")) {
+				mhp[ext->sadb_ext_type] = (caddr_t)ext;
+				break;
+			}
+			/* FALLTHROUGH */
 		default:
 			__ipsec_errcode = EIPSEC_INVAL_EXTTYPE;
 			return -1;