From owner-svn-src-stable-6@FreeBSD.ORG  Wed Oct 22 09:28:57 2008
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3E0E1065674;
	Wed, 22 Oct 2008 09:28:57 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A15828FC17;
	Wed, 22 Oct 2008 09:28:57 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9M9SvdG024453;
	Wed, 22 Oct 2008 09:28:57 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9M9SvPO024452;
	Wed, 22 Oct 2008 09:28:57 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200810220928.m9M9SvPO024452@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 22 Oct 2008 09:28:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184158 - in stable/6/sys: . security/mac_partition
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Oct 2008 09:28:57 -0000

Author: bz
Date: Wed Oct 22 09:28:57 2008
New Revision: 184158
URL: http://svn.freebsd.org/changeset/base/184158

Log:
  MFC: r183970
  
    Use the label from the socket credential rather than the
    solabel which was not set by the mac_partition policy.
  
  Approved by:	re (rwatson)

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/security/mac_partition/mac_partition.c

Modified: stable/6/sys/security/mac_partition/mac_partition.c
==============================================================================
--- stable/6/sys/security/mac_partition/mac_partition.c	Wed Oct 22 09:11:35 2008	(r184157)
+++ stable/6/sys/security/mac_partition/mac_partition.c	Wed Oct 22 09:28:57 2008	(r184158)
@@ -244,7 +244,7 @@ mac_partition_check_socket_visible(struc
 {
 	int error;
 
-	error = label_on_label(cred->cr_label, socketlabel);
+	error = label_on_label(cred->cr_label, socket->so_cred->cr_label);
 
 	return (error ? ENOENT : 0);
 }