Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / lib / guid_to_name.h

diff --git a/bacula/src/lib/guid_to_name.h b/bacula/src/lib/guid_to_name.h
index 55515c850c3c152d270901b1d3c513d75cda1afa..bfbecfeb6ef4a04db6d34eeab4ff2a4df6371e6b 100644 (file)
--- a/bacula/src/lib/guid_to_name.h
+++ b/bacula/src/lib/guid_to_name.h
@@ -1,24 +1,27 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2007-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.
 */
 /*
  * Written by Kern Sibbald, July 2007 to replace idcache.c
  *
  *  Program to convert uid and gid into names, and cache the results
  *   for preformance reasons.
- *
  */
 
 class guid_list {