diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2002-11-04 01:53:12 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2002-11-04 01:53:12 +0000 |
| commit | dc858fcabedb57c5e9351fdd5a1d994e39b2a88e (patch) | |
| tree | 639f5057a9fa9f0126b0ec5a2fb4253e70459d0f /sys/security/mac_partition | |
| parent | 6201265be74999ef98897240cf638eb2df2f742f (diff) | |
| download | src-dc858fcabedb57c5e9351fdd5a1d994e39b2a88e.tar.gz src-dc858fcabedb57c5e9351fdd5a1d994e39b2a88e.zip | |
License and wording updates: NAI has authorized the removal of clause
three from their BSD-style license. Also, s/NAI Labs/Network Associates
Laboratories/.
Notes
Notes:
svn path=/head/; revision=106393
Diffstat (limited to 'sys/security/mac_partition')
| -rw-r--r-- | sys/security/mac_partition/mac_partition.c | 11 | ||||
| -rw-r--r-- | sys/security/mac_partition/mac_partition.h | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/sys/security/mac_partition/mac_partition.c b/sys/security/mac_partition/mac_partition.c index 1b1ec0b0507d..3465eab8e947 100644 --- a/sys/security/mac_partition/mac_partition.c +++ b/sys/security/mac_partition/mac_partition.c @@ -5,10 +5,10 @@ * * This software was developed by Robert Watson for the TrustedBSD Project. * - * This software was developed for the FreeBSD Project in part by NAI Labs, - * the Security Research Division of Network Associates, Inc. under - * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA - * CHATS research program. + * This software was developed for the FreeBSD Project in part by Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -18,9 +18,6 @@ * 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. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/sys/security/mac_partition/mac_partition.h b/sys/security/mac_partition/mac_partition.h index 669740e08efa..48d271d24dcb 100644 --- a/sys/security/mac_partition/mac_partition.h +++ b/sys/security/mac_partition/mac_partition.h @@ -5,10 +5,10 @@ * * This software was developed by Robert Watson for the TrustedBSD Project. * - * This software was developed for the FreeBSD Project in part by NAI Labs, - * the Security Research Division of Network Associates, Inc. under - * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA - * CHATS research program. + * This software was developed for the FreeBSD Project in part by Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), + * as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -18,9 +18,6 @@ * 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. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |