kes Change Bacula trademark owner from John Walker to Kern Sibbald

kes  First non-working cut of vbackup
kes  Correct FD heartbeat code to use volatile variable accessed by
     two threads.
kes  Zero thread id with memset if on Win32 in case it is a struct.
kes  If cannot create JobMedia record, continue to try to write eof
     and clean up in block.c

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7380 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 6f3eee71a1335823b69ea6f69b1a125e1cb36c3f..3588de3fd2584267e5fe6ed8c78bc992877582c9 100644 (file)
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -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.
 
-   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.

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index c0e6ef087da90731f45af374ab0721dadc891528..415c0e46342cd1d0bf4fd2b4a4c5a6958e84e0e8 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -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.
@@ -89,6 +89,7 @@ void InitWinAPIWrapper();
 
 #define sbrk(x)  0
 
+#define clear_thread_id(x) memset(&(x), 0, sizeof(x))
 
 #if defined(BUILDING_DLL)
 #  define DLL_IMP_EXP   _declspec(dllexport)
@@ -106,6 +107,8 @@ void InitWinAPIWrapper();
 
 #else  /* HAVE_WIN32 */
 
+#define clear_thread_id(x) x = 0
+
 #define DLL_IMP_EXP
 #define CATS_IMP_EXP
 

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 00275e1799e56b7102e41cee514acc09f9b2b219..e54f653c856b913bc6ff2fdb02b7d036d5f954af 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -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.

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index bd63176d301350e03e1bbaed587a8f5c71012bbf..c90392f046d5a71bd309e36e23a49becfb248fda 100644 (file)
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -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.

diff --git a/bacula/src/c b/bacula/src/c
index 6896dcd360092a63b618214b907273080f9ef1ab..96589d45e3574e49aec329fec9d3380eb6d1f380 100644 (file)
--- a/bacula/src/c
+++ b/bacula/src/c
@@ -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.

diff --git a/bacula/src/cats/bdb.c b/bacula/src/cats/bdb.c
index b077a5193441cdd222e45712ba6c6f736a77b125..9eecde839e2fe4a5524e3ec5f2b74a772a4ee391 100644 (file)
--- a/bacula/src/cats/bdb.c
+++ b/bacula/src/cats/bdb.c
@@ -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.

diff --git a/bacula/src/cats/bdb_create.c b/bacula/src/cats/bdb_create.c
index b65c0f2a96e2239f073958e7f0c4e515a04078b4..e84d0930863631bf5f8af1f6f0401bfe604e79b5 100644 (file)
--- a/bacula/src/cats/bdb_create.c
+++ b/bacula/src/cats/bdb_create.c
@@ -34,7 +34,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.

diff --git a/bacula/src/cats/bdb_delete.c b/bacula/src/cats/bdb_delete.c
index 9a6c5db65d23c7036f157646c157f02dc8a6a54d..aa404f1199eaae6c0d768228f2990799814b057a 100644 (file)
--- a/bacula/src/cats/bdb_delete.c
+++ b/bacula/src/cats/bdb_delete.c
@@ -34,7 +34,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.

diff --git a/bacula/src/cats/bdb_find.c b/bacula/src/cats/bdb_find.c
index 1aaa14e159dbf61c9df74ff3e29b11a75334d679..8c18e8ec5ca8faa230576da472bb23574b47dce7 100644 (file)
--- a/bacula/src/cats/bdb_find.c
+++ b/bacula/src/cats/bdb_find.c
@@ -38,7 +38,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.

diff --git a/bacula/src/cats/bdb_get.c b/bacula/src/cats/bdb_get.c
index 73657a1458b3f2b51f8a86415dd800b056ef2670..b2563f0066fd356b9c39c9834c880bc54f417405 100644 (file)
--- a/bacula/src/cats/bdb_get.c
+++ b/bacula/src/cats/bdb_get.c
@@ -37,7 +37,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.

diff --git a/bacula/src/cats/bdb_list.c b/bacula/src/cats/bdb_list.c
index 03e662e8dfcea387b5875e89baf28728abdb169b..dd485919d50ed06a9df6a9f9770fae5259564ace 100644 (file)
--- a/bacula/src/cats/bdb_list.c
+++ b/bacula/src/cats/bdb_list.c
@@ -34,7 +34,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.

diff --git a/bacula/src/cats/bdb_update.c b/bacula/src/cats/bdb_update.c
index a9c0e530ef56089feb3fe9bfc6e741ec7748730b..e6d976f3543792b1aac0bff177c49a350f99c75c 100644 (file)
--- a/bacula/src/cats/bdb_update.c
+++ b/bacula/src/cats/bdb_update.c
@@ -35,7 +35,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.

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 343e34ab6716b9b52999793e008ae1e2608d9eab..f79a173fc162e5be561d518a5170662776d3ff0a 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -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.

diff --git a/bacula/src/cats/dbi.c b/bacula/src/cats/dbi.c
index 6cdaf88b2bce8b5f96e9a259fad3befddce5b65b..4638689a5a68b17b2ef009746a696f1ccf21c941 100644 (file)
--- a/bacula/src/cats/dbi.c
+++ b/bacula/src/cats/dbi.c
@@ -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.

diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c
index 514f7103d02df3d34467a4f67450100be6614916..622ff003f4a85b65a4f981ad4f8120d32b080eab 100644 (file)
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -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.

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index a280857652b056deab1deb4eff2eec02cb6dfa6b..7229f9900686f60f69ab2b5ffba2dd604ee390cc 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -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.

diff --git a/bacula/src/cats/protos.h b/bacula/src/cats/protos.h
index 2b4ecc8ed04a74791386ee96a9de43e9de2d28f2..f0be9787ae15c6ee206bb8edb5986dae1b7901b0 100644 (file)
--- a/bacula/src/cats/protos.h
+++ b/bacula/src/cats/protos.h
@@ -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.

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index 263b0714347baa6701c92d8de9bfbe9d22d5de3a..f208299d6034c7555018dbe646509ec05d4284e0 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -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.

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index d674e3ee1af1ff5221403edcb63a8e18f924925b..da02db7cd4441ef7bd4e8397e7047b51884e5b2c 100644 (file)
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -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.

diff --git a/bacula/src/cats/sql_cmds.h b/bacula/src/cats/sql_cmds.h
index c9cf8e5de20f48c53e6ac762b93f2dd96c705dd5..930c4b1b5917b9a1d3e42a5897a36bd463e54d7a 100644 (file)
--- a/bacula/src/cats/sql_cmds.h
+++ b/bacula/src/cats/sql_cmds.h
@@ -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.

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 539ffea8840d827cded137dd46b2b6a66cb41b92..3f1e53b39abc63e668eb650ebbac6d02e67a6ec2 100644 (file)
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -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.

diff --git a/bacula/src/cats/sql_delete.c b/bacula/src/cats/sql_delete.c
index 676ae861ee9403c1646e4e34982608e4f9590142..4d78bb91f1955066a44e8b782d2c5fcf15d6514d 100644 (file)
--- a/bacula/src/cats/sql_delete.c
+++ b/bacula/src/cats/sql_delete.c
@@ -27,7 +27,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.

diff --git a/bacula/src/cats/sql_find.c b/bacula/src/cats/sql_find.c
index 2edba5d0deeadd0b346e8df358ce07c63acccaae..97866547d41381d41dea871dd7ab8275264e45fe 100644 (file)
--- a/bacula/src/cats/sql_find.c
+++ b/bacula/src/cats/sql_find.c
@@ -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.

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 468c9e628e8274e20b6ea44ad1d597760cac549e..84611b7f368833f8bca046885ad52be0c26553a1 100644 (file)
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -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.

diff --git a/bacula/src/cats/sql_list.c b/bacula/src/cats/sql_list.c
index ec3e505abec0ad4c540305be171a9861c22e22af..a4a94d10f97c1f0942ab171919ca12f1461363c9 100644 (file)
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -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.

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index fa605998f7c20e5d08bb62f90f7252c177e93b5a..a729a2cc1c4010091cf4d76e3276360ef22628a3 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -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.

diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index a03691fed1c46bacecb19f576a64fecf400f1c2d..af9860091feb90b3e79546bddd07f8d2911b1cc0 100644 (file)
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -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.

diff --git a/bacula/src/cl b/bacula/src/cl
index b7bca2315f6b25b4968dd1b569eb2f89153bec25..bf810ea2ec9788b8834306764d806d8b47bee4c9 100644 (file)
--- a/bacula/src/cl
+++ b/bacula/src/cl
@@ -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.

diff --git a/bacula/src/console/authenticate.c b/bacula/src/console/authenticate.c
index abea3cff4a074dfba3fa6cd82239574e76d0f20e..bf17f3f7a224b64d8f1f93e23bf4760b8823a3ad 100644 (file)
--- a/bacula/src/console/authenticate.c
+++ b/bacula/src/console/authenticate.c
@@ -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.

diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c
index f8dbfa9be9e00b3753028c757942c7920dd079df..33ff8f77fa9e4f14b86b88fea00deb2cf0cd6668 100755 (executable)
--- a/bacula/src/console/conio.c
+++ b/bacula/src/console/conio.c
@@ -31,7 +31,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.

diff --git a/bacula/src/console/conio.h b/bacula/src/console/conio.h
index 967372b4d6d3a85d6bb51daca01290df32454eb4..22cd78abdec49b2f10af94c0f119300e97f5c378 100644 (file)
--- a/bacula/src/console/conio.h
+++ b/bacula/src/console/conio.h
@@ -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.

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 91849d6280df2aac8cb0c8d0b703e451b0e56f28..c81252fe1f27f0d29378e378c5d0f8cd52b86988 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -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.

diff --git a/bacula/src/console/console_conf.c b/bacula/src/console/console_conf.c
index b2e1e0678da4039819760ac94a5c27d92df5c6cf..ec40512c3fa1a0bc2116d727564a6ea93712f15b 100644 (file)
--- a/bacula/src/console/console_conf.c
+++ b/bacula/src/console/console_conf.c
@@ -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.

diff --git a/bacula/src/console/console_conf.h b/bacula/src/console/console_conf.h
index ad116c68e4b9a8bd712b3f1d7b3f22a7ace6e23d..a92a0a843be3a0ec965c7bcb5ed31e403b0b3498 100644 (file)
--- a/bacula/src/console/console_conf.h
+++ b/bacula/src/console/console_conf.h
@@ -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.

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index d202384b28d8ad077f640a5b1ac89110afc58092..0baca1b1e4b6f76837457c373e4470c986d40c03 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -41,7 +41,7 @@ SVRSRCS = dird.c admin.c authenticate.c \
          ua_input.c ua_label.c ua_output.c ua_prune.c \
          ua_purge.c ua_restore.c ua_run.c \
          ua_select.c ua_server.c \
-         ua_status.c ua_tree.c ua_update.c verify.c
+         ua_status.c ua_tree.c ua_update.c vbackup.c verify.c
 SVROBJS = dird.o admin.o authenticate.o \
          autoprune.o backup.o bsr.o \
          catreq.o dir_plugins.o dird_conf.o expand.o \
@@ -56,7 +56,7 @@ SVROBJS = dird.o admin.o authenticate.o \
          ua_input.o ua_label.o ua_output.o ua_prune.o \
          ua_purge.o ua_restore.o ua_run.o \
          ua_select.o ua_server.o \
-         ua_status.o ua_tree.o ua_update.o verify.o
+         ua_status.o ua_tree.o ua_update.o vbackup.o verify.o
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@

diff --git a/bacula/src/dird/admin.c b/bacula/src/dird/admin.c
index 390c3b3aa8f45159373763740fb9c9a6edec7a21..387cc525362834d20a878e4ed2d0c34564e45823 100644 (file)
--- a/bacula/src/dird/admin.c
+++ b/bacula/src/dird/admin.c
@@ -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.

diff --git a/bacula/src/dird/authenticate.c b/bacula/src/dird/authenticate.c
index 9e83cffbe1b27373015785b9ab2c5a7d1e65ea31..d65fe05e5c7ad3028a9153fd1baa83e8cac19089 100644 (file)
--- a/bacula/src/dird/authenticate.c
+++ b/bacula/src/dird/authenticate.c
@@ -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.

diff --git a/bacula/src/dird/autoprune.c b/bacula/src/dird/autoprune.c
index 8f6f400fafb60001bbd00f17d7f0d52de0c7eaba..a8651e73ddab22087770a5be31d28e490a00ca90 100644 (file)
--- a/bacula/src/dird/autoprune.c
+++ b/bacula/src/dird/autoprune.c
@@ -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.

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 1d596b6998551f74ca07fa591c5a3e2191ddd38d..87b07a608767a9be7d700c68c1ea009b93308565 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -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.

diff --git a/bacula/src/dird/bsr.c b/bacula/src/dird/bsr.c
index 8820d6f31bdc8744217c52b27ca846014b1a13c3..a89451f12df6c26b0957804580447ae19522e7ea 100644 (file)
--- a/bacula/src/dird/bsr.c
+++ b/bacula/src/dird/bsr.c
@@ -31,7 +31,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.

diff --git a/bacula/src/dird/bsr.h b/bacula/src/dird/bsr.h
index b71ae25171eecc69ce180a227df18c5a3786d98c..c4cf12f4379d274659ae7cfda93fd8d988e55b26 100644 (file)
--- a/bacula/src/dird/bsr.h
+++ b/bacula/src/dird/bsr.h
@@ -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.

diff --git a/bacula/src/dird/catreq.c b/bacula/src/dird/catreq.c
index 2119f1ebe6974cfd73140cf3a87b7d02ea357229..b406767fead0e8d7020e36f962af2dc9a30ba5e5 100644 (file)
--- a/bacula/src/dird/catreq.c
+++ b/bacula/src/dird/catreq.c
@@ -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.

diff --git a/bacula/src/dird/dir_plugins.c b/bacula/src/dird/dir_plugins.c
index 1821c593ff98a04adc30c57870db8ddfa4881861..a8006074370928f311aed8148015c0daa0718b19 100644 (file)
--- a/bacula/src/dird/dir_plugins.c
+++ b/bacula/src/dird/dir_plugins.c
@@ -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.

diff --git a/bacula/src/dird/dir_plugins.h b/bacula/src/dird/dir_plugins.h
index 0e77dbf902eb31286904d0c2a57c5f4351f540c4..68362429adceb8d022c61985e8451e0025011777 100644 (file)
--- a/bacula/src/dird/dir_plugins.h
+++ b/bacula/src/dird/dir_plugins.h
@@ -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.

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index e8104b48656d3f27530eb29a259f27b790b51bf5..42f12216c6ad90f823168c22efdecac18e4b5037 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -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.

diff --git a/bacula/src/dird/dird.h b/bacula/src/dird/dird.h
index 594e6bd5dee4105df0cf7cd84a8a870f697c8b2f..71083412e96c86dd8b70a739915d1da5f62ae8f3 100644 (file)
--- a/bacula/src/dird/dird.h
+++ b/bacula/src/dird/dird.h
@@ -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.

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index 615c2699e0b9c69e68dfe94e22f35aa57e5e34b0..7e08768a6e7086d276ce1359d4c0743d7bb4d9a4 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -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.

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 0d10339a8d480f7aa6b40c6a63e7f6e39209245a..faffeb0d45dbe5c8872376737678aa25b412fb63 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -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.

diff --git a/bacula/src/dird/expand.c b/bacula/src/dird/expand.c
index 4c0459c5831d6befd6fe314d977476bc7c465f3d..bf1cb26ec6b5b773c8b77fd9c2701f716c22b06f 100644 (file)
--- a/bacula/src/dird/expand.c
+++ b/bacula/src/dird/expand.c
@@ -29,7 +29,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.

diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index 2561e70c7891eda35533059ac0df83bfe52c62c8..7ccf327fe0b8339fda41d106c892d70bbc43fa38 100644 (file)
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -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.

diff --git a/bacula/src/dird/getmsg.c b/bacula/src/dird/getmsg.c
index 59a1ecd2dec68ac82c0d6ef9a773a6eaea9b0f24..abc3ac8551c9130d5d28cc2e3599da6996271d65 100644 (file)
--- a/bacula/src/dird/getmsg.c
+++ b/bacula/src/dird/getmsg.c
@@ -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.

diff --git a/bacula/src/dird/inc_conf.c b/bacula/src/dird/inc_conf.c
index 3dc445fd9d3a95cf2bbb09f4527884fe773b307a..59d44e28e3d2d10474e1034f88b556e8feae6b91 100644 (file)
--- a/bacula/src/dird/inc_conf.c
+++ b/bacula/src/dird/inc_conf.c
@@ -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.

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 59a83d760c6866fb6b65b78673cd42d9f2d49947..536b4d0a5b858f7ba53cbf946b4aedf6bd891a31 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -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.
@@ -1345,6 +1345,10 @@ void create_clones(JCR *jcr)
    }
 }
 
+/*
+ * Given: a JobId in jcr->previous_jr.JobId,
+ *  this subroutine writes a bsr file to restore that job.
+ */
 bool create_restore_bootstrap_file(JCR *jcr)
 {
    RESTORE_CTX rx;

diff --git a/bacula/src/dird/jobq.c b/bacula/src/dird/jobq.c
index af8605268d300db1aa10e27c3d8ae6d333921def..c04ff9306b202bb4020a7e1aa51966899ed256d6 100644 (file)
--- a/bacula/src/dird/jobq.c
+++ b/bacula/src/dird/jobq.c
@@ -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.

diff --git a/bacula/src/dird/jobq.h b/bacula/src/dird/jobq.h
index 6c75f9e13c3547ac2b5e5555d96719e001978d41..69b1790de4dfd5b884486ed79c47842dcbc553b3 100644 (file)
--- a/bacula/src/dird/jobq.h
+++ b/bacula/src/dird/jobq.h
@@ -31,7 +31,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.

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index 42fd5cf10655555273f1cf08335afa8bd21cb0bf..b8b8b53444b36df70528b05ae007b3bae59886b9 100644 (file)
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -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.

diff --git a/bacula/src/dird/mountreq.c b/bacula/src/dird/mountreq.c
index 64bb2442600b8f682f93a9f31c44e2e5c199e890..51e0148961c072baf2f50adebbeaa49d7a8d5174 100644 (file)
--- a/bacula/src/dird/mountreq.c
+++ b/bacula/src/dird/mountreq.c
@@ -34,7 +34,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.

diff --git a/bacula/src/dird/msgchan.c b/bacula/src/dird/msgchan.c
index c1d5280ea25bef72b7e3d03e0f40763bb0e7ae6b..a8199aae7a3f4dd49522312a8d6047b7506e308a 100644 (file)
--- a/bacula/src/dird/msgchan.c
+++ b/bacula/src/dird/msgchan.c
@@ -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.

diff --git a/bacula/src/dird/newvol.c b/bacula/src/dird/newvol.c
index 4a57019e0171c5a00efbc56dfdbe1eff9d0d00c1..d9f274e2cb580061d7fece2427055da272aaf18a 100644 (file)
--- a/bacula/src/dird/newvol.c
+++ b/bacula/src/dird/newvol.c
@@ -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.

diff --git a/bacula/src/dird/next_vol.c b/bacula/src/dird/next_vol.c
index 0f6a437e1e8a5a0b7773336f61ce2bb5e26b2fc5..a86342bbfc2a41fafb7b2f66cbeb9740a19816a8 100644 (file)
--- a/bacula/src/dird/next_vol.c
+++ b/bacula/src/dird/next_vol.c
@@ -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.

diff --git a/bacula/src/dird/protos.h b/bacula/src/dird/protos.h
index 6bcf5d1f5e38872bf5c74169f7c051175f930f60..08530ecc88b7bf04809e8edd54ae86f814b7fb03 100644 (file)
--- a/bacula/src/dird/protos.h
+++ b/bacula/src/dird/protos.h
@@ -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.

diff --git a/bacula/src/dird/pythondir.c b/bacula/src/dird/pythondir.c
index 241e79a3d3f9a0e30116c928b94fdc66ee4e4c8d..4d671968de38f3249f50211504179e43e6510b50 100644 (file)
--- a/bacula/src/dird/pythondir.c
+++ b/bacula/src/dird/pythondir.c
@@ -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.

diff --git a/bacula/src/dird/recycle.c b/bacula/src/dird/recycle.c
index 58d807a055ae5bd19d7227b6c2572d435a66df8d..c65d760eae91076f452a7c8f6d16dcc99cd51e20 100644 (file)
--- a/bacula/src/dird/recycle.c
+++ b/bacula/src/dird/recycle.c
@@ -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.

diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c
index 19054582793447c43339df29822c1f8d1f1628a3..cbfc9d96127ea2c0add4cbc221f4338e5ba6f9b5 100644 (file)
--- a/bacula/src/dird/restore.c
+++ b/bacula/src/dird/restore.c
@@ -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.

diff --git a/bacula/src/dird/run_conf.c b/bacula/src/dird/run_conf.c
index b339cdccb3a95942d0e959d9665dfbb130bca279..a96e9809b67907b46ce9d6893ae81af6ff2f639e 100644 (file)
--- a/bacula/src/dird/run_conf.c
+++ b/bacula/src/dird/run_conf.c
@@ -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.

diff --git a/bacula/src/dird/scheduler.c b/bacula/src/dird/scheduler.c
index 1949b2dc6580431a41331d4e1b0a8863bb8211c6..7f24fb5c9947a4034a0a8dae2d1c9400b350e013 100644 (file)
--- a/bacula/src/dird/scheduler.c
+++ b/bacula/src/dird/scheduler.c
@@ -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.

diff --git a/bacula/src/dird/ua.h b/bacula/src/dird/ua.h
index c55510812282ac0d50a27c7c8d344bda0b0dcb9d..89051139f7e7f06d707fa5d4847a37f90e95b5bf 100644 (file)
--- a/bacula/src/dird/ua.h
+++ b/bacula/src/dird/ua.h
@@ -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.

diff --git a/bacula/src/dird/ua_acl.c b/bacula/src/dird/ua_acl.c
index eee496379c0c9f220e8554fde2add3b07eec40a2..1f8d6d097dabf40f7a44f77dcc38436d10f2cf0d 100644 (file)
--- a/bacula/src/dird/ua_acl.c
+++ b/bacula/src/dird/ua_acl.c
@@ -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.

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 6952b3b9bdf41f5a5555ee93d58906a20014a68c..a886f1d956309341c8474e669814943a122116b2 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -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.

diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c
index da23d78a368e2c7e90713e5fe01290f8974fbe17..6fae121142a57006184e536c0071cc168b07fc15 100644 (file)
--- a/bacula/src/dird/ua_dotcmds.c
+++ b/bacula/src/dird/ua_dotcmds.c
@@ -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.

diff --git a/bacula/src/dird/ua_input.c b/bacula/src/dird/ua_input.c
index 3c9af2500e407c108ad22e8b09cd0f22012941d4..b87c73a2bc7d498f97a68b4444ab06307a2a5275 100644 (file)
--- a/bacula/src/dird/ua_input.c
+++ b/bacula/src/dird/ua_input.c
@@ -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.

diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c
index 6fa4d02755f7f7016270e706d4b5ee62acc199da..b14452d55dc6554441a6f3f0676476a1a2abbfd7 100644 (file)
--- a/bacula/src/dird/ua_label.c
+++ b/bacula/src/dird/ua_label.c
@@ -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.

diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index f9118cce67c00d0eb54fd55fd283151d79349814..aaf9140acc003cb4c5b992734608e5a2e6d9a64f 100644 (file)
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -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.

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index 546477f9b0be63ae8a155aef47b7553afbd9cf04..ed7060ff9f71cea1dd7412ceea7c9f2dbbecc8f4 100644 (file)
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -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.

diff --git a/bacula/src/dird/ua_purge.c b/bacula/src/dird/ua_purge.c
index 80e2783633411494b589f24cb9a6a4f08289c2ee..830f33803295f6f0d4f54cb4b20aba5a09d2fc27 100644 (file)
--- a/bacula/src/dird/ua_purge.c
+++ b/bacula/src/dird/ua_purge.c
@@ -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.

diff --git a/bacula/src/dird/ua_query.c b/bacula/src/dird/ua_query.c
index 231e41700b6f7411b3f2b51253f104422f8cfc1b..019666b1f245a9185c3b50c72c3f75dfa8df1d3f 100644 (file)
--- a/bacula/src/dird/ua_query.c
+++ b/bacula/src/dird/ua_query.c
@@ -28,7 +28,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.

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index 482e17e589e6a568bba3f9e2c515ef7ac3079df2..cf71a8550385fd7654113154c431cbd898595b8d 100644 (file)
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -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.

diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c
index e3b6e72bbb01a1b30f21873b0837f4776ac8ec67..c2ac7e981d3482e6b299bad3829fe61434b40857 100644 (file)
--- a/bacula/src/dird/ua_run.c
+++ b/bacula/src/dird/ua_run.c
@@ -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.

diff --git a/bacula/src/dird/ua_select.c b/bacula/src/dird/ua_select.c
index 598ec5a630348e0bac474736159cd75fa590faf1..22601ad6751b941955298c74c9c0dd5f52494e67 100644 (file)
--- a/bacula/src/dird/ua_select.c
+++ b/bacula/src/dird/ua_select.c
@@ -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.

diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c
index 80b2f1f44210cdc19329c2097de8866413a4c66c..23b828918100dc6934cdf7a6b04e03fc5d4b68ea 100644 (file)
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -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.

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 81bf553ade9cacbd30cd0532f9bbbb89ec3b5d6c..94c2f518b46e956204c540ec164f57ca8844d123 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -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.

diff --git a/bacula/src/dird/ua_tree.c b/bacula/src/dird/ua_tree.c
index 7a8990c65331b8e86487281b2a029d39c2c9c6a6..2a5b75e735938a9bbfe2afa6e87e1154c7cba4d4 100644 (file)
--- a/bacula/src/dird/ua_tree.c
+++ b/bacula/src/dird/ua_tree.c
@@ -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.

diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c
index 4f7823df91335ad8a27ff41e7ef8930556b7a313..62f36174d1590ff3a0d2122e509de026bfb4ce9c 100644 (file)
--- a/bacula/src/dird/ua_update.c
+++ b/bacula/src/dird/ua_update.c
@@ -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.

diff --git a/bacula/src/dird/vbackup.c b/bacula/src/dird/vbackup.c
new file mode 100644 (file)
index 0000000..724c4b6
--- /dev/null
+++ b/bacula/src/dird/vbackup.c
@@ -0,0 +1,525 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2008-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.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   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.
+*/
+/*
+ *
+ *   Bacula Director -- vbackup.c -- responsible for doing virtual
+ *     backup jobs or in other words, consolidation or synthetic
+ *     backups.
+ *
+ *     Kern Sibbald, July MMVIII
+ *
+ *  Basic tasks done here:
+ *     Open DB and create records for this job.
+ *     Figure out what Jobs to copy.
+ *     Open Message Channel with Storage daemon to tell him a job will be starting.
+ *     Open connection with File daemon and pass him commands
+ *       to do the backup.
+ *     When the File daemon finishes the job, update the DB.
+ *
+ *   Version $Id: $
+ */
+
+#include "bacula.h"
+#include "dird.h"
+#include "ua.h"
+
+static const int dbglevel = 10;
+
+static char OKbootstrap[] = "3000 OK bootstrap\n";
+
+static bool create_bootstrap_file(JCR *jcr, POOLMEM *jobids);
+void vbackup_cleanup(JCR *jcr, int TermCode);
+
+/* 
+ * Called here before the job is run to do the job
+ *   specific setup.
+ */
+bool do_vbackup_init(JCR *jcr)
+{
+   if (!get_or_create_fileset_record(jcr)) {
+      Dmsg1(dbglevel, "JobId=%d no FileSet\n", (int)jcr->JobId);
+      return false;
+   }
+
+   apply_pool_overrides(jcr);
+
+   if (!allow_duplicate_job(jcr)) {
+      return false;
+   }
+
+   /*
+    * Note, at this point, pool is the pool for this job.  We
+    *  transfer it to rpool (read pool), and a bit later,
+    *  pool will be changed to point to the write pool, 
+    *  which comes from pool->NextPool.
+    */
+   jcr->rpool = jcr->pool;            /* save read pool */
+   pm_strcpy(jcr->rpool_source, jcr->pool_source);
+
+
+   Dmsg2(dbglevel, "Read pool=%s (From %s)\n", jcr->rpool->name(), jcr->rpool_source);
+
+   POOLMEM *jobids = get_pool_memory(PM_FNAME);
+   db_accurate_get_jobids(jcr, jcr->db, &jcr->jr, jobids);
+   if (*jobids == 0) {
+      free_pool_memory(jobids);
+      Jmsg(jcr, M_FATAL, 0, _("Cannot find previous JobIds.\n"));
+      return false;
+   }
+
+
+   if (!create_bootstrap_file(jcr, jobids)) {
+      Jmsg(jcr, M_FATAL, 0, _("Could not get or create the FileSet record.\n"));
+      free_pool_memory(jobids);
+      return false;
+   }
+   free_pool_memory(jobids);
+
+   /*
+    * If the original backup pool has a NextPool, make sure a 
+    *  record exists in the database. Note, in this case, we
+    *  will be backing up from pool to pool->NextPool.
+    */
+   if (jcr->pool->NextPool) {
+      jcr->jr.PoolId = get_or_create_pool_record(jcr, jcr->pool->NextPool->name());
+      if (jcr->jr.PoolId == 0) {
+         return false;
+      }
+   }
+   /* ***FIXME*** this is probably not needed */
+   if (!set_migration_wstorage(jcr, jcr->pool)) {
+      return false;
+   }
+   pm_strcpy(jcr->pool_source, _("Job Pool's NextPool resource"));
+
+   Dmsg2(dbglevel, "Write pool=%s read rpool=%s\n", jcr->pool->name(), jcr->rpool->name());
+
+   create_clones(jcr);
+
+   return true;
+}
+
+/*
+ * Do a backup of the specified FileSet
+ *
+ *  Returns:  false on failure
+ *            true  on success
+ */
+bool do_vbackup(JCR *jcr)
+{
+   char ed1[100];
+   BSOCK *sd;
+   JCR *mig_jcr = jcr->mig_jcr;    /* newly backed up job */
+
+   /*
+    * If mig_jcr is NULL, there is nothing to do for this job,
+    *  so set a normal status, cleanup and return OK.
+    */
+   if (!mig_jcr) {
+      set_jcr_job_status(jcr, JS_Terminated);
+      vbackup_cleanup(jcr, jcr->JobStatus);
+      return true;
+   }
+
+   /* Print Job Start message */
+   Jmsg(jcr, M_INFO, 0, _("Start Vbackup JobId %s, Job=%s\n"),
+        edit_uint64(jcr->JobId, ed1), jcr->Job);
+
+
+
+   /*
+    * Open a message channel connection with the Storage
+    * daemon. This is to let him know that our client
+    * will be contacting him for a backup  session.
+    *
+    */
+   Dmsg0(110, "Open connection with storage daemon\n");
+   set_jcr_job_status(jcr, JS_WaitSD);
+   set_jcr_job_status(mig_jcr, JS_WaitSD);
+   /*
+    * Start conversation with Storage daemon
+    */
+   if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
+      return false;
+   }
+   sd = jcr->store_bsock;
+   /*
+    * Now start a job with the Storage daemon
+    */
+   Dmsg2(dbglevel, "Read store=%s, write store=%s\n", 
+      ((STORE *)jcr->rstorage->first())->name(),
+      ((STORE *)jcr->wstorage->first())->name());
+   if (((STORE *)jcr->rstorage->first())->name() == ((STORE *)jcr->wstorage->first())->name()) {
+      Jmsg(jcr, M_FATAL, 0, _("Read storage \"%s\" same as write storage.\n"),
+           ((STORE *)jcr->rstorage->first())->name());
+      return false;
+   }
+   if (!start_storage_daemon_job(jcr, jcr->rstorage, jcr->wstorage)) {
+      return false;
+   }
+   Dmsg0(150, "Storage daemon connection OK\n");
+
+   if (!send_bootstrap_file(jcr, sd) ||
+       !response(jcr, sd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) {
+      return false;
+   }
+
+   /*    
+    * We re-update the job start record so that the start
+    *  time is set after the run before job.  This avoids 
+    *  that any files created by the run before job will
+    *  be saved twice.  They will be backed up in the current
+    *  job, but not in the next one unless they are changed.
+    *  Without this, they will be backed up in this job and
+    *  in the next job run because in that case, their date 
+    *   is after the start of this run.
+    */
+   jcr->start_time = time(NULL);
+   jcr->jr.StartTime = jcr->start_time;
+   jcr->jr.JobTDate = jcr->start_time;
+   set_jcr_job_status(jcr, JS_Running);
+
+   /* Update job start record for this migration control job */
+   if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
+      Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
+      return false;
+   }
+
+
+   mig_jcr->start_time = time(NULL);
+   mig_jcr->jr.StartTime = mig_jcr->start_time;
+   mig_jcr->jr.JobTDate = mig_jcr->start_time;
+   set_jcr_job_status(mig_jcr, JS_Running);
+
+   /* Update job start record for the real migration backup job */
+   if (!db_update_job_start_record(mig_jcr, mig_jcr->db, &mig_jcr->jr)) {
+      Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(mig_jcr->db));
+      return false;
+   }
+
+   Dmsg4(dbglevel, "mig_jcr: Name=%s JobId=%d Type=%c Level=%c\n",
+      mig_jcr->jr.Name, (int)mig_jcr->jr.JobId, 
+      mig_jcr->jr.JobType, mig_jcr->jr.JobLevel);
+
+
+   /*
+    * Start the job prior to starting the message thread below
+    * to avoid two threads from using the BSOCK structure at
+    * the same time.
+    */
+   if (!sd->fsend("run")) {
+      return false;
+   }
+
+   /*
+    * Now start a Storage daemon message thread
+    */
+   if (!start_storage_daemon_message_thread(jcr)) {
+      return false;
+   }
+
+
+   set_jcr_job_status(jcr, JS_Running);
+   set_jcr_job_status(mig_jcr, JS_Running);
+
+   /* Pickup Job termination data */
+   /* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/Errors */
+   wait_for_storage_daemon_termination(jcr);
+   set_jcr_job_status(jcr, jcr->SDJobStatus);
+   db_write_batch_file_records(jcr);    /* used by bulk batch file insert */
+   if (jcr->JobStatus != JS_Terminated) {
+      return false;
+   }
+
+   vbackup_cleanup(jcr, jcr->JobStatus);
+   if (mig_jcr) {
+      char jobid[50];
+      UAContext *ua = new_ua_context(jcr);
+      edit_uint64(jcr->previous_jr.JobId, jobid);
+      /* Purge all old file records, but leave Job record */
+      purge_files_from_jobs(ua, jobid);
+      free_ua_context(ua);
+   }
+   return true;
+}
+
+
+/*
+ * Release resources allocated during backup.
+ */
+void vbackup_cleanup(JCR *jcr, int TermCode)
+{
+   char sdt[50], edt[50], schedt[50];
+   char ec1[30], ec2[30], ec3[30], ec4[30], ec5[30], compress[50];
+   char ec6[30], ec7[30], ec8[30], elapsed[50];
+   char term_code[100], fd_term_msg[100], sd_term_msg[100];
+   const char *term_msg;
+   int msg_type = M_INFO;
+   MEDIA_DBR mr;
+   CLIENT_DBR cr;
+   double kbps, compression;
+   utime_t RunTime;
+
+   Dmsg2(100, "Enter backup_cleanup %d %c\n", TermCode, TermCode);
+   memset(&mr, 0, sizeof(mr));
+   memset(&cr, 0, sizeof(cr));
+
+   update_job_end(jcr, TermCode);
+
+   if (!db_get_job_record(jcr, jcr->db, &jcr->jr)) {
+      Jmsg(jcr, M_WARNING, 0, _("Error getting Job record for Job report: ERR=%s"),
+         db_strerror(jcr->db));
+      set_jcr_job_status(jcr, JS_ErrorTerminated);
+   }
+
+   bstrncpy(cr.Name, jcr->client->name(), sizeof(cr.Name));
+   if (!db_get_client_record(jcr, jcr->db, &cr)) {
+      Jmsg(jcr, M_WARNING, 0, _("Error getting Client record for Job report: ERR=%s"),
+         db_strerror(jcr->db));
+   }
+
+   bstrncpy(mr.VolumeName, jcr->VolumeName, sizeof(mr.VolumeName));
+   if (!db_get_media_record(jcr, jcr->db, &mr)) {
+      Jmsg(jcr, M_WARNING, 0, _("Error getting Media record for Volume \"%s\": ERR=%s"),
+         mr.VolumeName, db_strerror(jcr->db));
+      set_jcr_job_status(jcr, JS_ErrorTerminated);
+   }
+
+   update_bootstrap_file(jcr);
+
+   switch (jcr->JobStatus) {
+      case JS_Terminated:
+         if (jcr->Errors || jcr->SDErrors) {
+            term_msg = _("Backup OK -- with warnings");
+         } else {
+            term_msg = _("Backup OK");
+         }
+         break;
+      case JS_FatalError:
+      case JS_ErrorTerminated:
+         term_msg = _("*** Backup Error ***");
+         msg_type = M_ERROR;          /* Generate error message */
+         if (jcr->store_bsock) {
+            jcr->store_bsock->signal(BNET_TERMINATE);
+            if (jcr->SD_msg_chan) {
+               pthread_cancel(jcr->SD_msg_chan);
+            }
+         }
+         break;
+      case JS_Canceled:
+         term_msg = _("Backup Canceled");
+         if (jcr->store_bsock) {
+            jcr->store_bsock->signal(BNET_TERMINATE);
+            if (jcr->SD_msg_chan) {
+               pthread_cancel(jcr->SD_msg_chan);
+            }
+         }
+         break;
+      default:
+         term_msg = term_code;
+         sprintf(term_code, _("Inappropriate term code: %c\n"), jcr->JobStatus);
+         break;
+   }
+   bstrftimes(schedt, sizeof(schedt), jcr->jr.SchedTime);
+   bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime);
+   bstrftimes(edt, sizeof(edt), jcr->jr.EndTime);
+   RunTime = jcr->jr.EndTime - jcr->jr.StartTime;
+   if (RunTime <= 0) {
+      kbps = 0;
+   } else {
+      kbps = ((double)jcr->jr.JobBytes) / (1000.0 * (double)RunTime);
+   }
+   if (!db_get_job_volume_names(jcr, jcr->db, jcr->jr.JobId, &jcr->VolumeName)) {
+      /*
+       * Note, if the job has erred, most likely it did not write any
+       *  tape, so suppress this "error" message since in that case
+       *  it is normal.  Or look at it the other way, only for a
+       *  normal exit should we complain about this error.
+       */
+      if (jcr->JobStatus == JS_Terminated && jcr->jr.JobBytes) {
+         Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
+      }
+      jcr->VolumeName[0] = 0;         /* none */
+   }
+
+   if (jcr->ReadBytes == 0) {
+      bstrncpy(compress, "None", sizeof(compress));
+   } else {
+      compression = (double)100 - 100.0 * ((double)jcr->JobBytes / (double)jcr->ReadBytes);
+      if (compression < 0.5) {
+         bstrncpy(compress, "None", sizeof(compress));
+      } else {
+         bsnprintf(compress, sizeof(compress), "%.1f %%", compression);
+      }
+   }
+   jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg));
+   jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg));
+
+// bmicrosleep(15, 0);                /* for debugging SIGHUP */
+
+   Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
+"  Build OS:               %s %s %s\n"
+"  JobId:                  %d\n"
+"  Job:                    %s\n"
+"  Backup Level:           %s%s\n"
+"  Client:                 \"%s\" %s\n"
+"  FileSet:                \"%s\" %s\n"
+"  Pool:                   \"%s\" (From %s)\n"
+"  Catalog:                \"%s\" (From %s)\n"
+"  Storage:                \"%s\" (From %s)\n"
+"  Scheduled time:         %s\n"
+"  Start time:             %s\n"
+"  End time:               %s\n"
+"  Elapsed time:           %s\n"
+"  Priority:               %d\n"
+"  FD Files Written:       %s\n"
+"  SD Files Written:       %s\n"
+"  FD Bytes Written:       %s (%sB)\n"
+"  SD Bytes Written:       %s (%sB)\n"
+"  Rate:                   %.1f KB/s\n"
+"  Software Compression:   %s\n"
+"  VSS:                    %s\n"
+"  Encryption:             %s\n"
+"  Accurate:               %s\n"
+"  Volume name(s):         %s\n"
+"  Volume Session Id:      %d\n"
+"  Volume Session Time:    %d\n"
+"  Last Volume Bytes:      %s (%sB)\n"
+"  Non-fatal FD errors:    %d\n"
+"  SD Errors:              %d\n"
+"  FD termination status:  %s\n"
+"  SD termination status:  %s\n"
+"  Termination:            %s\n\n"),
+        my_name, VERSION, LSMDATE, edt,
+        HOST_OS, DISTNAME, DISTVER,
+        jcr->jr.JobId,
+        jcr->jr.Job,
+        level_to_str(jcr->JobLevel), jcr->since,
+        jcr->client->name(), cr.Uname,
+        jcr->fileset->name(), jcr->FSCreateTime,
+        jcr->pool->name(), jcr->pool_source,
+        jcr->catalog->name(), jcr->catalog_source,
+        jcr->wstore->name(), jcr->wstore_source,
+        schedt,
+        sdt,
+        edt,
+        edit_utime(RunTime, elapsed, sizeof(elapsed)),
+        jcr->JobPriority,
+        edit_uint64_with_commas(jcr->jr.JobFiles, ec1),
+        edit_uint64_with_commas(jcr->SDJobFiles, ec2),
+        edit_uint64_with_commas(jcr->jr.JobBytes, ec3),
+        edit_uint64_with_suffix(jcr->jr.JobBytes, ec4),
+        edit_uint64_with_commas(jcr->SDJobBytes, ec5),
+        edit_uint64_with_suffix(jcr->SDJobBytes, ec6),
+        kbps,
+        compress,
+        jcr->VSS?_("yes"):_("no"),
+        jcr->Encrypt?_("yes"):_("no"),
+        jcr->accurate?_("yes"):_("no"),
+        jcr->VolumeName,
+        jcr->VolSessionId,
+        jcr->VolSessionTime,
+        edit_uint64_with_commas(mr.VolBytes, ec7),
+        edit_uint64_with_suffix(mr.VolBytes, ec8),
+        jcr->Errors,
+        jcr->SDErrors,
+        fd_term_msg,
+        sd_term_msg,
+        term_msg);
+
+   Dmsg0(100, "Leave vbackup_cleanup()\n");
+}
+
+/*
+ * This callback routine is responsible for inserting the
+ *  items it gets into the bootstrap structure. For each JobId selected
+ *  this routine is called once for each file. We do not allow
+ *  duplicate filenames, but instead keep the info from the most
+ *  recent file entered (i.e. the JobIds are assumed to be sorted)
+ *
+ *   See uar_sel_files in sql_cmds.c for query that calls us.
+ *      row[0]=Path, row[1]=Filename, row[2]=FileIndex
+ *      row[3]=JobId row[4]=LStat
+ */
+int insert_bootstrap_handler(void *ctx, int num_fields, char **row)
+{
+   JobId_t JobId;
+   int FileIndex;
+   RBSR *bsr = (RBSR *)ctx;
+
+   JobId = str_to_int64(row[3]);
+   FileIndex = str_to_int64(row[2]);
+   add_findex(bsr, JobId, FileIndex);
+   return 0;
+}
+
+
+static bool create_bootstrap_file(JCR *jcr, POOLMEM *jobids)
+{
+   RESTORE_CTX rx;
+   UAContext *ua;
+
+   memset(&rx, 0, sizeof(rx));
+   rx.bsr = new_bsr();
+   ua = new_ua_context(jcr);
+
+#define new_get_file_list
+#ifdef new_get_file_list
+   if (!db_get_file_list(jcr, ua->db, jobids, insert_bootstrap_handler, (void *)&rx.bsr)) {
+      Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(ua->db));
+   }
+#else
+   JobId_t JobId;
+   for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
+      char ed1[50];
+
+      if (JobId == last_JobId) {
+         continue;                    /* eliminate duplicate JobIds */
+      }
+      last_JobId = JobId;
+      /*
+       * Find files for this JobId and insert them in the tree
+       */
+      Mmsg(rx->query, uar_sel_files, edit_int64(JobId, ed1));
+      if (!db_sql_query(ua->db, rx->query, insert_tree_handler, (void *)&rx.bsr)) {
+         Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(ua->db));
+      }
+   }
+#endif
+
+   complete_bsr(ua, rx.bsr);
+   jcr->ExpectedFiles = write_bsr_file(ua, rx);
+   if (jcr->ExpectedFiles == 0) {
+      free_ua_context(ua);
+      free_bsr(rx.bsr);
+      return false;
+   }
+   free_ua_context(ua);
+   free_bsr(rx.bsr);
+   return true;
+}

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index 57663a26e29c9f0ac2629e9863a14782bc235070..7471a50afb514efec44445e3b601d1dbfdb3be64 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -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.

diff --git a/bacula/src/filed/accurate.c b/bacula/src/filed/accurate.c
index e404d18f5e03c9190e3664d77db58e7caf1e2952..8912805784ba7a678eb92cb94804973550ceee7a 100644 (file)
--- a/bacula/src/filed/accurate.c
+++ b/bacula/src/filed/accurate.c
@@ -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.

diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c
index 9eb017ebb00e99bb0f86ea4c986e5f575fad85cb..458020152f0a5a015fe05e77256e5f00c1080bc7 100644 (file)
--- a/bacula/src/filed/acl.c
+++ b/bacula/src/filed/acl.c
@@ -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.

diff --git a/bacula/src/filed/acl.h b/bacula/src/filed/acl.h
index c690b1a5684970771e5e0e4383943a4de62bbef6..52919a935219530a4ba3b9ab98b6db574fa5fc4b 100644 (file)
--- a/bacula/src/filed/acl.h
+++ b/bacula/src/filed/acl.h
@@ -23,7 +23,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.

diff --git a/bacula/src/filed/authenticate.c b/bacula/src/filed/authenticate.c
index 474577de982dfd6192de386e07effac0c9c262d4..c59e219b8691382beacd5b06db9a10f951ec5c65 100644 (file)
--- a/bacula/src/filed/authenticate.c
+++ b/bacula/src/filed/authenticate.c
@@ -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.

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index c5275c5f7ed1989091023afcc02db24bb1ca349d..31ec1c9967ffe619e2b28ea9eed600d165dd45b0 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -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.

diff --git a/bacula/src/filed/estimate.c b/bacula/src/filed/estimate.c
index 1058e01202a23e57b4cb48a54a92b9bfb5b3bf4c..a4fd06d8dacbe37f5a2d4b134efd0c15ddfd84e5 100644 (file)
--- a/bacula/src/filed/estimate.c
+++ b/bacula/src/filed/estimate.c
@@ -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.

diff --git a/bacula/src/filed/fd_plugins.c b/bacula/src/filed/fd_plugins.c
index e99ce1fedc79f79626513f8346aee6e9cda27412..f6f8af8f988f381d66d64baf25894871c5df2f6f 100644 (file)
--- a/bacula/src/filed/fd_plugins.c
+++ b/bacula/src/filed/fd_plugins.c
@@ -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.

diff --git a/bacula/src/filed/fd_plugins.h b/bacula/src/filed/fd_plugins.h
index 099862d038a46d2a53d2dfc273e1a8203c90554f..2ca6cf017c26c48b098801b3d65a66f6292248b6 100644 (file)
--- a/bacula/src/filed/fd_plugins.h
+++ b/bacula/src/filed/fd_plugins.h
@@ -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.

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index fa5efee21909f6d81f12036ce3dead7a237d430a..576e14ba238bb989bb027e4aa6d3ec4ad15d706e 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -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.

diff --git a/bacula/src/filed/filed.h b/bacula/src/filed/filed.h
index 81a20fa0ca632999087ffc5a4de580c6420c7979..7ef7d6a049859bc5263d3a372cc0d47b5f96a6c0 100644 (file)
--- a/bacula/src/filed/filed.h
+++ b/bacula/src/filed/filed.h
@@ -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.

diff --git a/bacula/src/filed/filed_conf.c b/bacula/src/filed/filed_conf.c
index c852236bded7b687ed9d010aeecc8884aba7e8bd..42f2b907a1a9f21bf57f4246755d6cac57375357 100644 (file)
--- a/bacula/src/filed/filed_conf.c
+++ b/bacula/src/filed/filed_conf.c
@@ -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.

diff --git a/bacula/src/filed/filed_conf.h b/bacula/src/filed/filed_conf.h
index 6cfba0f683211ba45e6328f9d6bb4d76de37e3ef..573efd48cd30349c0931c8db1467bf1224f1099b 100644 (file)
--- a/bacula/src/filed/filed_conf.h
+++ b/bacula/src/filed/filed_conf.h
@@ -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.

diff --git a/bacula/src/filed/heartbeat.c b/bacula/src/filed/heartbeat.c
index e2ec35f343566b6cdc545e957703e56a7e2b30dc..d50eec17ea86201148c60c4e7ba297c0fa325b4d 100644 (file)
--- a/bacula/src/filed/heartbeat.c
+++ b/bacula/src/filed/heartbeat.c
@@ -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.
@@ -65,6 +65,7 @@ extern "C" void *sd_heartbeat_thread(void *arg)
    dir = dup_bsock(jcr->dir_bsock);
 
    jcr->hb_bsock = sd;
+   jcr->hb_started = true;
    jcr->hb_dir_bsock = dir;
 
    /* Hang reading the socket to the SD, and every time we get
@@ -85,7 +86,7 @@ extern "C" void *sd_heartbeat_thread(void *arg)
          break;
       }
       if (n == 1) {                   /* input waiting */
-         bnet_recv(sd);               /* read it -- probably heartbeat from sd */
+         sd->recv();                  /* read it -- probably heartbeat from sd */
          if (sd->msglen <= 0) {
             Dmsg1(100, "Got BNET_SIG %d from SD\n", sd->msglen);
          } else {
@@ -94,9 +95,10 @@ extern "C" void *sd_heartbeat_thread(void *arg)
       }
       Dmsg2(100, "wait_intr=%d stop=%d\n", n, is_bnet_stop(sd));
    }
-   bnet_close(sd);
-   bnet_close(dir);
+   sd->close();
+   dir->close();
    jcr->hb_bsock = NULL;
+   jcr->hb_started = false;
    jcr->hb_dir_bsock = NULL;
    return NULL;
 }
@@ -111,6 +113,7 @@ void start_heartbeat_monitor(JCR *jcr)
     */
    if (!no_signals) {
       jcr->hb_bsock = NULL;
+      jcr->hb_started = false;
       jcr->hb_dir_bsock = NULL;
       pthread_create(&jcr->heartbeat_id, NULL, sd_heartbeat_thread, (void *)jcr);
    }
@@ -124,11 +127,11 @@ void stop_heartbeat_monitor(JCR *jcr)
       return;
    }
    /* Wait max 10 secs for heartbeat thread to start */
-   while (jcr->hb_bsock == NULL && cnt++ < 200) {
+   while (!jcr->hb_started && cnt++ < 200) {
       bmicrosleep(0, 50000);         /* wait for start */
    }
 
-   if (jcr->hb_bsock) {
+   if (jcr->hb_started) {
       jcr->hb_bsock->set_timed_out();       /* set timed_out to terminate read */
       jcr->hb_bsock->set_terminated();      /* set to terminate read */
    }
@@ -141,7 +144,7 @@ void stop_heartbeat_monitor(JCR *jcr)
    bmicrosleep(0, 50000);
    cnt = 0;
    /* Wait max 100 secs for heartbeat thread to stop */
-   while (jcr->hb_bsock && cnt++ < 200) {
+   while (jcr->hb_started && cnt++ < 200) {
       pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL);  /* make heartbeat thread go away */
       bmicrosleep(0, 500000);
    }
@@ -164,6 +167,7 @@ extern "C" void *dir_heartbeat_thread(void *arg)
    dir = dup_bsock(jcr->dir_bsock);
 
    jcr->hb_bsock = dir;
+   jcr->hb_started = true;
 
    for ( ; !is_bnet_stop(dir); ) {
       time_t now, next;
@@ -178,6 +182,7 @@ extern "C" void *dir_heartbeat_thread(void *arg)
    }
    dir->close();
    jcr->hb_bsock = NULL;
+   jcr->hb_started = false;
    return NULL;
 }
 

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 3320956884b9d9ce22c3b8e66cb15224c0f5b691..5d6cb1d0876789d4fa378ac912182d13fad069d8 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -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.

diff --git a/bacula/src/filed/protos.h b/bacula/src/filed/protos.h
index a2e2781be8af3cbd88078476447d88df7b315ef0..21794509b23d48bfd378b4f2a65a055e4497bf81 100644 (file)
--- a/bacula/src/filed/protos.h
+++ b/bacula/src/filed/protos.h
@@ -23,7 +23,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.

diff --git a/bacula/src/filed/pythonfd.c b/bacula/src/filed/pythonfd.c
index 42f9ce26b71426ef45ba6f8cb64a7eec3d377f8a..e9e10808f98a74d38f9250290ca1ed4580200d58 100644 (file)
--- a/bacula/src/filed/pythonfd.c
+++ b/bacula/src/filed/pythonfd.c
@@ -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.

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index 299b78f9e2a5b33902fbe92add40c289f14028d2..7631ae8004bbfa2c7db2ad09bd2ec62e46ac2a77 100644 (file)
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -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.

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 345a58d2aac08c12eeff7c093fa024c4425f20b3..639be0f3757d070e65b2d5de7a88945fde69e465 100644 (file)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -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.

diff --git a/bacula/src/filed/verify.c b/bacula/src/filed/verify.c
index 32c753ae6ec2962b05b70e53281e0a2fb6f271e9..6c3171f1204f1958b840b8b7b894f53c5a6b4694 100644 (file)
--- a/bacula/src/filed/verify.c
+++ b/bacula/src/filed/verify.c
@@ -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.

diff --git a/bacula/src/filed/verify_vol.c b/bacula/src/filed/verify_vol.c
index efc7ea4d1850b84c44f6317abfffc88dca0b8220..3a29808bf930dbc953ac0a4830b8f32dfcd344fe 100644 (file)
--- a/bacula/src/filed/verify_vol.c
+++ b/bacula/src/filed/verify_vol.c
@@ -29,7 +29,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.

diff --git a/bacula/src/findlib/attribs.c b/bacula/src/findlib/attribs.c
index 286944434aba4b5a092e643dca91da5f8034c8ac..ecef708b188bb8b91668955fbd8fb69f6cb52d74 100644 (file)
--- a/bacula/src/findlib/attribs.c
+++ b/bacula/src/findlib/attribs.c
@@ -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.

diff --git a/bacula/src/findlib/bfile.c b/bacula/src/findlib/bfile.c
index f4c9c7f4beb65b79e92b41160b84bcc6b561a9d4..4d40871dfee11707da8c284396513a0d314e7cbf 100644 (file)
--- a/bacula/src/findlib/bfile.c
+++ b/bacula/src/findlib/bfile.c
@@ -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.

diff --git a/bacula/src/findlib/bfile.h b/bacula/src/findlib/bfile.h
index d8104d263ad4a647a10ff07c766133d430a865c1..d0167e985df3cebd22ac210985f7f8b0f66ff2a2 100644 (file)
--- a/bacula/src/findlib/bfile.h
+++ b/bacula/src/findlib/bfile.h
@@ -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.

diff --git a/bacula/src/findlib/create_file.c b/bacula/src/findlib/create_file.c
index 5a4a92897c84a662b2b96f99e1d37e1c392b7d92..54b123d8aae5bd1b1acf1c49dc65362ea3845dc1 100644 (file)
--- a/bacula/src/findlib/create_file.c
+++ b/bacula/src/findlib/create_file.c
@@ -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.

diff --git a/bacula/src/findlib/drivetype.c b/bacula/src/findlib/drivetype.c
index e27ed96927580bdcd3ed87169064f4e93a1bdfaa..b36feae5abadba1268ceb745d692051663c2b40f 100644 (file)
--- a/bacula/src/findlib/drivetype.c
+++ b/bacula/src/findlib/drivetype.c
@@ -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.

diff --git a/bacula/src/findlib/enable_priv.c b/bacula/src/findlib/enable_priv.c
index aac1716618ddc2fe1b84439c1bf045b13640474a..9f13730e4b2ee63770617dc7c16a2895d1faa8d1 100644 (file)
--- a/bacula/src/findlib/enable_priv.c
+++ b/bacula/src/findlib/enable_priv.c
@@ -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.

diff --git a/bacula/src/findlib/find.c b/bacula/src/findlib/find.c
index 3542a5b43ad2c9f62fef70cf518ad288f63155e3..ad40a393f27814c3dddaeebd6316dfe31aa380c5 100644 (file)
--- a/bacula/src/findlib/find.c
+++ b/bacula/src/findlib/find.c
@@ -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.

diff --git a/bacula/src/findlib/find.h b/bacula/src/findlib/find.h
index 4c012f5981fcf6a320bb45f737b4a33f1beb7ced..2b314661225503b1d486a861945b37fc82e64f7f 100644 (file)
--- a/bacula/src/findlib/find.h
+++ b/bacula/src/findlib/find.h
@@ -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.

diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c
index bc525b1f5535bbbdee743047a2256f55e1026ea7..410970071ab6e3113391a47a8acdfc0e309f492f 100644 (file)
--- a/bacula/src/findlib/find_one.c
+++ b/bacula/src/findlib/find_one.c
@@ -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.

diff --git a/bacula/src/findlib/fstype.c b/bacula/src/findlib/fstype.c
index 8f842da7c7fcb796f5f2e41b81450a904e6bfb7b..131191177d0d6551cbaab275356f2ae3f129ea26 100644 (file)
--- a/bacula/src/findlib/fstype.c
+++ b/bacula/src/findlib/fstype.c
@@ -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.

diff --git a/bacula/src/findlib/match.c b/bacula/src/findlib/match.c
index b48b4dde92c42993bc84dc4e4af7315aa69bb953..49a2e92a0dc4fd5d892bb934a1c42ce5632b8e22 100644 (file)
--- a/bacula/src/findlib/match.c
+++ b/bacula/src/findlib/match.c
@@ -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.

diff --git a/bacula/src/findlib/mkpath.c b/bacula/src/findlib/mkpath.c
index 9dd67893c9883e735c8cc1dcb0fa6bc8bf5e716e..53512ea506cb47dd7cc60512c61f318831bc3709 100644 (file)
--- a/bacula/src/findlib/mkpath.c
+++ b/bacula/src/findlib/mkpath.c
@@ -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.

diff --git a/bacula/src/findlib/protos.h b/bacula/src/findlib/protos.h
index 702959783bc69be26e5c61992649c1086b075699..dea3d576d13324a4edd91c731ff9d888438ab045 100644 (file)
--- a/bacula/src/findlib/protos.h
+++ b/bacula/src/findlib/protos.h
@@ -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.

diff --git a/bacula/src/findlib/savecwd.c b/bacula/src/findlib/savecwd.c
index b0cb1e7cb90c7361cb4c4bbbc4df3edc99873c3f..68e2267795aa5a956139fcb8f4ebee02dc86478e 100644 (file)
--- a/bacula/src/findlib/savecwd.c
+++ b/bacula/src/findlib/savecwd.c
@@ -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.

diff --git a/bacula/src/findlib/savecwd.h b/bacula/src/findlib/savecwd.h
index 46c94f3bf3710ec0f6a4f8ab4a82b26c69f2eb0f..2c8263c4361058d65f98823e21c0df712bfe5b1e 100644 (file)
--- a/bacula/src/findlib/savecwd.h
+++ b/bacula/src/findlib/savecwd.h
@@ -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.

diff --git a/bacula/src/host.h.in b/bacula/src/host.h.in
index 52b428ab124ef2f8bb018357410482f9f34e861c..a8debf996d6f42fdbb7eb69ea351a9a06245e66c 100644 (file)
--- a/bacula/src/host.h.in
+++ b/bacula/src/host.h.in
@@ -26,7 +26,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.

diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h
index 7d4c0cb8f6d779f1ba7fd1f4d4a43d4ea1dc13d4..75db3edd3960ac8eee2f79a02f09858556caadb4 100644 (file)
--- a/bacula/src/jcr.h
+++ b/bacula/src/jcr.h
@@ -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.
@@ -245,7 +245,7 @@ public:
    pthread_t SD_msg_chan;             /* Message channel thread id */
    pthread_cond_t term_wait;          /* Wait for job termination */
    workq_ele_t *work_item;            /* Work queue item if scheduled */
-   volatile bool sd_msg_thread_done;  /* Set when Storage message thread terms */
+   volatile bool sd_msg_thread_done;  /* Set when Storage message thread done */
    BSOCK *ua;                         /* User agent */
    JOB *job;                          /* Job resource */
    JOB *verify_job;                   /* Job resource of verify previous job */
@@ -335,6 +335,7 @@ public:
    uint32_t StartBlock;
    uint32_t EndBlock;
    pthread_t heartbeat_id;            /* id of heartbeat thread */
+   volatile bool hb_started;          /* heartbeat running */
    BSOCK *hb_bsock;                   /* duped SD socket */
    BSOCK *hb_dir_bsock;               /* duped DIR socket */
    alist *RunScripts;                 /* Commands to run before and after job */

diff --git a/bacula/src/lib/address_conf.h b/bacula/src/lib/address_conf.h
index 197ec7a90cbbf7f96182b8d485646042a897ffd8..9e7d5efc76dc51fc1127d96f0c75f82959001246 100644 (file)
--- a/bacula/src/lib/address_conf.h
+++ b/bacula/src/lib/address_conf.h
@@ -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.

diff --git a/bacula/src/lib/alist.c b/bacula/src/lib/alist.c
index 7be04cd78bd21b66b13b368bbd03b43c403cfe5c..7f99ad30d9f175ab545d621c6719948b02b6606a 100644 (file)
--- a/bacula/src/lib/alist.c
+++ b/bacula/src/lib/alist.c
@@ -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.

diff --git a/bacula/src/lib/alist.h b/bacula/src/lib/alist.h
index 17d1d5ad382bf4a468659cb163d519e719049eee..5658cb70754cdf415f4cf1602daf4483d01345db 100644 (file)
--- a/bacula/src/lib/alist.h
+++ b/bacula/src/lib/alist.h
@@ -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.

diff --git a/bacula/src/lib/attr.c b/bacula/src/lib/attr.c
index ee8810ff523ee2b1f68ef8fd943361c4103f5ed1..b69bee7aa559abafbff7dbd8f0581536f5a05ef9 100644 (file)
--- a/bacula/src/lib/attr.c
+++ b/bacula/src/lib/attr.c
@@ -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.

diff --git a/bacula/src/lib/attr.h b/bacula/src/lib/attr.h
index 7828c170ef43bfbad59a934bd0f246c49f91c857..fa109fbbb7b2663ed69d20ab52544db45ed591b0 100644 (file)
--- a/bacula/src/lib/attr.h
+++ b/bacula/src/lib/attr.h
@@ -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.

diff --git a/bacula/src/lib/base64.c b/bacula/src/lib/base64.c
index 0f69ca7e2c3019fbd1bdbaf240cb409533ef6b79..c2d39dc3dd3bd5e609c1d6a46d246f26fe6a6ec0 100644 (file)
--- a/bacula/src/lib/base64.c
+++ b/bacula/src/lib/base64.c
@@ -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.

diff --git a/bacula/src/lib/base64.h b/bacula/src/lib/base64.h
index 4ca7fa1c6a0132eb976ee2bfb1347dad6585ac9c..20e1f3bea78676134b3ca8aab572064b92468d1e 100644 (file)
--- a/bacula/src/lib/base64.h
+++ b/bacula/src/lib/base64.h
@@ -27,7 +27,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.

diff --git a/bacula/src/lib/berrno.c b/bacula/src/lib/berrno.c
index 4ce334b1a71ab6039387dcf529417011a20902f7..c7d14992353b6b9749931a439ac696919cf7a609 100644 (file)
--- a/bacula/src/lib/berrno.c
+++ b/bacula/src/lib/berrno.c
@@ -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.

diff --git a/bacula/src/lib/berrno.h b/bacula/src/lib/berrno.h
index 039f93063d256f1be67194e1f7a6e0efdea87207..200347caa4ec2a961df8acdaceb89bf88358e2e7 100644 (file)
--- a/bacula/src/lib/berrno.h
+++ b/bacula/src/lib/berrno.h
@@ -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.

diff --git a/bacula/src/lib/bget_msg.c b/bacula/src/lib/bget_msg.c
index 8dc32996372b80083ce21eb47fd71efbeaba242d..f9a6d5660e42e7ffbdd07f03c91917fa1a77a2bd 100644 (file)
--- a/bacula/src/lib/bget_msg.c
+++ b/bacula/src/lib/bget_msg.c
@@ -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.

diff --git a/bacula/src/lib/bits.h b/bacula/src/lib/bits.h
index 09e699cba93cd6c3cb9b802fe843dadece56a4bf..ee23b9787ce1c20b821fd6b49c7a5d7defaa5d25 100644 (file)
--- a/bacula/src/lib/bits.h
+++ b/bacula/src/lib/bits.h
@@ -28,7 +28,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.

diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c
index e1d1a5f1f060266c3bd985c9cfcce5019a4e664c..0440ba74324bbfd329aff257dfa324c2d9bbe0f6 100644 (file)
--- a/bacula/src/lib/bnet.c
+++ b/bacula/src/lib/bnet.c
@@ -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.

diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c
index 0602ebb5079536d789dce01d4e1fbb484132994e..fcd9483f1ce86e17400ae3345a0921af2ad3ebab 100644 (file)
--- a/bacula/src/lib/bnet_server.c
+++ b/bacula/src/lib/bnet_server.c
@@ -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.

diff --git a/bacula/src/lib/bpipe.c b/bacula/src/lib/bpipe.c
index 449cc7f805a654f05c0514ccd3ceabbbe5fe8448..5586d6baf7ce6279e6566b27624bdbe75178185b 100644 (file)
--- a/bacula/src/lib/bpipe.c
+++ b/bacula/src/lib/bpipe.c
@@ -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.

diff --git a/bacula/src/lib/bpipe.h b/bacula/src/lib/bpipe.h
index b50439d04c1988b63d4c14c503aed3ce9c9c2b16..4c69b56da6c24c9258ff3f762d7877b803a512c6 100644 (file)
--- a/bacula/src/lib/bpipe.h
+++ b/bacula/src/lib/bpipe.h
@@ -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.

diff --git a/bacula/src/lib/breg.c b/bacula/src/lib/breg.c
index c77ab200c5b7be7ef17801d2098cfc7bb1d0ae6c..a0a907f75314df51862088c6de05d7e4b41558f0 100644 (file)
--- a/bacula/src/lib/breg.c
+++ b/bacula/src/lib/breg.c
@@ -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 Zuerich,
    Switzerland, email:ftf@fsfeurope.org.

diff --git a/bacula/src/lib/breg.h b/bacula/src/lib/breg.h
index 27ddfbbd1fe1dc59fdcdccd86a8d9ab544d4cec1..ff84da5316c6e2bad5683c99bd3dd934af3c2b91 100644 (file)
--- a/bacula/src/lib/breg.h
+++ b/bacula/src/lib/breg.h
@@ -25,7 +25,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.

diff --git a/bacula/src/lib/bregex.c b/bacula/src/lib/bregex.c
index 65fe8884aea6eb06e73fc000d54bffc782b2b101..d955737d2c0cda979e583efe4663e43847349a54 100644 (file)
--- a/bacula/src/lib/bregex.c
+++ b/bacula/src/lib/bregex.c
@@ -56,7 +56,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.

diff --git a/bacula/src/lib/bregex.h b/bacula/src/lib/bregex.h
index ca1cad38b59737fe363fe2453b2ec015cf71ed46..8c713f46110e67833e5e9d79fbc3e0d73bc22a36 100644 (file)
--- a/bacula/src/lib/bregex.h
+++ b/bacula/src/lib/bregex.h
@@ -45,7 +45,7 @@ extern "C" {
    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.

diff --git a/bacula/src/lib/bsnprintf.c b/bacula/src/lib/bsnprintf.c
index cbb6966ce51a3d306b9f8954653153d25eae22be..41aa2901f5f33249389cb1e59cb44aa81c204aec 100644 (file)
--- a/bacula/src/lib/bsnprintf.c
+++ b/bacula/src/lib/bsnprintf.c
@@ -35,7 +35,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.

diff --git a/bacula/src/lib/bsock.c b/bacula/src/lib/bsock.c
index cc26cc58645f16e672d1b19ce6071ac0de0f524a..18b3019a01a6309a572b6ef16261bd6c1d015a84 100644 (file)
--- a/bacula/src/lib/bsock.c
+++ b/bacula/src/lib/bsock.c
@@ -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.

diff --git a/bacula/src/lib/bsock.h b/bacula/src/lib/bsock.h
index 0205accd3b6a6f0e2a1dca99885757b66122c598..f5ba43a26f4711cf548fbb82f1d6b6fec886912f 100644 (file)
--- a/bacula/src/lib/bsock.h
+++ b/bacula/src/lib/bsock.h
@@ -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.

diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index f37f4cf1519eec37094302384419540f6fda920f..bf722f86450a930c61b97c11f3abdd99f1b9938e 100644 (file)
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -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.

diff --git a/bacula/src/lib/btime.c b/bacula/src/lib/btime.c
index 7487fe1c5a40b3435e75adaad12b4799a1c90e06..2485d60d49fd17bd76a722a46e9ee21d4bcd4275 100644 (file)
--- a/bacula/src/lib/btime.c
+++ b/bacula/src/lib/btime.c
@@ -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.

diff --git a/bacula/src/lib/btime.h b/bacula/src/lib/btime.h
index d3de6389ac2d5c226937b64be62cd753d7f0c0cb..5ddc291f3c3c962dc753fb3b99c0596154dbddc4 100644 (file)
--- a/bacula/src/lib/btime.h
+++ b/bacula/src/lib/btime.h
@@ -28,7 +28,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.

diff --git a/bacula/src/lib/btimers.c b/bacula/src/lib/btimers.c
index 7fb00bc3ef30b4e9f6704e1e4712fa128e23e134..3094a6385ea6b5b7d22ddb970b2e6b9ef72ffff5 100644 (file)
--- a/bacula/src/lib/btimers.c
+++ b/bacula/src/lib/btimers.c
@@ -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.

diff --git a/bacula/src/lib/btimers.h b/bacula/src/lib/btimers.h
index 7d9eca00cd6ac0a064601918d17c8022f42992c9..ce1ad679b67388d84ff8e13d4101cf198d373f19 100644 (file)
--- a/bacula/src/lib/btimers.h
+++ b/bacula/src/lib/btimers.h
@@ -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.

diff --git a/bacula/src/lib/cram-md5.c b/bacula/src/lib/cram-md5.c
index 036dc4ed34c8c34ff799a05994438e4e80343902..ac582a8fbd383414efa348b1395e0d75bb131844 100644 (file)
--- a/bacula/src/lib/cram-md5.c
+++ b/bacula/src/lib/cram-md5.c
@@ -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.

diff --git a/bacula/src/lib/crc32.c b/bacula/src/lib/crc32.c
index 563bb6d83f746d82dcfa24ef7dc919e0fc57fa94..f464efb5be50bd507913b7d40096f51ff5325320 100644 (file)
--- a/bacula/src/lib/crc32.c
+++ b/bacula/src/lib/crc32.c
@@ -28,7 +28,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.

diff --git a/bacula/src/lib/crypto.c b/bacula/src/lib/crypto.c
index 6f5367a6caa3ba9ae9e3252608f269825eca5c33..55611b4b1e4314a1beb82d5e5cd2ffbc33a6e020 100644 (file)
--- a/bacula/src/lib/crypto.c
+++ b/bacula/src/lib/crypto.c
@@ -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.

diff --git a/bacula/src/lib/crypto.h b/bacula/src/lib/crypto.h
index 8265b0211bbc0d433e774ed36b6063e5709e07ae..cb935bdb512ccde1984c838d348eeaf76588fa90 100644 (file)
--- a/bacula/src/lib/crypto.h
+++ b/bacula/src/lib/crypto.h
@@ -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.

diff --git a/bacula/src/lib/daemon.c b/bacula/src/lib/daemon.c
index 5bfd7f84d721167cf2a4855750e1c08c45acef46..e2ec6d9575bf6227eb05af00f76f503c3b9e2311 100644 (file)
--- a/bacula/src/lib/daemon.c
+++ b/bacula/src/lib/daemon.c
@@ -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.

diff --git a/bacula/src/lib/dlist.c b/bacula/src/lib/dlist.c
index 52fdd48026d70a73fd17c88cce526e19232ac174..3f17a7d853318cb42870ec2f7ebe1516c2bb8d82 100644 (file)
--- a/bacula/src/lib/dlist.c
+++ b/bacula/src/lib/dlist.c
@@ -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.

diff --git a/bacula/src/lib/dlist.h b/bacula/src/lib/dlist.h
index f5c0758dbf7eaa1223ec9d969053f7a7f3500bfc..af633e2d877eed8bd989842f78fb8e2c54cae1dd 100644 (file)
--- a/bacula/src/lib/dlist.h
+++ b/bacula/src/lib/dlist.h
@@ -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.

diff --git a/bacula/src/lib/edit.c b/bacula/src/lib/edit.c
index 89768f5d941d6d0f38d8dec7d197734b6e7140dd..ee435affb187fa06740a5869808a1156fd3533e6 100644 (file)
--- a/bacula/src/lib/edit.c
+++ b/bacula/src/lib/edit.c
@@ -27,7 +27,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.

diff --git a/bacula/src/lib/guid_to_name.c b/bacula/src/lib/guid_to_name.c
index e77cd4f6771c55a99dd51c3d9e7e323ec7b7d887..90747896a8bd796b871c3d423656ca70296336e6 100644 (file)
--- a/bacula/src/lib/guid_to_name.c
+++ b/bacula/src/lib/guid_to_name.c
@@ -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.

diff --git a/bacula/src/lib/guid_to_name.h b/bacula/src/lib/guid_to_name.h
index 0fb1acc919fb66e45eef32557082ace45ef0c109..5e4002d0ff4c76fefef66e98e5096bcf189fb1fe 100644 (file)
--- a/bacula/src/lib/guid_to_name.h
+++ b/bacula/src/lib/guid_to_name.h
@@ -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.

diff --git a/bacula/src/lib/hmac.c b/bacula/src/lib/hmac.c
index 471c357ab816d6532c467cee673e1164448db45e..a40a9312192af6e9c701626c297c47f4252a6bd9 100644 (file)
--- a/bacula/src/lib/hmac.c
+++ b/bacula/src/lib/hmac.c
@@ -29,7 +29,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.

diff --git a/bacula/src/lib/htable.c b/bacula/src/lib/htable.c
index 25cafb9f547eef75722ec3aec6c3d5908b5e5055..121c4c513d4a8e2b82fedd4c9d5c55e4e5e2853c 100644 (file)
--- a/bacula/src/lib/htable.c
+++ b/bacula/src/lib/htable.c
@@ -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.

diff --git a/bacula/src/lib/htable.h b/bacula/src/lib/htable.h
index 48dcc2ebaca68d7636dbc3eca086dbff12ac23cd..3fe645f40c5a5d57338f7a8f51e5127c90fc4590 100644 (file)
--- a/bacula/src/lib/htable.h
+++ b/bacula/src/lib/htable.h
@@ -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.

diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index 1fb6b9823520b8f22dea4143dc033365282128e1..10c6b77dd2ee7f764c36074ce291d47a423ef795 100644 (file)
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -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.

diff --git a/bacula/src/lib/lex.c b/bacula/src/lib/lex.c
index 66a54e53db3879646a7a3dde65a7cc2918c6a30a..808b23a5a7dbc9a01b8d32dd17126498799c463a 100644 (file)
--- a/bacula/src/lib/lex.c
+++ b/bacula/src/lib/lex.c
@@ -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.

diff --git a/bacula/src/lib/lex.h b/bacula/src/lib/lex.h
index 25544b568fa87559d20f1f610a8240994c7cad9e..b4cebb5ba0ec11daa542fac29ad2cd2715b5d5de 100644 (file)
--- a/bacula/src/lib/lex.h
+++ b/bacula/src/lib/lex.h
@@ -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.

diff --git a/bacula/src/lib/lib.h b/bacula/src/lib/lib.h
index 3820c3a3347adff47fad351c00135ee5b3ec2580..2b166f423beaf65da7891e656648f2010f75cde0 100644 (file)
--- a/bacula/src/lib/lib.h
+++ b/bacula/src/lib/lib.h
@@ -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.

diff --git a/bacula/src/lib/md5.c b/bacula/src/lib/md5.c
index 97b0517f48d304db738ae0daa4a8a593c7d6c89d..26532fbf0f3a1355aeb38a24d337d0031208f9ac 100644 (file)
--- a/bacula/src/lib/md5.c
+++ b/bacula/src/lib/md5.c
@@ -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.

diff --git a/bacula/src/lib/md5.h b/bacula/src/lib/md5.h
index 62d8c220a66cf5c0953dbeb9238edc3abfba976e..7752e3d41c9b7c3faa3da0bb2372d50b629d9848 100644 (file)
--- a/bacula/src/lib/md5.h
+++ b/bacula/src/lib/md5.h
@@ -27,7 +27,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.

diff --git a/bacula/src/lib/mem_pool.c b/bacula/src/lib/mem_pool.c
index 35373a277e594d858e953b36547f711ceda1a204..b54af7b2b3063c2d50ce5a2612f269317a1f4c64 100644 (file)
--- a/bacula/src/lib/mem_pool.c
+++ b/bacula/src/lib/mem_pool.c
@@ -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.

diff --git a/bacula/src/lib/mem_pool.h b/bacula/src/lib/mem_pool.h
index e407522a63fd9da0760d2aaef85460064f669cf0..cdf03d71bf7b6741c1f889bbecb7c86d8b0b893b 100644 (file)
--- a/bacula/src/lib/mem_pool.h
+++ b/bacula/src/lib/mem_pool.h
@@ -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.

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 17e8a745114f399823be00f5433c1d66e0abdd9a..0ffb592b984eec42b97bf621d6b517e7cbe41e98 100644 (file)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -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.

diff --git a/bacula/src/lib/message.h b/bacula/src/lib/message.h
index 6d6ff1a83311de667f4ec86b352c761ba67756a8..3ac586a5e864762bbc6496902d34ae10de15983a 100644 (file)
--- a/bacula/src/lib/message.h
+++ b/bacula/src/lib/message.h
@@ -26,7 +26,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.

diff --git a/bacula/src/lib/openssl.c b/bacula/src/lib/openssl.c
index 7017aa7ada92fd71b9700b76ddf5a615ae7d76ae..994b29ebcb0ed25caaa0c11bc81450571e99b86b 100644 (file)
--- a/bacula/src/lib/openssl.c
+++ b/bacula/src/lib/openssl.c
@@ -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.

diff --git a/bacula/src/lib/openssl.h b/bacula/src/lib/openssl.h
index b401ba57a79a36040c973b15b27d57ef0d725fee..55303d4e51dea5e0c0738326c895e1c85c32f29c 100644 (file)
--- a/bacula/src/lib/openssl.h
+++ b/bacula/src/lib/openssl.h
@@ -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.

diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
index 63003e8aea371f8c55d6e2f80a5346417f2b1bda..52927627d07a7423bc08677dfe0cca86ce095f3a 100644 (file)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -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.

diff --git a/bacula/src/lib/parse_conf.h b/bacula/src/lib/parse_conf.h
index 8012beeca4e099318e06c8191c85534285900edf..395dee19d19d84b3319757c5a79eb7281e545a65 100644 (file)
--- a/bacula/src/lib/parse_conf.h
+++ b/bacula/src/lib/parse_conf.h
@@ -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.

diff --git a/bacula/src/lib/plugins.c b/bacula/src/lib/plugins.c
index 84ea358ec80fa53e4d8c885ccf21f5bb523bffd5..786f9ea6825ec02cef1ba34623aeefedb9550919 100644 (file)
--- a/bacula/src/lib/plugins.c
+++ b/bacula/src/lib/plugins.c
@@ -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.

diff --git a/bacula/src/lib/plugins.h b/bacula/src/lib/plugins.h
index 990f5985aeb58ef842d6957b9099d3efac66fbca..ae60f8328da2d768f16cd3654c9ab675745e3348 100644 (file)
--- a/bacula/src/lib/plugins.h
+++ b/bacula/src/lib/plugins.h
@@ -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.

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 80df88a0f4f74b18c50cfe036406534084251301..3429779c68be421c84236b4c461cdc3c5bcf8466 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -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.

diff --git a/bacula/src/lib/pythonlib.c b/bacula/src/lib/pythonlib.c
index 329ce3abc13d2d2c0744bd1685633cbdc992fdfc..9568ca91a43888a7bd592bf4895e2abffcf29e97 100644 (file)
--- a/bacula/src/lib/pythonlib.c
+++ b/bacula/src/lib/pythonlib.c
@@ -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.

diff --git a/bacula/src/lib/queue.c b/bacula/src/lib/queue.c
index b38b0645568b63c4f96376bc82a90e4976cc9142..53a6ce3bf1e0928b44dc41b48c64a38efaebd9fe 100644 (file)
--- a/bacula/src/lib/queue.c
+++ b/bacula/src/lib/queue.c
@@ -33,7 +33,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.

diff --git a/bacula/src/lib/queue.h b/bacula/src/lib/queue.h
index 5390dea0387e802be06e4bb62d0aaf6651faaabc..621447964c227aa9e557b22f5ce9ee3e01ff7746 100644 (file)
--- a/bacula/src/lib/queue.h
+++ b/bacula/src/lib/queue.h
@@ -25,7 +25,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.

diff --git a/bacula/src/lib/rblist.c b/bacula/src/lib/rblist.c
index 5c96f7af13ef35746bc85be117c9d54975a6a1df..8cceece0af8b1aebdaa6a01dd43ac31c927395de 100644 (file)
--- a/bacula/src/lib/rblist.c
+++ b/bacula/src/lib/rblist.c
@@ -33,7 +33,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.

diff --git a/bacula/src/lib/rblist.h b/bacula/src/lib/rblist.h
index 4c9be95f614f486e647c076c03aaa942f51dd91d..940cd9fe9bb4ec1ea6595228afa15871f78a877d 100644 (file)
--- a/bacula/src/lib/rblist.h
+++ b/bacula/src/lib/rblist.h
@@ -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.

diff --git a/bacula/src/lib/res.c b/bacula/src/lib/res.c
index 8ba547b5a3895348d8a1b37abdda602940b4bac0..a66da546327f2a9c7afd6ecb41f81d750efd6810 100644 (file)
--- a/bacula/src/lib/res.c
+++ b/bacula/src/lib/res.c
@@ -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.

diff --git a/bacula/src/lib/runscript.c b/bacula/src/lib/runscript.c
index 39e10a0117037fc49517bc9498c45d081ed15c53..c2f61aa8c9f16eda770622e047a456c392c63215 100644 (file)
--- a/bacula/src/lib/runscript.c
+++ b/bacula/src/lib/runscript.c
@@ -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.

diff --git a/bacula/src/lib/runscript.h b/bacula/src/lib/runscript.h
index 5d98260987162d1c7114cc5f7ba4cbb5a70d5c36..a7ccf4ab0567c1e8b15fdc34ad52125bd663b343 100644 (file)
--- a/bacula/src/lib/runscript.h
+++ b/bacula/src/lib/runscript.h
@@ -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.

diff --git a/bacula/src/lib/rwlock.c b/bacula/src/lib/rwlock.c
index 563752c0b88c30bd087e6d7518dc8b897cc7e1f4..b46f91407b462185c4cbeca17bab104d4717bd94 100644 (file)
--- a/bacula/src/lib/rwlock.c
+++ b/bacula/src/lib/rwlock.c
@@ -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.

diff --git a/bacula/src/lib/rwlock.h b/bacula/src/lib/rwlock.h
index a2404d3740eff3af4617518c5826127b5868628d..f03af8eb9f949b748382b59d4b4bce0a9f0dd0a9 100644 (file)
--- a/bacula/src/lib/rwlock.h
+++ b/bacula/src/lib/rwlock.h
@@ -32,7 +32,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.

diff --git a/bacula/src/lib/scan.c b/bacula/src/lib/scan.c
index 82536eb2b434170b743805b3cf258362f6bba88b..38879a8ad1bbd083774866a145ece21506ca1067 100644 (file)
--- a/bacula/src/lib/scan.c
+++ b/bacula/src/lib/scan.c
@@ -27,7 +27,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.

diff --git a/bacula/src/lib/serial.c b/bacula/src/lib/serial.c
index 5b2aabcb9cea92d4f0aef7f70a9696715a5864eb..6612e657df9fcd48cf72e43b252a9f162b7d12ef 100644 (file)
--- a/bacula/src/lib/serial.c
+++ b/bacula/src/lib/serial.c
@@ -28,7 +28,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.

diff --git a/bacula/src/lib/signal.c b/bacula/src/lib/signal.c
index 7643bf643ded207525cf88b9fc1827d75c044f0b..8590831938599bf7f50e0dbc6a8ceadd063c6222 100644 (file)
--- a/bacula/src/lib/signal.c
+++ b/bacula/src/lib/signal.c
@@ -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.

diff --git a/bacula/src/lib/smartall.c b/bacula/src/lib/smartall.c
index 862cce5471c8f27a32b7aa2aaa0f477fd1d6a1f2..675a218f3f5b31d3cad219c311cbafb9dc9e500b 100644 (file)
--- a/bacula/src/lib/smartall.c
+++ b/bacula/src/lib/smartall.c
@@ -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.

diff --git a/bacula/src/lib/status.h b/bacula/src/lib/status.h
index c7c2a934d97497b87846ec62eaff39d792b56e37..f496f526ebd2f02e9208738338d5b222ce294dc3 100644 (file)
--- a/bacula/src/lib/status.h
+++ b/bacula/src/lib/status.h
@@ -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.

diff --git a/bacula/src/lib/tls.c b/bacula/src/lib/tls.c
index ecfed33399f10927163ded56d1041f2f66d14ae3..54a424d3b7803930b3612a6b67be1b13dee86e98 100644 (file)
--- a/bacula/src/lib/tls.c
+++ b/bacula/src/lib/tls.c
@@ -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.

diff --git a/bacula/src/lib/tree.c b/bacula/src/lib/tree.c
index ac9d4703b30bad64c3995a9695c93030b5915bc0..3648f19b9cc07775dcbd0cca4ae72fc1ddbd2d0b 100644 (file)
--- a/bacula/src/lib/tree.c
+++ b/bacula/src/lib/tree.c
@@ -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.

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 2aeb5a6ba36fdda2232306a066205680edf76c90..3ffa4f40fdf3e470af2cfefc4e22b9930ca5ae19 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -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.

diff --git a/bacula/src/lib/var.c b/bacula/src/lib/var.c
index a9aea354e86b33961a1e80f7d422c2446a7909e9..466091b34715950f2efb4303a617b75b965f8ebf 100644 (file)
--- a/bacula/src/lib/var.c
+++ b/bacula/src/lib/var.c
@@ -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.

diff --git a/bacula/src/lib/watchdog.c b/bacula/src/lib/watchdog.c
index 72263d92cd422765fc848dee578b9adc627897d1..2e39e7349b1a8664184b6aab06f47dbea1e36c7e 100644 (file)
--- a/bacula/src/lib/watchdog.c
+++ b/bacula/src/lib/watchdog.c
@@ -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.

diff --git a/bacula/src/lib/workq.c b/bacula/src/lib/workq.c
index 3a13907ef33d6769d7c4842a86c8f953090c10c0..2744d23c92e7f25a4f7ee1b7bd3f2b853c93e4a4 100644 (file)
--- a/bacula/src/lib/workq.c
+++ b/bacula/src/lib/workq.c
@@ -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.

diff --git a/bacula/src/plugins/dir/example-plugin-dir.c b/bacula/src/plugins/dir/example-plugin-dir.c
index 704243e371738cdac9ccf1ed4bf6de9acc024f0c..14129e6bebb26b2c85126158d2b5c8fbefd5ee1c 100644 (file)
--- a/bacula/src/plugins/dir/example-plugin-dir.c
+++ b/bacula/src/plugins/dir/example-plugin-dir.c
@@ -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.

diff --git a/bacula/src/plugins/fd/bpipe-fd.c b/bacula/src/plugins/fd/bpipe-fd.c
index a0890c7b560b055f24d58c72be87edcdb6d6434d..c083b1361f78ce3f7a2396339d657bf8e6abbca8 100644 (file)
--- a/bacula/src/plugins/fd/bpipe-fd.c
+++ b/bacula/src/plugins/fd/bpipe-fd.c
@@ -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.

diff --git a/bacula/src/plugins/fd/example-plugin-fd.c b/bacula/src/plugins/fd/example-plugin-fd.c
index c0533186a2d6c32b04865cfc5eb49060ea8b3744..7553e15a5b1232fab04846bf1ab803a76eaaf884 100644 (file)
--- a/bacula/src/plugins/fd/example-plugin-fd.c
+++ b/bacula/src/plugins/fd/example-plugin-fd.c
@@ -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.

diff --git a/bacula/src/plugins/sd/main.c b/bacula/src/plugins/sd/main.c
index a381c7ae24d68357a6088cc2c13aa6b221d5704c..a81f6eb6cfecd1ec15a66ef247e5f11f27fadef2 100644 (file)
--- a/bacula/src/plugins/sd/main.c
+++ b/bacula/src/plugins/sd/main.c
@@ -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.

diff --git a/bacula/src/plugins/sd/plugin-sd.c b/bacula/src/plugins/sd/plugin-sd.c
index 17f74b06ee2e90c694403c052e7d19b418e89d9a..c26938b91a51c9f8c79c39ca5c28b909cc2727bd 100644 (file)
--- a/bacula/src/plugins/sd/plugin-sd.c
+++ b/bacula/src/plugins/sd/plugin-sd.c
@@ -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.

diff --git a/bacula/src/plugins/sd/plugin-sd.h b/bacula/src/plugins/sd/plugin-sd.h
index cc78a42cb628c23a98ede3e091271b600b10b743..b0a29142edcf7ec835dccf7dca1163e71e540f12 100644 (file)
--- a/bacula/src/plugins/sd/plugin-sd.h
+++ b/bacula/src/plugins/sd/plugin-sd.h
@@ -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.

diff --git a/bacula/src/qt-console/bat.h b/bacula/src/qt-console/bat.h
index 308f1e05cb3843e2a7c7908b672f13501fc356d4..757237f82bfd70eaac3c5f4abd83af2f819d02b1 100644 (file)
--- a/bacula/src/qt-console/bat.h
+++ b/bacula/src/qt-console/bat.h
@@ -23,7 +23,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.

diff --git a/bacula/src/qt-console/bat_conf.cpp b/bacula/src/qt-console/bat_conf.cpp
index 403591caf216f5a34587c9e52577edb719de4703..30dd4f18c42156212d1189cdbdcda55b24832e2f 100644 (file)
--- a/bacula/src/qt-console/bat_conf.cpp
+++ b/bacula/src/qt-console/bat_conf.cpp
@@ -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.

diff --git a/bacula/src/qt-console/bat_conf.h b/bacula/src/qt-console/bat_conf.h
index 69b86f77d8dcdf9e642a16e0f330f58a3e8dc32d..d50f0ce3bbd254f3953174968553463bb34b2d19 100644 (file)
--- a/bacula/src/qt-console/bat_conf.h
+++ b/bacula/src/qt-console/bat_conf.h
@@ -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.

diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index e96ca6a0d0948e81cb37e906a5169c92889a1685..422d0cf4a6961ad30b79dc5171f4ee61ea545d4a 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -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.

diff --git a/bacula/src/qt-console/bcomm/dircomm.h b/bacula/src/qt-console/bcomm/dircomm.h
index 08488b9fd9347add5a19a844570e3e51681f2dfd..b04203648196c5a7d20d6c2e6460b08135edfa29 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.h
+++ b/bacula/src/qt-console/bcomm/dircomm.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/bcomm/dircomm_auth.cpp b/bacula/src/qt-console/bcomm/dircomm_auth.cpp
index 8d47785066819bb2a2720ad5a27bb2fda81da0c3..ee68cb321177f0e04ab0b0dafadb841397596393 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm_auth.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm_auth.cpp
@@ -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.

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index 60c2645eea95915279d8f0cc6070e857505d97c1..09a9def72b60befac52ee7a4a5967b958b116bf5 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -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.

diff --git a/bacula/src/qt-console/clients/clients.h b/bacula/src/qt-console/clients/clients.h
index 9779dde686e7143b0047f43d722abaf9808045b8..8c206faa49f6d4fe5f98f40b8f148f89d1a3cb6e 100644 (file)
--- a/bacula/src/qt-console/clients/clients.h
+++ b/bacula/src/qt-console/clients/clients.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/console/authenticate.cpp b/bacula/src/qt-console/console/authenticate.cpp
index dad53f44d2b39d1988699edd330fd314caf2c0b3..b2800eefb97cbd442f5eb6341f5796cc005c4988 100644 (file)
--- a/bacula/src/qt-console/console/authenticate.cpp
+++ b/bacula/src/qt-console/console/authenticate.cpp
@@ -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.

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 7defc72e65c5cf371b4be690d04c60e0fb0212a5..5f3d0ebc2a8430321704dae19e54c22ba539bce7 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -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.

diff --git a/bacula/src/qt-console/console/console.h b/bacula/src/qt-console/console/console.h
index a2107dac04abb5223c2c65d2e0118ceef91620d0..31d6d8064cfa0cf1c2d3020f6c8fc272343eed24 100644 (file)
--- a/bacula/src/qt-console/console/console.h
+++ b/bacula/src/qt-console/console/console.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index 17564b4a0c45b9d941973d810972b938fc9f7f2b..915afa933e888c6335b5716b3614e18384b02d5f 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -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.

diff --git a/bacula/src/qt-console/fileset/fileset.h b/bacula/src/qt-console/fileset/fileset.h
index ab2ef52c7e9dcd829e16613428c0d5097badd0b5..8973c3405ee7c677498be6569771bd5b86607a40 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.h
+++ b/bacula/src/qt-console/fileset/fileset.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/help/help.cpp b/bacula/src/qt-console/help/help.cpp
index 1e238a0283162dec09d56be16e52e0c3e3937621..b689e4a200c0893c10373dae659ca7c3a47b6028 100644 (file)
--- a/bacula/src/qt-console/help/help.cpp
+++ b/bacula/src/qt-console/help/help.cpp
@@ -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.

diff --git a/bacula/src/qt-console/help/help.h b/bacula/src/qt-console/help/help.h
index 8fce40aa2833af50b4b38ef044ca4e5039bcd1fe..ae75722c9d8e7b528f4e8a06755c917387a376c8 100644 (file)
--- a/bacula/src/qt-console/help/help.h
+++ b/bacula/src/qt-console/help/help.h
@@ -23,7 +23,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.

diff --git a/bacula/src/qt-console/jobgraphs/jobplot.cpp b/bacula/src/qt-console/jobgraphs/jobplot.cpp
index d930e072d8be59ce5f7abf2e8e6dedd9d4de5b53..d3a02e9d9fdff8b7f25d2b89ab3f4a5eadbcad5e 100644 (file)
--- a/bacula/src/qt-console/jobgraphs/jobplot.cpp
+++ b/bacula/src/qt-console/jobgraphs/jobplot.cpp
@@ -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.

diff --git a/bacula/src/qt-console/jobgraphs/jobplot.h b/bacula/src/qt-console/jobgraphs/jobplot.h
index 3fc06e43a7c2fe9dbb6040fa6a64d3362b09a3ec..5d74000001622f600145e7fe63a5dd6c46f0ae88 100644 (file)
--- a/bacula/src/qt-console/jobgraphs/jobplot.h
+++ b/bacula/src/qt-console/jobgraphs/jobplot.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index 3c1707a9c1ab859caa45ad77d7970bbc8c3729fc..1e08be172d0caee34fc0adbdb23935d88acf4a71 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -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.

diff --git a/bacula/src/qt-console/joblist/joblist.h b/bacula/src/qt-console/joblist/joblist.h
index 0bdebdef8788d400f15d9000baf15afc4bd7db28..7138e3b50700e555a386b1602d2367e7c1065768 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.h
+++ b/bacula/src/qt-console/joblist/joblist.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/joblog/joblog.cpp b/bacula/src/qt-console/joblog/joblog.cpp
index 07e247fae404d57f4b5974b5635c3ba5be96cc8d..566f8f997b5bf0162578dd56c449f255340f4454 100644 (file)
--- a/bacula/src/qt-console/joblog/joblog.cpp
+++ b/bacula/src/qt-console/joblog/joblog.cpp
@@ -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.

diff --git a/bacula/src/qt-console/joblog/joblog.h b/bacula/src/qt-console/joblog/joblog.h
index 47ce925dbec985c8fcd3c28b2fff8e3bc25f3155..7446dd72684b5bbd134c4d795f1f648515f936ca 100644 (file)
--- a/bacula/src/qt-console/joblog/joblog.h
+++ b/bacula/src/qt-console/joblog/joblog.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/jobs/jobs.cpp b/bacula/src/qt-console/jobs/jobs.cpp
index 02faf498399c74984b53e6b9246598345ee1ebe3..4bb07ae3a8476de1b24fa58751d8db6fcd02ad50 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.cpp
+++ b/bacula/src/qt-console/jobs/jobs.cpp
@@ -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.

diff --git a/bacula/src/qt-console/jobs/jobs.h b/bacula/src/qt-console/jobs/jobs.h
index 85a1e5aed9e7f5f99febd36d634d8ded05a4be91..de255bdda66cd4a56bc075c52c2b51220d5248aa 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.h
+++ b/bacula/src/qt-console/jobs/jobs.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/label/label.cpp b/bacula/src/qt-console/label/label.cpp
index 98f7b532cca1b99c25221a319f944c2b9f736234..c6a8b5a7893bfb53b91b6f8cb02629e4e0658d39 100644 (file)
--- a/bacula/src/qt-console/label/label.cpp
+++ b/bacula/src/qt-console/label/label.cpp
@@ -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.

diff --git a/bacula/src/qt-console/label/label.h b/bacula/src/qt-console/label/label.h
index 202298bc3cedcab017f1d1ec87d8be328597a74c..03bd6697967e81701429e2349c61f8aa0c206191 100644 (file)
--- a/bacula/src/qt-console/label/label.h
+++ b/bacula/src/qt-console/label/label.h
@@ -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.

diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index bfb4edc32beb5b6534f8ee67b8b4b27c62418c37..3e3cab1a046bdf87f3209fe7009f499e2a38765a 100644 (file)
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -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.

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index d61302b23d7dada266e6e8f43f040a9316c87f71..eeefdf650cdb4ef58d254ea6807e1125592b7197 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -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.

diff --git a/bacula/src/qt-console/mainwin.h b/bacula/src/qt-console/mainwin.h
index d3b6b29dd3718d38c22cd77e5d021956340d3e54..64df8f51dac0502cf21bf5047adfd907d1503879 100644 (file)
--- a/bacula/src/qt-console/mainwin.h
+++ b/bacula/src/qt-console/mainwin.h
@@ -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.

diff --git a/bacula/src/qt-console/mediaedit/mediaedit.cpp b/bacula/src/qt-console/mediaedit/mediaedit.cpp
index 892e946a9230b5f9fefef86733d4af40adac158b..f9914bb5a363d3b263f33ca22b8331577e856458 100644 (file)
--- a/bacula/src/qt-console/mediaedit/mediaedit.cpp
+++ b/bacula/src/qt-console/mediaedit/mediaedit.cpp
@@ -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.

diff --git a/bacula/src/qt-console/mediaedit/mediaedit.h b/bacula/src/qt-console/mediaedit/mediaedit.h
index 9881b606b14195b33bc64209b595eb16e168c9c1..978d5d05d595bfce12d36d13ad6d98267dfd3ff1 100644 (file)
--- a/bacula/src/qt-console/mediaedit/mediaedit.h
+++ b/bacula/src/qt-console/mediaedit/mediaedit.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index 09e434c765ffed9c63571b21b91b79ba68e26518..57e9683e49cff280c19706d2d0ff583d5edcd66c 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -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.

diff --git a/bacula/src/qt-console/medialist/medialist.h b/bacula/src/qt-console/medialist/medialist.h
index c162c80d73f462bca27b84cdeaa2a4aece1a0b6a..f51f565e3bdea9230a6c40fa06c87a4fb88e3778 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.h
+++ b/bacula/src/qt-console/medialist/medialist.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/mount/mount.cpp b/bacula/src/qt-console/mount/mount.cpp
index 68326056390cdae8512d4ae84660bca24c0de10b..905b954cc67060a55a256eb53daeab5de7de6c2e 100644 (file)
--- a/bacula/src/qt-console/mount/mount.cpp
+++ b/bacula/src/qt-console/mount/mount.cpp
@@ -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.

diff --git a/bacula/src/qt-console/mount/mount.h b/bacula/src/qt-console/mount/mount.h
index 1676d7b102b11d3c141a0690484cdfa3aa2e1f58..575de0b40de241bcaeee4f31b288dddec8d11446 100644 (file)
--- a/bacula/src/qt-console/mount/mount.h
+++ b/bacula/src/qt-console/mount/mount.h
@@ -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.

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index a6f5c654fe8b46a880e7ef66466b7f46f2bc86cf..6823c3ec2dc87cb3fa0e705e91a4c341463ff86c 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -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.

diff --git a/bacula/src/qt-console/pages.h b/bacula/src/qt-console/pages.h
index c987716e1c6139853ad54700f5f28ff225aea7a4..feefa046b3f44b2925024502ab5614cd5ab62387 100644 (file)
--- a/bacula/src/qt-console/pages.h
+++ b/bacula/src/qt-console/pages.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/relabel/relabel.cpp b/bacula/src/qt-console/relabel/relabel.cpp
index 42074d0d4ccbcad38394f752e40f94a6dc688b4f..342ab22c134924498a0e8b957c12bef681a4c890 100644 (file)
--- a/bacula/src/qt-console/relabel/relabel.cpp
+++ b/bacula/src/qt-console/relabel/relabel.cpp
@@ -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.

diff --git a/bacula/src/qt-console/relabel/relabel.h b/bacula/src/qt-console/relabel/relabel.h
index 59f9a0124b0b0c2850ba931590119f9e25175433..d314235c4bef223eaf36e1c2d5a97e6d1afc6b0c 100644 (file)
--- a/bacula/src/qt-console/relabel/relabel.h
+++ b/bacula/src/qt-console/relabel/relabel.h
@@ -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.

diff --git a/bacula/src/qt-console/restore/brestore.cpp b/bacula/src/qt-console/restore/brestore.cpp
index c616bffd1b82cc710c7cafa5838d3701e7bbb694..67a37ecee20c59557276af5bd950378c91b7ab58 100644 (file)
--- a/bacula/src/qt-console/restore/brestore.cpp
+++ b/bacula/src/qt-console/restore/brestore.cpp
@@ -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.

diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index 32adc173d1950793091ed8ce7dd59250e88eca72..ef1ff534a5a09119f5a10f729e599b6c38113ffd 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -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.

diff --git a/bacula/src/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp
index d4e02095a6886529e7f50d9ecf206c1720ec49cd..2c7da9940f3fd51029d63a97cd563f616714a561 100644 (file)
--- a/bacula/src/qt-console/restore/restore.cpp
+++ b/bacula/src/qt-console/restore/restore.cpp
@@ -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.

diff --git a/bacula/src/qt-console/restore/restore.h b/bacula/src/qt-console/restore/restore.h
index c70c9a9647b869a5dde00bae306af7d2e2d68f98..bfb83659baece47e9821fa7dcf0eec8b0838afe0 100644 (file)
--- a/bacula/src/qt-console/restore/restore.h
+++ b/bacula/src/qt-console/restore/restore.h
@@ -23,7 +23,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.

diff --git a/bacula/src/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp
index 9171b321c4c7114b3bbe2c1c79f5640df17b2783..8ebbc9563dd73f631eec67c53c4402368a229633 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.cpp
+++ b/bacula/src/qt-console/restore/restoretree.cpp
@@ -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.

diff --git a/bacula/src/qt-console/restore/restoretree.h b/bacula/src/qt-console/restore/restoretree.h
index 1ad1f176ea00c2e9017b329c9375e516085a2afb..881b02c403142353f3fe925621b0f1631261846e 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.h
+++ b/bacula/src/qt-console/restore/restoretree.h
@@ -23,7 +23,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.

diff --git a/bacula/src/qt-console/run/estimate.cpp b/bacula/src/qt-console/run/estimate.cpp
index f3193a467996c38de2c4b0817c9f46e600aedd4f..28f8ddf1890f185c00612b2711104a283cda9c00 100644 (file)
--- a/bacula/src/qt-console/run/estimate.cpp
+++ b/bacula/src/qt-console/run/estimate.cpp
@@ -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.

diff --git a/bacula/src/qt-console/run/prune.cpp b/bacula/src/qt-console/run/prune.cpp
index 72a951d2f81b38a011112e7abd95e5a590a61d63..cf6c4b71a1198d9542c678c20e624d2477821ef2 100644 (file)
--- a/bacula/src/qt-console/run/prune.cpp
+++ b/bacula/src/qt-console/run/prune.cpp
@@ -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.

diff --git a/bacula/src/qt-console/run/run.cpp b/bacula/src/qt-console/run/run.cpp
index d6a0ccf9059cf27ff4846a56cbae058341c0df2e..7d32c50a4a799755bea223f20b2ab476a537b122 100644 (file)
--- a/bacula/src/qt-console/run/run.cpp
+++ b/bacula/src/qt-console/run/run.cpp
@@ -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.

diff --git a/bacula/src/qt-console/run/runcmd.cpp b/bacula/src/qt-console/run/runcmd.cpp
index 65e8380f5a4eedb6f1a2e5859d2e09527665e3be..587ee053c1403f04fd53c327c5cdef768180ae8b 100644 (file)
--- a/bacula/src/qt-console/run/runcmd.cpp
+++ b/bacula/src/qt-console/run/runcmd.cpp
@@ -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.

diff --git a/bacula/src/qt-console/select/select.cpp b/bacula/src/qt-console/select/select.cpp
index 061027d5aff0f1e0ceb77bee05119fd3cfd6090c..ee36f8d06178ec9e1ca73c890c1935b9e82aeaab 100644 (file)
--- a/bacula/src/qt-console/select/select.cpp
+++ b/bacula/src/qt-console/select/select.cpp
@@ -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.

diff --git a/bacula/src/qt-console/status/clientstat.cpp b/bacula/src/qt-console/status/clientstat.cpp
index 0ef28f89b3d544eb88cbce31459465c2f1886b87..c215cccefb969b7b542f6e32d30992509906e6e1 100644 (file)
--- a/bacula/src/qt-console/status/clientstat.cpp
+++ b/bacula/src/qt-console/status/clientstat.cpp
@@ -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.

diff --git a/bacula/src/qt-console/status/clientstat.h b/bacula/src/qt-console/status/clientstat.h
index 3f47f01afbd9a955e7bc7063e96d86342c7c0a71..ccae6551b5feb29068febf7e6814999c94de34f9 100644 (file)
--- a/bacula/src/qt-console/status/clientstat.h
+++ b/bacula/src/qt-console/status/clientstat.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/status/dirstat.cpp b/bacula/src/qt-console/status/dirstat.cpp
index 911c1a6c55cb280405d36f742224820b02651cc2..792b33f93bb769cde4d48178cf137e8ac10109ab 100644 (file)
--- a/bacula/src/qt-console/status/dirstat.cpp
+++ b/bacula/src/qt-console/status/dirstat.cpp
@@ -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.

diff --git a/bacula/src/qt-console/status/dirstat.h b/bacula/src/qt-console/status/dirstat.h
index 97d00fe5890b049681b0c983ac66aa8f9d4c907c..f0f8e23ec27cd0c17a2afa11f35b60efe19571d9 100644 (file)
--- a/bacula/src/qt-console/status/dirstat.h
+++ b/bacula/src/qt-console/status/dirstat.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/status/storstat.cpp b/bacula/src/qt-console/status/storstat.cpp
index d9dfd9dba9a86280e782cac5f54a928507ed7ba6..fa4a41d9792123c45cb5cbeaa53f16491f606971 100644 (file)
--- a/bacula/src/qt-console/status/storstat.cpp
+++ b/bacula/src/qt-console/status/storstat.cpp
@@ -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.

diff --git a/bacula/src/qt-console/status/storstat.h b/bacula/src/qt-console/status/storstat.h
index 6577a9526eae96c0e373b191487c3cda332475fb..8648d39a5e7df08fd48816d19e1ec29038623a87 100644 (file)
--- a/bacula/src/qt-console/status/storstat.h
+++ b/bacula/src/qt-console/status/storstat.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 9ba048ab0b9fc9bec89c432793da86d8e4456ff4..36e077525067b32bb542fae63a6f36e50dfc2a93 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -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.

diff --git a/bacula/src/qt-console/storage/storage.h b/bacula/src/qt-console/storage/storage.h
index c2be870a75f8f4a86c36d0ef45c42d0b8c681503..3e778f12bb76e4cb4257e51afed424f9beb8495d 100644 (file)
--- a/bacula/src/qt-console/storage/storage.h
+++ b/bacula/src/qt-console/storage/storage.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/util/comboutil.cpp b/bacula/src/qt-console/util/comboutil.cpp
index 2e401d8de8b061fe78eb94313ebb6379cb03376f..5b5cf4d70edd80bcffd3079b04278379cb5dfbef 100644 (file)
--- a/bacula/src/qt-console/util/comboutil.cpp
+++ b/bacula/src/qt-console/util/comboutil.cpp
@@ -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.

diff --git a/bacula/src/qt-console/util/comboutil.h b/bacula/src/qt-console/util/comboutil.h
index 8bc128a166a7db1b875d7748c0d1dab2bb981e96..14a341a8b5ffe75585714243b685dd9298e3647e 100644 (file)
--- a/bacula/src/qt-console/util/comboutil.h
+++ b/bacula/src/qt-console/util/comboutil.h
@@ -22,7 +22,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.

diff --git a/bacula/src/qt-console/util/fmtwidgetitem.cpp b/bacula/src/qt-console/util/fmtwidgetitem.cpp
index 6b30a767de703c152991305d93cdaf45d2cc913f..18d49fd6a584f7152dd5c6b64d58aa0dc809f220 100644 (file)
--- a/bacula/src/qt-console/util/fmtwidgetitem.cpp
+++ b/bacula/src/qt-console/util/fmtwidgetitem.cpp
@@ -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.

diff --git a/bacula/src/qt-console/util/fmtwidgetitem.h b/bacula/src/qt-console/util/fmtwidgetitem.h
index 66f3202691f561be45637af61efd4ea5c4a1b999..6acc0cb317d49147186f271bb909ba78bd0d2018 100644 (file)
--- a/bacula/src/qt-console/util/fmtwidgetitem.h
+++ b/bacula/src/qt-console/util/fmtwidgetitem.h
@@ -22,7 +22,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.

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 4af83a3343b45eaa1ae6cd16881380bc531f8b42..47a2a75eb8cc270fd0c4f2d437fb527610faa7ed 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -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.

diff --git a/bacula/src/stored/ansi_label.c b/bacula/src/stored/ansi_label.c
index 237064b6d972c935ceb18fe06b93966a3033194f..a6bacf547c34c87e104d1448b9b8c18da341932c 100644 (file)
--- a/bacula/src/stored/ansi_label.c
+++ b/bacula/src/stored/ansi_label.c
@@ -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.

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 382dd2d556a8b0a1e46ca7ca33e11b9c501b330a..3cb060ef55a8ea261a97596106c9ab535d47c84f 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -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.

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index c6b72b12506257e8ac5be74f00fee20ec4edcf34..685b74f43ddddde73983fb83ae9a1c8f24dac611 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -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.

diff --git a/bacula/src/stored/authenticate.c b/bacula/src/stored/authenticate.c
index bffb987e159539784e8d838bd25ce2933d152284..2363653fdfd67ce4b28b7dfd46bb72e97049239a 100644 (file)
--- a/bacula/src/stored/authenticate.c
+++ b/bacula/src/stored/authenticate.c
@@ -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.

diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c
index db0f640ae25dcb93e612e02cecf2fcab3a16a8a2..765c4ac528005b564774bda060bd98987f5e76da 100644 (file)
--- a/bacula/src/stored/autochanger.c
+++ b/bacula/src/stored/autochanger.c
@@ -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.

diff --git a/bacula/src/stored/bcopy.c b/bacula/src/stored/bcopy.c
index dc302f45b2c4d081e41539243f7037b80b6b99dc..e84560797ce97f6e11f865fa45deab6d6c2a6272 100644 (file)
--- a/bacula/src/stored/bcopy.c
+++ b/bacula/src/stored/bcopy.c
@@ -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.

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index b8ef13157b023c63096cb5a0795dbee9f0090c9d..72257d2624a7818389b5facf0be94704cfc5b772 100644 (file)
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -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.

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 7ac0491eab15fbdab24b85577068b0cabd60bb96..d3b72a9338da59956fa514dafc256d6f55eae7fb 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -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.
@@ -727,7 +727,6 @@ static bool terminate_writing_volume(DCR *dcr)
        Jmsg(dcr->jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
             dcr->VolCatInfo.VolCatName, dcr->jcr->Job);
        ok = false;
-       goto bail_out;
    }
    dcr->block->write_failed = true;
    if (!dev->weof(1)) {         /* end the tape */
@@ -780,7 +779,6 @@ static bool terminate_writing_volume(DCR *dcr)
       Jmsg(dcr->jcr, M_ERROR, 0, "%s", dev->errmsg);
    }
 
-bail_out:
    dev->set_ateot();                  /* no more writing this tape */
    Dmsg1(50, "*** Leave terminate_writing_volume -- %s\n", ok?"OK":"ERROR");
    return ok;

diff --git a/bacula/src/stored/block.h b/bacula/src/stored/block.h
index 221bfb5af6951f01c4b9f8e676fcaa885987a6f7..132a75114d3608a0aa174d232e51f516ef49b738 100644 (file)
--- a/bacula/src/stored/block.h
+++ b/bacula/src/stored/block.h
@@ -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.

diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index 0e3d9566f74e86617cc6a3f480cf6c8aee39d6d2..a86c09943cfd20de6a316e65a95185e079b4e831 100644 (file)
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -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.

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 265a6201d5c1907f2333dd32c9d46fd73918c50f..a42d66203ef2ae4f91ec6eadc314570cb8f6193f 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -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.

diff --git a/bacula/src/stored/bsr.h b/bacula/src/stored/bsr.h
index 6267a37f1f16c1191deb8ac36fa51cb90ea0712b..c8fa67cc379f32fad58625ea664f33a07860fef5 100644 (file)
--- a/bacula/src/stored/bsr.h
+++ b/bacula/src/stored/bsr.h
@@ -28,7 +28,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.

diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c
index 6a7844fcb945a6b0be7c83eb79e8164bc2be3d93..f0649111835a67f081249b0ab163b32519978599 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -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.

diff --git a/bacula/src/stored/butil.c b/bacula/src/stored/butil.c
index ed91e0497fcdfe44e1e699ea9989eb4b9c639580..b7356da107a9ef1165b345f8c300b6b3c8329474 100644 (file)
--- a/bacula/src/stored/butil.c
+++ b/bacula/src/stored/butil.c
@@ -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.

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index 0e72db6a84530de7182b80d605238ad46ff934b3..a9a54c514bba6dadf8ff6455721dbdeee583a33f 100644 (file)
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -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.

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index a0357649f1e7f3a4fd9e705e821ba533198cf397..8e015497b57c7d6f552784eebf27d1f7071d1435 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -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.

diff --git a/bacula/src/stored/device.c b/bacula/src/stored/device.c
index 1675cbf83183dace342fb3954263adf2be6c32f7..679a158a5f028d6adc57bfe73c766e0b56fdad6f 100644 (file)
--- a/bacula/src/stored/device.c
+++ b/bacula/src/stored/device.c
@@ -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.

diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index ad294bb0627c2d6ba4ed45e8eedb78eaf83a767f..6b358750e146783c9ea2e65e7869720a6ba19b63 100644 (file)
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -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.
@@ -838,7 +838,7 @@ static bool unmount_cmd(JCR *jcr)
              */
             /*  block_device(dev, BST_UNMOUNTED); replace with 2 lines below */
             dev->set_blocked(BST_UNMOUNTED);
-            dev->no_wait_id = 0;
+            clear_thread_id(dev->no_wait_id);
             if (!unload_autochanger(dcr, -1)) {
                dev->close();
             }

diff --git a/bacula/src/stored/dvd.c b/bacula/src/stored/dvd.c
index 0cfa2a5c091304b0ce3d59e7bc17389072debafd..d96d497c4a29ef728c09b9817f2147ce2d47b479 100644 (file)
--- a/bacula/src/stored/dvd.c
+++ b/bacula/src/stored/dvd.c
@@ -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.

diff --git a/bacula/src/stored/ebcdic.c b/bacula/src/stored/ebcdic.c
index 9f9d3387d96aba4cb412fb0e4773fdf795de94f8..e19c5079a19e98c0bb3442faa4441407b813fadd 100644 (file)
--- a/bacula/src/stored/ebcdic.c
+++ b/bacula/src/stored/ebcdic.c
@@ -24,7 +24,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.

diff --git a/bacula/src/stored/fd_cmds.c b/bacula/src/stored/fd_cmds.c
index 66a2301489cceb4bf603c1593119fd3c87174e3f..413b35d5596ecc61fd4e2333cc83e4eac8f65434 100644 (file)
--- a/bacula/src/stored/fd_cmds.c
+++ b/bacula/src/stored/fd_cmds.c
@@ -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.

diff --git a/bacula/src/stored/job.c b/bacula/src/stored/job.c
index 0b5e6bd4a51e1dc1badec7b6ef5d429786f74a74..3d9765091850a59096fd97f7823374beabe0a5fa 100644 (file)
--- a/bacula/src/stored/job.c
+++ b/bacula/src/stored/job.c
@@ -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.

diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c
index 1c2d0083604423c769c346f4993fc77b4b45fc69..da2926148e09644503c4615394e5ac540eeb7382 100644 (file)
--- a/bacula/src/stored/label.c
+++ b/bacula/src/stored/label.c
@@ -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.

diff --git a/bacula/src/stored/lock.c b/bacula/src/stored/lock.c
index 647dd19dcf01f25f44b2e34c6ec072ebcdfc6efc..aea4b6a2039a2d940ffc1390c01796d4037b1820 100644 (file)
--- a/bacula/src/stored/lock.c
+++ b/bacula/src/stored/lock.c
@@ -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.
@@ -209,8 +209,11 @@ void DEVICE::r_dlock()
    if (this->blocked() && !pthread_equal(this->no_wait_id, pthread_self())) {
       this->num_waiting++;             /* indicate that I am waiting */
       while (this->blocked()) {
+#ifndef HAVE_WIN32
+         /* thread id on Win32 may be a struct */
          Dmsg3(sd_dbglvl, "r_dlock blked=%s no_wait=%p me=%p\n", this->print_blocked(),
                this->no_wait_id, pthread_self());
+#endif
          if ((stat = pthread_cond_wait(&this->wait, &m_mutex)) != 0) {
             berrno be;
             this->dunlock();
@@ -248,7 +251,7 @@ void _unblock_device(const char *file, int line, DEVICE *dev)
    Dmsg3(sd_dbglvl, "unblock %s from %s:%d\n", dev->print_blocked(), file, line);
    ASSERT(dev->blocked());
    dev->set_blocked(BST_NOT_BLOCKED);
-   dev->no_wait_id = 0;
+   clear_thread_id(dev->no_wait_id);
    if (dev->num_waiting > 0) {
       pthread_cond_broadcast(&dev->wait); /* wake them up */
    }

diff --git a/bacula/src/stored/lock.h b/bacula/src/stored/lock.h
index 1880c72c58dcb855f1057c15a586e9e410e3fdf3..98ab6d2f01213d7314739482f5728bf7d6640500 100644 (file)
--- a/bacula/src/stored/lock.h
+++ b/bacula/src/stored/lock.h
@@ -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.

diff --git a/bacula/src/stored/mac.c b/bacula/src/stored/mac.c
index 59e4c1ff61967692a8680820376429b91e68a3ec..e3ea9214d1e3924fd48b7fc067fdfe26d2983d39 100644 (file)
--- a/bacula/src/stored/mac.c
+++ b/bacula/src/stored/mac.c
@@ -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.

diff --git a/bacula/src/stored/match_bsr.c b/bacula/src/stored/match_bsr.c
index 2552eee607b3ae424282c1e445c59eeea7036d43..350de85a8415afca9d820e69b94fe8456173c2fc 100644 (file)
--- a/bacula/src/stored/match_bsr.c
+++ b/bacula/src/stored/match_bsr.c
@@ -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.

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index c7f5eda63a7ae0dca63113acb17af017c86fd955..7e47508b71cc5b0a6663f306c9d17bbfc4ae1528 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -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.

diff --git a/bacula/src/stored/parse_bsr.c b/bacula/src/stored/parse_bsr.c
index af9c2f4fc92f8ce4b0bbdd8a2f6df48192fc1fbe..83b0ff41422a67f3d68b153cd9ec432388fc3724 100644 (file)
--- a/bacula/src/stored/parse_bsr.c
+++ b/bacula/src/stored/parse_bsr.c
@@ -27,7 +27,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.

diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h
index f666c6fd8ba1b593709e3fdcdad58c1b79cc7535..019b3f2d04f3464807accc40a2ea3cac4d6a6b79 100644 (file)
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -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.

diff --git a/bacula/src/stored/pythonsd.c b/bacula/src/stored/pythonsd.c
index e52693d8233b4ed18b6c182a800b78856fe4bf3b..c4ab8f9ca72ff02adf746b7cb66bce363e1b9118 100644 (file)
--- a/bacula/src/stored/pythonsd.c
+++ b/bacula/src/stored/pythonsd.c
@@ -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.

diff --git a/bacula/src/stored/read.c b/bacula/src/stored/read.c
index da554ddb8410ca99dd5a9759af06829137e41cc5..6221b8a299dc9b218dfcd4a07534efd258549efd 100644 (file)
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -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.

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index 8cd7b4f0b56e1789a0b92c64372dfeeb318eeb9a..8a0534e1ddc74ea18a0331dbdeff1ece9d4540b2 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -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.

diff --git a/bacula/src/stored/record.c b/bacula/src/stored/record.c
index e20b4ccd54877d7a07769bc11d70ebb875442069..61cd686a3d8f27e92eed2a63560798f5a9f056c5 100644 (file)
--- a/bacula/src/stored/record.c
+++ b/bacula/src/stored/record.c
@@ -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.

diff --git a/bacula/src/stored/record.h b/bacula/src/stored/record.h
index b13cfdcf83a3c68d2fe37848945d34b1fb87c6ee..77d02bf97a43552842c9539127c1bdfac10942b9 100644 (file)
--- a/bacula/src/stored/record.h
+++ b/bacula/src/stored/record.h
@@ -29,7 +29,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.

diff --git a/bacula/src/stored/reserve.c b/bacula/src/stored/reserve.c
index 3c1fe55b694b5306e6ecab5083ff84b0355684cd..b262b76b216c9534fa28a1045a30f09f1e419b77 100644 (file)
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -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.

diff --git a/bacula/src/stored/reserve.h b/bacula/src/stored/reserve.h
index 76c6c05cfa34257d606953d8d0f802d5d183895a..6d4b7090adbdbd3df1fe52f6fce4129ef6fa8b91 100644 (file)
--- a/bacula/src/stored/reserve.h
+++ b/bacula/src/stored/reserve.h
@@ -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.

diff --git a/bacula/src/stored/scan.c b/bacula/src/stored/scan.c
index c1d033cf070d50314e42c18dacc7ec7ebbb7485d..b92652bf4a96a7b886127e1266aed2df87aade73 100644 (file)
--- a/bacula/src/stored/scan.c
+++ b/bacula/src/stored/scan.c
@@ -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.

diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c
index 5006b337357ac205fde72420774bb45553155a25..6dbc0a5569d2c1fbadddf50b620a928bf0535314 100644 (file)
--- a/bacula/src/stored/spool.c
+++ b/bacula/src/stored/spool.c
@@ -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.

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 82b9a4dbb60bc5dcbdf3cbf05619df9b21765414..87d341754144a8402cab11a99f2ae16ba6575154 100644 (file)
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -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.

diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index d855d61c99eaa244a67e51baa16c84c363bb8531..35424d72a8528498abab898cffb305f60aec2159 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -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.

diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h
index edc2bb9944e45a500e7b918b0a164935adba30c6..30353fe29e80a73188ddd1c65153971b85722f00 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -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.

diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index 9494bf7bf4cc1e6f5d06db1ec589dba1c9ebeb3f..33bf8b0f5ef6f19f2a513181240084185eb9ed48 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -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.

diff --git a/bacula/src/stored/stored_conf.h b/bacula/src/stored/stored_conf.h
index 1a6d1df66b78e13a480cb980112b312c10bd797b..7c3555bca3207aa14e14a9ffd782eccf774acb36 100644 (file)
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -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.

diff --git a/bacula/src/stored/vtape.c b/bacula/src/stored/vtape.c
index df044f8e46e3b20990de0f79477fc777980953d7..21d7f5bf6bb6ee914fb8bb92980bd9bec438ba6f 100644 (file)
--- a/bacula/src/stored/vtape.c
+++ b/bacula/src/stored/vtape.c
@@ -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.

diff --git a/bacula/src/stored/vtape.h b/bacula/src/stored/vtape.h
index 052beac407bb9bcbf3b2370fcb010110a48a3a49..2457da4005acf9e7bbb99327b28479d21215bcf8 100644 (file)
--- a/bacula/src/stored/vtape.h
+++ b/bacula/src/stored/vtape.h
@@ -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.

diff --git a/bacula/src/stored/wait.c b/bacula/src/stored/wait.c
index b443fd335fd291ca171689cd46738b64174efa61..b22314a69a8f22d72d35175386504a16b4c7239f 100644 (file)
--- a/bacula/src/stored/wait.c
+++ b/bacula/src/stored/wait.c
@@ -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.

diff --git a/bacula/src/tools/bbatch.c b/bacula/src/tools/bbatch.c
index 17259dcf59e247be515c8cc687574825cf390325..62bae178203e9a1f3915176fe7cd066bece953ce 100644 (file)
--- a/bacula/src/tools/bbatch.c
+++ b/bacula/src/tools/bbatch.c
@@ -29,7 +29,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.

diff --git a/bacula/src/tools/bregex.c b/bacula/src/tools/bregex.c
index c709b87dc3811404a5906597049b764e61c32ff2..541a716dc50d02d935a69991e01e4510f493ae00 100644 (file)
--- a/bacula/src/tools/bregex.c
+++ b/bacula/src/tools/bregex.c
@@ -26,7 +26,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.

diff --git a/bacula/src/tools/bregtest.c b/bacula/src/tools/bregtest.c
index 326d6f654bd5673a8caedeaabf708375a9d2666e..d11385529b109c940ebb0b1efcf77790591c4aa5 100644 (file)
--- a/bacula/src/tools/bregtest.c
+++ b/bacula/src/tools/bregtest.c
@@ -5,16 +5,16 @@
  *
  */
 /*
-   Bacula\81Â\81® - The Network Backup Solution
+   Bacula® - The Network Backup Solution
 
-   Copyright (C) 2006-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2006-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.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
+   License as published by the Free Software Foundation, which is 
+   listed in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,9 +26,9 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula\81Â\81® is a registered trademark of John Walker.
+   Bacula® is a registered trademark o fKern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Z\81Ã\81¼rich,
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
 
@@ -98,8 +98,8 @@ int main(int argc, char *const *argv)
          break;
 
       case 's':
-        sed=true;
-        break;
+         sed=true;
+         break;
 
       case '?':
       default:
@@ -142,9 +142,9 @@ int main(int argc, char *const *argv)
       strip_trailing_newline(data);
       apply_bregexps(data, list, &p);
       if (sed) {
-        printf("%s\n", p);
+         printf("%s\n", p);
       } else {
-        printf("%s => %s\n", data, p);
+         printf("%s => %s\n", data, p);
       }
    }
    fclose(fd);

diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c
index 0188cedab3e7c14fe45138b9096510c81ddb9478..5e6124ba249c8115048b6662aaad19f1d4492056 100644 (file)
--- a/bacula/src/tools/bsmtp.c
+++ b/bacula/src/tools/bsmtp.c
@@ -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.

diff --git a/bacula/src/tools/bwild.c b/bacula/src/tools/bwild.c
index ec7e0a425e7c9731c47e0d7490d84e90191d7933..02561e0a867c1f9f9756126d1701fd48fde2ed7f 100644 (file)
--- a/bacula/src/tools/bwild.c
+++ b/bacula/src/tools/bwild.c
@@ -26,7 +26,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.

diff --git a/bacula/src/tools/dbcheck.c b/bacula/src/tools/dbcheck.c
index 1b6a509c49dd5cbe82887454072fd62cc3300cab..e89b384081856322c983fb51585bb00769fa0888 100644 (file)
--- a/bacula/src/tools/dbcheck.c
+++ b/bacula/src/tools/dbcheck.c
@@ -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.

diff --git a/bacula/src/tools/drivetype.c b/bacula/src/tools/drivetype.c
index fde223a4daebf38811a04d4ee31f2363771b73e3..230c6a43a3037685b45e4760f51807eaa3410ea6 100644 (file)
--- a/bacula/src/tools/drivetype.c
+++ b/bacula/src/tools/drivetype.c
@@ -28,7 +28,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.

diff --git a/bacula/src/tools/fstype.c b/bacula/src/tools/fstype.c
index f8af7576eacdf47c0aabf0342c050f40578fde18..c9199b0831da5f44b5f3e453a1388fdb84880104 100644 (file)
--- a/bacula/src/tools/fstype.c
+++ b/bacula/src/tools/fstype.c
@@ -28,7 +28,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.

diff --git a/bacula/src/tools/testfind.c b/bacula/src/tools/testfind.c
index 81dc27b131fa27f71ab1833add6ffec0868566c3..bacabaedf3b8c56b7cfe3a24c80aa5cb355f9269 100644 (file)
--- a/bacula/src/tools/testfind.c
+++ b/bacula/src/tools/testfind.c
@@ -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.

diff --git a/bacula/src/tools/testls.c b/bacula/src/tools/testls.c
index 6af43785d60dbebb6408fcc4ed8b927755c88699..c2765509ba4e3397a7e66ad8e8c82f970dc09dfb 100644 (file)
--- a/bacula/src/tools/testls.c
+++ b/bacula/src/tools/testls.c
@@ -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.

diff --git a/bacula/src/version.h b/bacula/src/version.h
index cfbccb70e54af7a7d9fe5e8126e11a7c3f66a884..86b24b3943760e900f5f6e3eaabc0ee34b2ff0d0 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.5.1"
-#define BDATE   "07 July 2008"
-#define LSMDATE "07Jul08"
+#define VERSION "2.5.2"
+#define BDATE   "14 July 2008"
+#define LSMDATE "14Jul08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */
@@ -32,7 +32,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.

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 302f6ded48088047ca493ffab1f91e4796392d3c..4900a0247736f3fa0627eeafd11f65b20021febd 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -30,6 +30,14 @@ vtape driver
 
 
 General:
+14Jul08 
+kes  Change Bacula trademark owner from John Walker to Kern Sibbald
+kes  First non-working cut of vbackup
+kes  Correct FD heartbeat code to use volatile variable accessed by
+     two threads.
+kes  Zero thread id with memset if on Win32 in case it is a struct.
+kes  If cannot create JobMedia record, continue to try to write eof
+     and clean up in block.c
 12Jul08
 kes  Add code to interface OpenSSL to new Win32 pthreads code which
      used a structure for thread_t.