Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / lib / rblist.c

diff --git a/bacula/src/lib/rblist.c b/bacula/src/lib/rblist.c
index 81ef484159c1a5058e61c9f5ffb9f0aa4155fe50..04a142b40648e9207dd438217d0ff7d2e07e5164 100644 (file)
--- a/bacula/src/lib/rblist.c
+++ b/bacula/src/lib/rblist.c
@@ -1,17 +1,21 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2005-2014 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 original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  *  Bacula red-black binary tree routines.
@@ -370,7 +374,7 @@ void rblist::destroy()
 #ifdef TEST_PROGRAM
 
 struct MYJCR {
-   void link;
+   rblink link;
    char *buf;
 };