From owner-cvs-src@FreeBSD.ORG  Sat Apr  1 15:16:15 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: 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 609D916A50F;
	Sat,  1 Apr 2006 15:16:15 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1898A43D46;
	Sat,  1 Apr 2006 15:16:15 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k31FGEXJ019183;
	Sat, 1 Apr 2006 15:16:14 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k31FGE4H019182;
	Sat, 1 Apr 2006 15:16:14 GMT (envelope-from rwatson)
Message-Id: <200604011516.k31FGE4H019182@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 1 Apr 2006 15:16:14 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/netinet6 ipsec.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 01 Apr 2006 15:16:15 -0000

rwatson     2006-04-01 15:16:14 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netinet6         ipsec.c 
  Log:
  Merge ipsec.c:1.44 from HEAD to RELENG_6:
  
    Remove manual assignment of m_pkthdr from one mbuf to another in
    ipsec_copypkt(), as this is already handled by the call to
    M_MOVE_PKTHDR(), which also knows how to correctly handle MAC m_tags.
    This corrects a panic when running with MAC and KAME IPSEC.
  
    PR:             kern/94599
    Submitted by:   zhouyi zhou <zhouyi04 at ios dot cn>
    Reviewed by:    bz, gnn
  
  Approved by:    re (mux)
  
  Revision  Changes    Path
  1.42.2.2  +0 -9      src/sys/netinet6/ipsec.c