From owner-cvs-src@FreeBSD.ORG  Mon Jul 24 23:41:38 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 E70BA16A4DA;
	Mon, 24 Jul 2006 23:41:38 +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 A160A43D53;
	Mon, 24 Jul 2006 23:41:38 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6ONfcmB053765;
	Mon, 24 Jul 2006 23:41:38 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6ONfcqU053764;
	Mon, 24 Jul 2006 23:41:38 GMT (envelope-from rwatson)
Message-Id: <200607242341.k6ONfcqU053764@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 24 Jul 2006 23:41:38 +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/kern sysv_shm.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: Mon, 24 Jul 2006 23:41:39 -0000

rwatson     2006-07-24 23:41:38 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/kern             sysv_shm.c 
  Log:
  Merge sysv_shm.c:1.104 from HEAD to RELENG_6:
  
    Re-order MAC and DAC checks in shmget() in order to give precedence to
    the MAC result, as well as avoid losing the DAC check result when MAC
    is enabled.
  
    Reported by:    Patrick LeBlanc <Patrick dot LeBlanc at sparta dot com>
  
  Reminded by:    shangjie dot li at gmail dot com
  
  Revision   Changes    Path
  1.102.2.2  +4 -2      src/sys/kern/sysv_shm.c