From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 14:38:24 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A0DD216A4D1; Fri,  7 Nov 2003 14:38:24 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7B2BF16A4CE
	for <perforce@freebsd.org>; Fri,  7 Nov 2003 14:38:24 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A730B43FBD
	for <perforce@freebsd.org>; Fri,  7 Nov 2003 14:38:23 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA7McNXJ087878
	for <perforce@freebsd.org>; Fri, 7 Nov 2003 14:38:23 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA7McN61087875
	for perforce@freebsd.org; Fri, 7 Nov 2003 14:38:23 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Fri, 7 Nov 2003 14:38:23 -0800 (PST)
Message-Id: <200311072238.hA7McN61087875@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41670 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Nov 2003 22:38:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=41670

Change 41670 by jhb@jhb_laptop on 2003/11/07 14:37:47

	IFC @41668.

Affected files ...

.. //depot/projects/smpng/sys/security/mac/mac_net.c#4 integrate

Differences ...

==== //depot/projects/smpng/sys/security/mac/mac_net.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.103 2003/11/06 03:42:43 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.104 2003/11/07 22:31:27 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -222,7 +222,7 @@
 
 	MAC_CHECK(init_socket_peer_label, label, flag);
 	if (error) {
-		MAC_PERFORM(destroy_socket_label, label);
+		MAC_PERFORM(destroy_socket_peer_label, label);
 		mac_destroy_label(label);
 	}