ebl Fix segfault in debug level > 50 with btape.

[bacula/bacula] / bacula / LICENSE

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 12d4c662a943d3eca6615832b8484790d2a4728c..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:
 on 15 November 2006.
 
 Trademark:

-The name Bacula is a registered trademark.
+The name Bacula is a registered trademark of Kern Sibbald.

 
 ===================================
 
 
 ===================================
 


@@ -75,7 +75,7 @@ Code falling under the above conditions will be marked as follows:
 
    Bacula® - The Network Backup Solution
 
 
    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.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.


@@ -94,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.
 
    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.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.


@@ -122,9 +122,10 @@ copyrighted code.
 GPLv2 or later license:
  src/tools/bsmtp.c
     Copyright (C) 1997 Ralf S. Engelschall, All Rights Reserved.
 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.
  src/lib/fnmatch.c
    * Copyright (c) 1989, 1993, 1994
    *      The Regents of the University of California.  All rights reserved.


@@ -163,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
 (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.
 Bacula.
 
 Finally there are parts of Bacula that are in the public domain.