PERFORCE change 199901 for review

[Zheng Liu]

http://p4web.freebsd.org/@@199901?ac=10

Change 199901 by lz at freebsd-dev on 2011/10/08 10:52:25

	IFC.

Affected files ...

.. //depot/projects/soc2010/extfs/security/mac_mls/mac_mls.c#3 integrate

Differences ...

==== //depot/projects/soc2010/extfs/security/mac_mls/mac_mls.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.115 2011/09/02 17:40:39 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.116 2011/10/08 09:14:18 brueffer Exp $
  */
 
 /*
@@ -1636,9 +1636,6 @@
 	subj = SLOT(cred->cr_label);
 	obj = SLOT(shmlabel);
 
-	subj = SLOT(cred->cr_label);
-	obj = SLOT(shmlabel);
-
 	if (accmode & (VREAD | VEXEC | VSTAT_PERMS)) {
 		if (!mls_dominate_effective(subj, obj))
 			return (EACCES);