From 0b7514598b09c0d5891435e5e9e9e888443bc852 Mon Sep 17 00:00:00 2001 From: green Date: Mon, 19 Nov 2001 04:56:36 +0000 Subject: Fix a license and change $Id$s to $FreeBSD$s. Obtained from: DARPA, NAI Labs (CBOSS project) --- sys/contrib/lomac/kernel_interface.c | 2 +- sys/contrib/lomac/kernel_interface.h | 2 +- sys/contrib/lomac/kernel_lkm.c | 2 +- sys/contrib/lomac/kernel_log.c | 2 +- sys/contrib/lomac/kernel_log.h | 2 +- sys/contrib/lomac/kernel_mediate.c | 2 +- sys/contrib/lomac/kernel_mediate.h | 2 +- sys/contrib/lomac/kernel_mmap.c | 1 - sys/contrib/lomac/kernel_monitor.c | 2 +- sys/contrib/lomac/kernel_monitor.h | 2 +- sys/contrib/lomac/kernel_pipe.c | 61 +++++++++++++++++------------------- sys/contrib/lomac/kernel_pipe.h | 2 +- sys/contrib/lomac/kernel_plm.c | 2 +- sys/contrib/lomac/kernel_plm.h | 2 +- sys/contrib/lomac/kernel_socket.c | 2 +- sys/contrib/lomac/kernel_socket.h | 2 +- sys/contrib/lomac/kernel_util.c | 2 +- sys/contrib/lomac/kernel_util.h | 2 +- sys/contrib/lomac/lomac.h | 2 +- sys/contrib/lomac/lomacfs.h | 2 +- sys/contrib/lomac/lomacfs_subr.c | 2 +- sys/contrib/lomac/lomacfs_vfsops.c | 2 +- sys/contrib/lomac/lomacfs_vnops.c | 2 +- sys/contrib/lomac/lomacio.h | 2 +- sys/contrib/lomac/policy_plm.h | 2 +- sys/contrib/lomac/syscall_gate.c | 2 +- sys/contrib/lomac/syscall_gate.h | 2 +- 27 files changed, 54 insertions(+), 58 deletions(-) (limited to 'sys/contrib') diff --git a/sys/contrib/lomac/kernel_interface.c b/sys/contrib/lomac/kernel_interface.c index a825f3a..8069a16 100644 --- a/sys/contrib/lomac/kernel_interface.c +++ b/sys/contrib/lomac/kernel_interface.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_interface.c,v 1.25 2001/10/25 21:21:59 tfraser Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/kernel_interface.h b/sys/contrib/lomac/kernel_interface.h index 751bc59..f96d9fa 100644 --- a/sys/contrib/lomac/kernel_interface.h +++ b/sys/contrib/lomac/kernel_interface.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_interface.h,v 1.21 2001/10/15 17:58:32 bfeldman Exp $ + * $FreeBSD$ */ #ifndef KERNEL_INTERFACE_H #define KERNEL_INTERFACE_H diff --git a/sys/contrib/lomac/kernel_lkm.c b/sys/contrib/lomac/kernel_lkm.c index 15addcd..1fb4fb2 100644 --- a/sys/contrib/lomac/kernel_lkm.c +++ b/sys/contrib/lomac/kernel_lkm.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_lkm.c,v 1.26 2001/11/14 16:30:17 bfeldman Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/kernel_log.c b/sys/contrib/lomac/kernel_log.c index 59a7d7c..280b9ba 100644 --- a/sys/contrib/lomac/kernel_log.c +++ b/sys/contrib/lomac/kernel_log.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_log.c,v 1.12 2001/10/17 15:19:26 bfeldman Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/kernel_log.h b/sys/contrib/lomac/kernel_log.h index 66cf562..b4f8de5 100644 --- a/sys/contrib/lomac/kernel_log.h +++ b/sys/contrib/lomac/kernel_log.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_log.h,v 1.5 2001/09/20 21:29:21 tfraser Exp $ + * $FreeBSD$ */ #ifndef _KERNEL_LOG_H_ diff --git a/sys/contrib/lomac/kernel_mediate.c b/sys/contrib/lomac/kernel_mediate.c index c28ce00..c13fa74 100644 --- a/sys/contrib/lomac/kernel_mediate.c +++ b/sys/contrib/lomac/kernel_mediate.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_mediate.c,v 1.9 2001/10/17 15:19:40 bfeldman Exp $ + * $FreeBSD$ */ /* diff --git a/sys/contrib/lomac/kernel_mediate.h b/sys/contrib/lomac/kernel_mediate.h index 2721292..f1a9962 100644 --- a/sys/contrib/lomac/kernel_mediate.h +++ b/sys/contrib/lomac/kernel_mediate.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_mediate.h,v 1.5 2001/09/26 21:18:00 bfeldman Exp $ + * $FreeBSD$ */ #ifndef _KERNEL_MEDIATE_H_ diff --git a/sys/contrib/lomac/kernel_mmap.c b/sys/contrib/lomac/kernel_mmap.c index c0217fb..9772a90 100644 --- a/sys/contrib/lomac/kernel_mmap.c +++ b/sys/contrib/lomac/kernel_mmap.c @@ -40,7 +40,6 @@ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 * $FreeBSD$ - * $Id: kernel_mmap.c,v 1.12 2001/10/17 15:34:29 bfeldman Exp $ */ #include diff --git a/sys/contrib/lomac/kernel_monitor.c b/sys/contrib/lomac/kernel_monitor.c index 199b8a0..c3a6bf8 100644 --- a/sys/contrib/lomac/kernel_monitor.c +++ b/sys/contrib/lomac/kernel_monitor.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_monitor.c,v 1.12 2001/10/16 15:25:02 bfeldman Exp $ + * $FreeBSD$ */ /* diff --git a/sys/contrib/lomac/kernel_monitor.h b/sys/contrib/lomac/kernel_monitor.h index e2bab47..657ca55 100644 --- a/sys/contrib/lomac/kernel_monitor.h +++ b/sys/contrib/lomac/kernel_monitor.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_monitor.h,v 1.5 2001/09/26 23:00:44 tfraser Exp $ + * $FreeBSD$ */ #ifndef _LOMAC_MONITOR_H_ diff --git a/sys/contrib/lomac/kernel_pipe.c b/sys/contrib/lomac/kernel_pipe.c index c85b0ca..adb1a63 100644 --- a/sys/contrib/lomac/kernel_pipe.c +++ b/sys/contrib/lomac/kernel_pipe.c @@ -1,35 +1,32 @@ -/************************************************************************* - * - * kernel_pipe.c - * - * LOMAC - Low Water-Mark Mandatory Access Control - * Copyright (c) 1999-2001 Networks Associates, Inc. All rights reserved. - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * Neither the name of NAI Labs, Inc. nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * - * +/*- + * Copyright (c) 2001 Networks Associates Technology, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* * This file contains part of LOMAC's interface to the kernel. This * part allows LOMAC to monitor (unnamed) pipe read and write * operations by interposing control on the kernel's pipeops vector. diff --git a/sys/contrib/lomac/kernel_pipe.h b/sys/contrib/lomac/kernel_pipe.h index 5b566f6..64a367d 100644 --- a/sys/contrib/lomac/kernel_pipe.h +++ b/sys/contrib/lomac/kernel_pipe.h @@ -31,7 +31,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: kernel_pipe.h,v 1.1 2001/09/20 21:29:21 tfraser Exp $ + * $FreeBSD$ * * Public interface to kernel_pipe.c, the part of the LOMAC kernel * interface that takes control of operations on unnamed pipes. diff --git a/sys/contrib/lomac/kernel_plm.c b/sys/contrib/lomac/kernel_plm.c index 38777c3..47a3161 100644 --- a/sys/contrib/lomac/kernel_plm.c +++ b/sys/contrib/lomac/kernel_plm.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_plm.c,v 1.9 2001/10/17 15:20:09 bfeldman Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/kernel_plm.h b/sys/contrib/lomac/kernel_plm.h index 16db2dd..89dc2c9 100644 --- a/sys/contrib/lomac/kernel_plm.h +++ b/sys/contrib/lomac/kernel_plm.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_plm.h,v 1.4 2001/09/20 17:47:46 bfeldman Exp $ + * $FreeBSD$ */ #ifndef KERNEL_PLM_H #define KERNEL_PLM_H diff --git a/sys/contrib/lomac/kernel_socket.c b/sys/contrib/lomac/kernel_socket.c index ebaf15d..3ca1725 100644 --- a/sys/contrib/lomac/kernel_socket.c +++ b/sys/contrib/lomac/kernel_socket.c @@ -23,7 +23,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: kernel_socket.c,v 1.9 2001/11/05 20:57:41 tfraser Exp $ + * $FreeBSD$ * * This file implements LOMAC controls over socket operations. LOMAC * gains control of socket operations by interposing on the `struct diff --git a/sys/contrib/lomac/kernel_socket.h b/sys/contrib/lomac/kernel_socket.h index 4da513f..62e9f32 100644 --- a/sys/contrib/lomac/kernel_socket.h +++ b/sys/contrib/lomac/kernel_socket.h @@ -21,7 +21,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: kernel_socket.h,v 1.1 2001/09/26 23:00:44 tfraser Exp $ + * $FreeBSD$ * */ diff --git a/sys/contrib/lomac/kernel_util.c b/sys/contrib/lomac/kernel_util.c index 3a46070..3cb648d 100644 --- a/sys/contrib/lomac/kernel_util.c +++ b/sys/contrib/lomac/kernel_util.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_util.c,v 1.22 2001/11/15 20:51:13 bfeldman Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/kernel_util.h b/sys/contrib/lomac/kernel_util.h index 46a9ec9..aa1d3db 100644 --- a/sys/contrib/lomac/kernel_util.h +++ b/sys/contrib/lomac/kernel_util.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kernel_util.h,v 1.4 2001/11/14 16:30:17 bfeldman Exp $ + * $FreeBSD$ */ #ifndef KERNEL_UTIL_H #define KERNEL_UTIL_H diff --git a/sys/contrib/lomac/lomac.h b/sys/contrib/lomac/lomac.h index b16941a..5504a0e 100644 --- a/sys/contrib/lomac/lomac.h +++ b/sys/contrib/lomac/lomac.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lomacfs.h,v 1.20 2001/10/17 15:34:29 bfeldman Exp $ + * $FreeBSD$ */ #ifndef _LOMAC_H_ diff --git a/sys/contrib/lomac/lomacfs.h b/sys/contrib/lomac/lomacfs.h index 621761a..f888073 100644 --- a/sys/contrib/lomac/lomacfs.h +++ b/sys/contrib/lomac/lomacfs.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lomacfs.h,v 1.20 2001/10/17 15:34:29 bfeldman Exp $ + * $FreeBSD$ */ #ifndef LOMACFS_H diff --git a/sys/contrib/lomac/lomacfs_subr.c b/sys/contrib/lomac/lomacfs_subr.c index b58abc1..02db1b9 100644 --- a/sys/contrib/lomac/lomacfs_subr.c +++ b/sys/contrib/lomac/lomacfs_subr.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lomacfs_subr.c,v 1.24 2001/11/05 20:57:41 tfraser Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/lomacfs_vfsops.c b/sys/contrib/lomac/lomacfs_vfsops.c index 381ad2e..76adb27 100644 --- a/sys/contrib/lomac/lomacfs_vfsops.c +++ b/sys/contrib/lomac/lomacfs_vfsops.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lomacfs_vfsops.c,v 1.16 2001/10/17 19:36:39 bfeldman Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/lomacfs_vnops.c b/sys/contrib/lomac/lomacfs_vnops.c index 35c0c84..daae064 100644 --- a/sys/contrib/lomac/lomacfs_vnops.c +++ b/sys/contrib/lomac/lomacfs_vnops.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lomacfs_vnops.c,v 1.44 2001/11/15 20:52:54 bfeldman Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/lomacio.h b/sys/contrib/lomac/lomacio.h index d8ddc25..df46374 100644 --- a/sys/contrib/lomac/lomacio.h +++ b/sys/contrib/lomac/lomacio.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lomacio.h,v 1.4 2001/09/26 21:18:00 bfeldman Exp $ + * $FreeBSD$ */ #ifndef LOMACIO_H #define LOMACIO_H diff --git a/sys/contrib/lomac/policy_plm.h b/sys/contrib/lomac/policy_plm.h index abbd0ad..fe90d09 100644 --- a/sys/contrib/lomac/policy_plm.h +++ b/sys/contrib/lomac/policy_plm.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: policy_plm.h,v 1.20 2001/11/15 20:55:05 bfeldman Exp $ + * $FreeBSD$ */ #ifndef LOMAC_PLM_H diff --git a/sys/contrib/lomac/syscall_gate.c b/sys/contrib/lomac/syscall_gate.c index d979263..7015e3c 100644 --- a/sys/contrib/lomac/syscall_gate.c +++ b/sys/contrib/lomac/syscall_gate.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscall_gate.c,v 1.4 2001/11/05 21:23:12 bfeldman Exp $ + * $FreeBSD$ */ #include diff --git a/sys/contrib/lomac/syscall_gate.h b/sys/contrib/lomac/syscall_gate.h index c6df862..67636bc 100644 --- a/sys/contrib/lomac/syscall_gate.h +++ b/sys/contrib/lomac/syscall_gate.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscall_gate.h,v 1.2 2001/09/20 17:47:46 bfeldman Exp $ + * $FreeBSD$ */ #ifndef SYSCALL_GATE_H -- cgit v1.1