PERFORCE change 36570 for review

[Robert Watson]

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

Change 36570 by rwatson at rwatson_tislabs on 2003/08/21 07:50:13

	Loop-back integration of deleteextattr and listextattr changes
	from the FreeBSD tree.  Also, a minor fd fix since it came for
	free.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#401 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#110 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#219 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#74 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#177 integrate

Differences ...

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

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.95 2003/08/20 19:16:49 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.96 2003/08/21 13:52:59 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_devfs.h"

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

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.329 2003/08/05 00:26:51 iedowse Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.331 2003/08/21 13:53:01 rwatson Exp $");
 
 /* For 4.3 integer FS ID compatibility */
 #include "opt_compat.h"
@@ -679,7 +679,7 @@
 	fp = nfp;
 	cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT;
 	NDINIT(&nd, LOOKUP, FOLLOW, pathseg, path, td);
-	td->td_dupfd = -indx - 1;		/* XXX check for fdopen */
+	td->td_dupfd = -1;		/* XXX check for fdopen */
 	/*
 	 * Bump the ref count to prevent another process from closing
 	 * the descriptor while we are blocked in vn_open()

==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#219 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.63 2003/07/31 18:35:43 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.64 2003/08/21 14:34:54 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#74 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.15 2003/07/05 01:24:36 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.16 2003/08/21 14:34:54 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.

==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#177 (text+ko) ====

@@ -31,7 +31,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.51 2003/07/31 20:00:06 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.52 2003/08/21 14:34:54 rwatson Exp $
  */
 
 /*
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message