From owner-cvs-all@FreeBSD.ORG  Fri Oct  1 19:18:55 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A8F5516A4CE; Fri,  1 Oct 2004 19:18:55 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9F55443D1D; Fri,  1 Oct 2004 19:18:55 +0000 (GMT)
	(envelope-from scottl@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 i91JItcM033779;
	Fri, 1 Oct 2004 19:18:55 GMT
	(envelope-from scottl@repoman.freebsd.org)
Received: (from scottl@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i91JItJk033778;
	Fri, 1 Oct 2004 19:18:55 GMT
	(envelope-from scottl)
Message-Id: <200410011918.i91JItJk033778@repoman.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Fri, 1 Oct 2004 19:18:55 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/netkey key.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Oct 2004 19:18:55 -0000

scottl      2004-10-01 19:18:55 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netkey           key.c 
  Log:
  MFC rev 1.68:
  
    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.
  
  Approved by: re
  
  Revision  Changes    Path
  1.65.2.2  +0 -5      src/sys/netkey/key.c