Merge branch 'master' into mvw/1361

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

diff --git a/bacula/src/lib/lib.h b/bacula/src/lib/lib.h
index 0397bd952123f041133f769ac777e91ff5bda8b4..09655c9a85a0f5ad22b39ecd45ac517cf0bb2525 100644 (file)
--- a/bacula/src/lib/lib.h
+++ b/bacula/src/lib/lib.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 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.
@@ -20,7 +20,7 @@
    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.
@@ -36,6 +36,7 @@
  */
 
 #include "smartall.h"
+#include "lockmgr.h"
 #include "alist.h"
 #include "dlist.h"
 #include "rblist.h"
@@ -52,6 +53,7 @@
 #include "lex.h"
 #include "parse_conf.h"
 #include "tls.h"
+#include "address_conf.h"
 #include "bsock.h"
 #include "workq.h"
 #ifndef HAVE_FNMATCH
@@ -66,6 +68,6 @@
 #include "bpipe.h"
 #include "attr.h"
 #include "var.h"
-#include "address_conf.h"
+#include "guid_to_name.h"
 
 #include "protos.h"