From 0d8257954e66827f56577e78b8196f5b28c1871a Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 6 Jan 2015 10:28:08 +0100
Subject: [PATCH] Tweak license

---
 bacula/scripts/dvd-handler.in                   | 4 +++-
 bacula/src/filed/Makefile.in                    | 2 +-
 bacula/src/plugins/sd/example-plugin-sd.c       | 4 ++--
 bacula/updatedb/update_sqlite_tables_9_to_10.in | 3 +++
 regress/scripts/functions.pm                    | 6 +++---
 regress/scripts/setup                           | 3 +++
 regress/tests/exclude-dir-test                  | 3 +++
 regress/tests/hardlink-test                     | 3 +++
 regress/tests/prune-config-test                 | 3 +++
 9 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/bacula/scripts/dvd-handler.in b/bacula/scripts/dvd-handler.in
index a02878eaf2..61d16bc295 100644
--- a/bacula/scripts/dvd-handler.in
+++ b/bacula/scripts/dvd-handler.in
@@ -1,5 +1,7 @@
 #!@PYTHON@
 #
+# License: AGPLv3
+#
 # Check the free space available on a writable DVD
 # Should always exit with 0 status, otherwise it indicates a serious error.
 # (wrong number of arguments, Python exception...)
@@ -88,7 +90,7 @@ class disk:
 #		 This method should also prepare a blank disk so that a
 #		 certain part of the disk is used to allow detection of a
 #		 used disk by all / more disk drives.
-# prepare 	 Blank the device
+# prepare	 Blank the device
 #
 ###############################################################################
    def __init__(self, devicename):
diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index d99af04ed0..bee5d892df 100644
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -1,7 +1,7 @@
 #
 # Bacula Makefile for the File daemon
 #
-# Author: Kern Sibbal, 2002
+# Author: Kern Sibbald, 2002
 # License: LGPLv3
 #
 @MCOMMON@
diff --git a/bacula/src/plugins/sd/example-plugin-sd.c b/bacula/src/plugins/sd/example-plugin-sd.c
index b3f2c2cf24..be14924077 100644
--- a/bacula/src/plugins/sd/example-plugin-sd.c
+++ b/bacula/src/plugins/sd/example-plugin-sd.c
@@ -19,8 +19,8 @@
  *  Kern Sibbald, October 2007
  *
  */
-#include "bacula.h"
-#include "stored.h"
+#include "bacula.h"         /* General Bacula headers */
+#include "stored.h"         /* Pull in storage daemon headers */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bacula/updatedb/update_sqlite_tables_9_to_10.in b/bacula/updatedb/update_sqlite_tables_9_to_10.in
index cb813fdf67..18b4bd947e 100644
--- a/bacula/updatedb/update_sqlite_tables_9_to_10.in
+++ b/bacula/updatedb/update_sqlite_tables_9_to_10.in
@@ -1,5 +1,8 @@
 #!/bin/sh
 #
+# Author: Eric Bollengier, 2009
+# License: AGPLv3
+#
 # shell script to update SQLite from version 1.38 to 2.0
 #
 echo " "
diff --git a/regress/scripts/functions.pm b/regress/scripts/functions.pm
index 6a93d54651..9964538375 100644
--- a/regress/scripts/functions.pm
+++ b/regress/scripts/functions.pm
@@ -478,10 +478,10 @@ sub check_prune_list
     close(FP);
     foreach my $jobid (keys %to_check) {
         if (!$seen{$jobid}) {
-            print "******* listing of $f *********\n";
+            print "******** listing of $f *********\n";
             system("cat $f");
-            print "******* end listing of $f *********\n";
-            print "ERROR: in $f, JobId=$jobid should not but is still present in the 2nd 'list jobs'\n";
+            print "******** end listing of $f *********\n";
+            print "ERROR: in $f, JobId=$jobid should not be, but is still present in the 2nd 'list jobs'\n";
             exit 1;
         }
     }
diff --git a/regress/scripts/setup b/regress/scripts/setup
index 2f7a75d9ba..8f075f59e5 100755
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -2,6 +2,9 @@
 #
 # Script to setup running Bacula regression tests
 #
+# Author: Kern Sibbald, 2003
+# License: LGPLv3
+#
 
 check_exit_code()
 {
diff --git a/regress/tests/exclude-dir-test b/regress/tests/exclude-dir-test
index b60bb8b80b..233d688bcf 100755
--- a/regress/tests/exclude-dir-test
+++ b/regress/tests/exclude-dir-test
@@ -1,5 +1,8 @@
 #!/bin/sh
 #
+# Author: Eric Bollengier, 2009
+# License: AGPLv3
+#
 # Run a simple backup of the Bacula build directory using the compressed option
 #   then backup a second time and finally restore it
 #
diff --git a/regress/tests/hardlink-test b/regress/tests/hardlink-test
index 6ee0e6b5ef..8208537e31 100755
--- a/regress/tests/hardlink-test
+++ b/regress/tests/hardlink-test
@@ -1,5 +1,8 @@
 #!/bin/sh
 #
+# Author: Kern Sibbald, 2006
+# License: AGPLv3
+#
 # Run a simple backup of the Bacula build directory
 #   then restore it.
 #
diff --git a/regress/tests/prune-config-test b/regress/tests/prune-config-test
index 7bfd67bd0d..fed9527751 100755
--- a/regress/tests/prune-config-test
+++ b/regress/tests/prune-config-test
@@ -1,5 +1,8 @@
 #!/bin/sh
 #
+# Author: Eric Bollengier, 2010
+# License: AGPLv3
+#
 # This script will test prune algo
 #
 
-- 
2.39.5