From owner-cvs-src@FreeBSD.ORG  Thu Sep 30 00:49:55 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 961E016A4CE; Thu, 30 Sep 2004 00:49:55 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8C90943D2F; Thu, 30 Sep 2004 00:49:55 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8U0ntqR014376;
	Thu, 30 Sep 2004 00:49:55 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8U0ntOg014375;
	Thu, 30 Sep 2004 00:49:55 GMT
	(envelope-from rwatson)
Message-Id: <200409300049.i8U0ntOg014375@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 30 Sep 2004 00:49:55 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netkey key.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Sep 2004 00:49:55 -0000

rwatson     2004-09-30 00:49:55 UTC

  FreeBSD src repository

  Modified files:
    sys/netkey           key.c 
  Log:
  Merge netipsec/key.c:1.17 into KAME pfkey implementation:
  
    date: 2004/09/26 02:01:27;  author: sam;  state: Exp;  lines: +0 -5
    Correct handling of SADB_UPDATE and SADB_ADD requests.  key_align may
    split the mbuf due to use of m_pulldown.  Discarding the result because
    of this does not make sense as no subsequent code depends on the entire
    msg being linearized (only the individual pieces).  It's likely
    something else is wrong here but for now this appears to get things back
    to a working state.
  
    Submitted by:   Roselyn Lee
  
  This change was also made in the KAME CVS repository as key.c:1.337 by
  itojun.
  
  Revision  Changes    Path
  1.68      +0 -5      src/sys/netkey/key.c