Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Aug 2006 15:58:38 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 103344 for review
Message-ID:  <200608061558.k76Fwc4u084534@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608061558.k76Fwc4u084534>