PERFORCE change 36620 for review

[Robert Watson]

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

Change 36620 by rwatson at rwatson_tislabs on 2003/08/21 11:49:29

	Loop-back integration of the icmp/tcp reflect MAC entry points from
	the TrustedBSD base branch to the TrustedBSD MAC branch.  These
	entry points are now in sync with the base FreeBSD tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#402 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#35 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#66 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac.h#241 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#194 integrate

Differences ...

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

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

==== //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#21 (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/mac/sys/netinet/tcp_subr.c#35 (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/mac/sys/security/mac_lomac/mac_lomac.c#66 (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_lomac/mac_lomac.c,v 1.16 2003/07/05 01:24:36 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.17 2003/08/21 18:07:52 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.

==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#241 (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/sys/mac.h,v 1.41 2003/08/21 13:52:59 rwatson Exp $
+ * $FreeBSD: src/sys/sys/mac.h,v 1.42 2003/08/21 18:21:22 rwatson Exp $
  */
 /*
  * Userland/kernel interface for Mandatory Access Control.

==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#194 (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/sys/mac_policy.h,v 1.42 2003/08/21 13:52:59 rwatson Exp $
+ * $FreeBSD: src/sys/sys/mac_policy.h,v 1.43 2003/08/21 18:21:22 rwatson Exp $
  */
 /*
  * Kernel interface for MAC policy modules.
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message