PERFORCE change 40228 for review

[Robert Watson]

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

Change 40228 by rwatson at rwatson_paprika on 2003/10/22 18:41:15

	Intregrate trustedbsd_sebsd forward ever so slightly to
	trustedbsd_mac/... at 36694, sans deletions.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/trustedbsd/sebsd/sys/netinet/ip_icmp.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/sys/netinet/tcp_subr.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/sys/security/mac_none/mac_none.c#4 integrate

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#7 (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"
@@ -680,7 +680,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/sebsd/sys/netinet/ip_icmp.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.78 2003/03/21 15:43:06 mdodd Exp $
+ * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.79 2003/08/21 18:39:15 rwatson Exp $
  */
 
 #include "opt_ipsec.h"

==== //depot/projects/trustedbsd/sebsd/sys/netinet/tcp_subr.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.160 2003/05/07 05:26:27 rwatson Exp $
+ * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.161 2003/08/21 18:39:16 rwatson Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/trustedbsd/sebsd/sys/security/mac_bsdextended/mac_bsdextended.c#5 (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/sebsd/sys/security/mac_none/mac_none.c#4 (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_none/mac_none.c,v 1.29 2003/06/23 01:26:34 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_none/mac_none.c,v 1.30 2003/08/21 16:19:17 rwatson Exp $
  */
 
 /*
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message