aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOsier Yang <jyang@redhat.com>2012-07-21 18:06:23 +0800
committerOsier Yang <jyang@redhat.com>2012-07-23 10:50:50 +0800
commitf9ce7dad60e9988e0d7ed9b7a70a39af5f9cb5cf (patch)
tree8e6af29b24405376cee739f3744573941454dec4 /src/security
parentESX: Fix ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY (diff)
downloadlibvirt-f9ce7dad60e9988e0d7ed9b7a70a39af5f9cb5cf.tar.gz
libvirt-f9ce7dad60e9988e0d7ed9b7a70a39af5f9cb5cf.tar.bz2
libvirt-f9ce7dad60e9988e0d7ed9b7a70a39af5f9cb5cf.zip
Desert the FSF address in copyright
Per the FSF address could be changed from time to time, and GNU recommends the following now: (http://www.gnu.org/licenses/gpl-howto.html) You should have received a copy of the GNU General Public License along with Foobar. If not, see <http://www.gnu.org/licenses/>. This patch removes the explicit FSF address, and uses above instead (of course, with inserting 'Lesser' before 'General'). Except a bunch of files for security driver, all others are changed automatically, the copyright for securify files are not complete, that's why to do it manually: src/security/security_selinux.h src/security/security_driver.h src/security/security_selinux.c src/security/security_apparmor.h src/security/security_apparmor.c src/security/security_driver.c
Diffstat (limited to 'src/security')
-rw-r--r--src/security/security_apparmor.c10
-rw-r--r--src/security/security_apparmor.h10
-rw-r--r--src/security/security_dac.c4
-rw-r--r--src/security/security_dac.h4
-rw-r--r--src/security/security_driver.c9
-rw-r--r--src/security/security_driver.h9
-rw-r--r--src/security/security_manager.c4
-rw-r--r--src/security/security_manager.h4
-rw-r--r--src/security/security_nop.c4
-rw-r--r--src/security/security_nop.h4
-rw-r--r--src/security/security_selinux.c9
-rw-r--r--src/security/security_selinux.h9
-rw-r--r--src/security/security_stack.c4
-rw-r--r--src/security/security_stack.h4
14 files changed, 71 insertions, 17 deletions
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 8c95f78e7..338523276 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -1,5 +1,6 @@
/*
* AppArmor security driver for libvirt
+ *
* Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2009-2010 Canonical Ltd.
*
@@ -8,6 +9,15 @@
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
* Author:
* Jamie Strandboge <jamie@canonical.com>
* Based on security_selinux.c by James Morris <jmorris@namei.org>
diff --git a/src/security/security_apparmor.h b/src/security/security_apparmor.h
index ffd82889b..d0dd0a19a 100644
--- a/src/security/security_apparmor.h
+++ b/src/security/security_apparmor.h
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2009 Canonical Ltd.
*
@@ -7,6 +6,15 @@
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
* Author:
* Jamie Strandboge <jamie@canonical.com>
*
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 9182b39c9..f398c3fa6 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -12,8 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
*
* POSIX DAC security driver
*/
diff --git a/src/security/security_dac.h b/src/security/security_dac.h
index ccd9d1c9e..b312b0372 100644
--- a/src/security/security_dac.h
+++ b/src/security/security_dac.h
@@ -12,8 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
*
* POSIX DAC security driver
*/
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 5cc61782d..7ff5f1786 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -6,6 +6,15 @@
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
* Authors:
* James Morris <jmorris@namei.org>
* Dan Walsh <dwalsh@redhat.com>
diff --git a/src/security/security_driver.h b/src/security/security_driver.h
index c68615d7c..e459adacd 100644
--- a/src/security/security_driver.h
+++ b/src/security/security_driver.h
@@ -6,6 +6,15 @@
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
* Authors:
* James Morris <jmorris@namei.org>
*
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index e7d036096..2e1be4ddb 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -14,8 +14,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
*
* Author: Daniel P. Berrange <berrange@redhat.com>
*/
diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index af16e7597..36d801b6a 100644
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -14,8 +14,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
*
* Author: Daniel P. Berrange <berrange@redhat.com>
*/
diff --git a/src/security/security_nop.c b/src/security/security_nop.c
index 5f90df32c..a6b18da42 100644
--- a/src/security/security_nop.c
+++ b/src/security/security_nop.c
@@ -12,8 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
*
*/
diff --git a/src/security/security_nop.h b/src/security/security_nop.h
index 589a75d7c..24d5d0a7c 100644
--- a/src/security/security_nop.h
+++ b/src/security/security_nop.h
@@ -12,8 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
*
*/
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 131c05846..ca19b7096 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -6,6 +6,15 @@
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
* Authors:
* James Morris <jmorris@namei.org>
* Dan Walsh <dwalsh@redhat.com>
diff --git a/src/security/security_selinux.h b/src/security/security_selinux.h
index aa674216e..09d7ef601 100644
--- a/src/security/security_selinux.h
+++ b/src/security/security_selinux.h
@@ -6,6 +6,15 @@
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
* Authors:
* James Morris <jmorris@namei.org>
*
diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 65d30d6bb..65d9dd749 100644
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -12,8 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
*
* Stacked security driver
*/
diff --git a/src/security/security_stack.h b/src/security/security_stack.h
index bc83ff398..fd0d26f19 100644
--- a/src/security/security_stack.h
+++ b/src/security/security_stack.h
@@ -12,8 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
*
* Stacked security driver
*/