ebl fix segfault with debug mode

[bacula/bacula] / bacula / LICENSE

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 83f25f9a71befc12fa70053d731ef90743ad3f0c..1e49d53535d83ee55b7cc11c63ea3095ae4eb3d1 100644 (file)
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -5,7 +5,7 @@ the copyright was transferred to the Free Software Foundation Europe
 on 15 November 2006.
 
 Trademark:
-The name Bacula is a registered trademark.
+The name Bacula is a registered trademark of Kern Sibbald.
 
 ===================================
 
@@ -13,7 +13,7 @@ License:
 For the most part, Bacula is licensed under the GPL version 2 this
 code is listed under Copyright Free Software Foundation Europe e.V.
 What follows is the addition(s) to the GPL version 2 license, that
-applys to code that is copyrighted by the Free Software Foundation
+applies to code that is copyrighted by the Free Software Foundation
 Europe e.V.
 
 Linking: 
@@ -23,6 +23,21 @@ project's "OpenSSL" library (or with modified versions of it that use
 the same license as the "OpenSSL" library), and distribute the linked
 executables.  You must obey the GNU General Public License in all
 respects for all of the code used other than "OpenSSL".
+
+As a special exception to the GPLv2, the Bacula Project gives
+permission to link the code of its release of the Bacula Win32 File
+daemon with the Microsoft supplied Volume Shadow Copy (VSS) libraries
+and distribute the linked executables.  You must obey the GNU General
+Public License in all respects for all of the code used other than for
+the Microsoft VSS code, where you must obey their license terms.
+
+The Bacula Project gives permission for plugins with GPLv2 compatible
+licenses to be loaded and distributed with the Bacula executables as
+long as the combined work is distributed under the terms listed in the 
+Bacula LICENSE file.  A full list of GPLv2 compatible licenses can be
+found at: http://www.fsf.org/licensing/licenses/.  If you wish to load
+or distribute plugins with different licensing terms please contact
+the Bacula Project at: license@bacula.org
              
 ===================================
 
@@ -36,7 +51,7 @@ with the OpenSSL license, and so with the exception that we have
 made to the GPLv2 above, Bacula can be freely linked and distributed
 with the OpenSSL libraries.
 
-IP rights:
+Intellectual Property rights:
 Recipient understands that although each Contributor grants the
 licenses to its Contributions set forth herein, no assurances are
 provided by any Contributor that the Program does not infringe
@@ -60,7 +75,7 @@ Code falling under the above conditions will be marked as follows:
 
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -79,7 +94,7 @@ Code falling under the above conditions will be marked as follows:
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -107,9 +122,10 @@ copyrighted code.
 GPLv2 or later license:
  src/tools/bsmtp.c
     Copyright (C) 1997 Ralf S. Engelschall, All Rights Reserved.
-  (note, bsmtp.c does not use OpenSSL)
+  (note, bsmtp.c does not use OpenSSL, nor is it used with the code
+   of any other part of Bacula)
 
-BSD License notice for inclusion with the binary:
+3 clause BSD License notice for inclusion with the binary:              
  src/lib/fnmatch.c
    * Copyright (c) 1989, 1993, 1994
    *      The Regents of the University of California.  All rights reserved.
@@ -148,7 +164,7 @@ that contains cryptographic software written by Eric Young
 (tjh@cryptsoft.com).
 
 There are parts of Bacula that are licensed under the LGPL so
-that they may be used in proprietary code to interface with
+that those files may be used in proprietary code to interface with
 Bacula.
 
 Finally there are parts of Bacula that are in the public domain.