From owner-trustedbsd-cvs@FreeBSD.ORG  Sun Aug  6 15:58:50 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C5EA416A4E6
	for <trustedbsd-cvs@freebsd.org>; Sun,  6 Aug 2006 15:58:50 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5BC3C43D6B
	for <trustedbsd-cvs@freebsd.org>; Sun,  6 Aug 2006 15:58:40 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id C715C46CA7
	for <trustedbsd-cvs@trustedbsd.org>;
	Sun,  6 Aug 2006 11:58:39 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 0BFDC742FB;
	Sun,  6 Aug 2006 15:58:39 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0BA2916A4E8; Sun,  6 Aug 2006 15:58:39 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 B89FD16A4E5
	for <perforce@freebsd.org>; Sun,  6 Aug 2006 15:58:38 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6910343D6A
	for <perforce@freebsd.org>; Sun,  6 Aug 2006 15:58:38 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76FwcME084537
	for <perforce@freebsd.org>; Sun, 6 Aug 2006 15:58:38 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76Fwc4u084534
	for perforce@freebsd.org; Sun, 6 Aug 2006 15:58:38 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 6 Aug 2006 15:58:38 GMT
Message-Id: <200608061558.k76Fwc4u084534@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103344 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Aug 2006 15:58:50 -0000

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

Change 103344 by rwatson@rwatson_zoo on 2006/08/06 15:57:47

	Correct mismerge.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#84 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#84 (text+ko) ====

@@ -354,8 +354,7 @@
 	 */
 	ndp = &nd;
 	NDINIT(ndp, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME | MPSAFE |
-	    SAVESTART,
-	    AUDITVNODE1, UIO_SYSSPACE, args->fname, td);
+	    SAVESTART | AUDITVNODE1, UIO_SYSSPACE, args->fname, td);
 
 interpret:
 	error = namei(ndp);