d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

License and wording updates: NAI has authorized the removal of clause

Browse Source 
three from their BSD-style license.  Also, s/NAI Labs/Network Associates
Laboratories/.
This commit is contained in:
rwatson 2002-11-04 01:53:12 +00:00
parent 89cdee7c52
commit c7ea6f5cb9
13 changed files with 52 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/security/mac_biba/mac_biba.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_biba/mac_biba.h
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_bsdextended/mac_bsdextended.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_bsdextended/mac_bsdextended.h
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_ifoff/mac_ifoff.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_mls/mac_mls.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_mls/mac_mls.h
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_none/mac_none.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_partition/mac_partition.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_partition/mac_partition.h
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_seeotheruids/mac_seeotheruids.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_stub/mac_stub.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

11
sys/security/mac_test/mac_test.c
View File

@ -5,10 +5,10 @@
* *
* This software was developed by Robert Watson for the TrustedBSD Project. * This software was developed by Robert Watson for the TrustedBSD Project.
* *
* This software was developed for the FreeBSD Project in part by NAI Labs, * This software was developed for the FreeBSD Project in part by Network
* the Security Research Division of Network Associates, Inc. under * Associates Laboratories, the Security Research Division of Network
* DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
* CHATS research program. * as part of the DARPA CHATS research program.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -18,9 +18,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE