diff options
author | rwatson <rwatson@FreeBSD.org> | 2002-11-04 01:42:39 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2002-11-04 01:42:39 +0000 |
commit | 89cdee7c525a284d889f82ae3de3e524d2f838a3 (patch) | |
tree | 259e5b24353d5f02bb0f8c1f7f37f36e646d6ea1 /sys/security/mac/mac_pipe.c | |
parent | 28918016b43014fb49091b78752ed45b3629b21d (diff) | |
download | FreeBSD-src-89cdee7c525a284d889f82ae3de3e524d2f838a3.zip FreeBSD-src-89cdee7c525a284d889f82ae3de3e524d2f838a3.tar.gz |
License clarification and wording changes: NAI has approved removal of
clause three, and NAI Labs now goes by the name Network Associates
Laboratories.
Diffstat (limited to 'sys/security/mac/mac_pipe.c')
-rw-r--r-- | sys/security/mac/mac_pipe.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index ff5c43a..ea9bdb3 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -7,10 +7,10 @@ * This software was developed by Robert Watson and Ilmar Habibulin 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 @@ -20,9 +20,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 |