From owner-cvs-all@FreeBSD.ORG  Sat Dec 22 20:06:55 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B03516A418;
	Sat, 22 Dec 2007 20:06:55 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 296BD13C4D9;
	Sat, 22 Dec 2007 20:06:55 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBMK6slN058528;
	Sat, 22 Dec 2007 20:06:54 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBMK6svR058527;
	Sat, 22 Dec 2007 20:06:54 GMT (envelope-from rwatson)
Message-Id: <200712222006.lBMK6svR058527@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 22 Dec 2007 20:06:54 +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/netinet in_pcb.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 22 Dec 2007 20:06:55 -0000

rwatson     2007-12-22 20:06:54 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netinet          in_pcb.c 
  Log:
  Merge in_pcb.c:1.198 from HEAD to RELENG_6:
  
    When IPSEC fails to allocate policy state for an inpcb, and MAC is in use,
    free the MAC label on the inpcb before freeing the inpcb.
  
    Submitted by:   tanyong <tanyong at ercist dot iscas dot ac dot cn>,
                    zhouzhouyi
  
  Approved by:    re (kensmith)
  
  Revision   Changes    Path
  1.165.2.7  +5 -1      src/sys/netinet/in_pcb.c