Minor tweaks

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

diff --git a/bacula/AUTHORS b/bacula/AUTHORS
index d0681e9314a1ffa21f75af4b732f3372afd39587..faa7ed37cbfac6be16b936a3ea41ce3fadaf442f 100644 (file)
--- a/bacula/AUTHORS
+++ b/bacula/AUTHORS
@@ -78,6 +78,7 @@ Robert Nelson
 Rudolf Cejka
 Russel Howe
 Sergey Svishchev
+Thomas Glatthor                          
 Thorsten Enge
 Tim Oberfoell   
 Tomas Cameron

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 67c0e6b3f34eb897f0585c010e26d1318a23b74b..9fd9f426914bd787558e06e66184b28490dbbe5e 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -67,8 +67,13 @@ Professional Needs:
    Performance and usage instrumentation (not in list)
    See email of 21Aug2007 for details.
 - Implement Diff,Inc Retention Periods
+- Look at: http://tech.groups.yahoo.com/group/cfg2html
+   and http://www.openeyet.nl/scc/ for managing customer changes
 
 Priority:
+- Duplicate Jobs
+  Run, Fail, Skip, Higher, Promote, CancelLowerLevel
+  Proximity
 - Auto update of slot:
    rufus-dir: ua_run.c:456-10 JobId=10 NewJobId=10 using pool Full priority=10
    02-Nov 12:58 rufus-dir JobId 10: Start Backup JobId 10, Job=kernsave.2007-11-02_12.58.03

diff --git a/bacula/scripts/disk-changer.in b/bacula/scripts/disk-changer.in
index 404083e9bf9843257a6b0aacab3e576be474b25d..957c303a73e37448b282949f40c80e52ce8ca162 100644 (file)
--- a/bacula/scripts/disk-changer.in
+++ b/bacula/scripts/disk-changer.in
@@ -2,6 +2,33 @@
 #
 # Bacula interface to virtual autoloader using disk storage
 #
+#  Written by Kern Sibbald
+#
+#  Copyright (C) 2000-2007 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, which is 
+#  listed in the file LICENSE.
+3
+#  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.
+3
+#  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 John Walker.
+#  The licensor of Bacula is the Free Software Foundation Europe
+#  (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+#  Switzerland, email:ftf@fsfeurope.org.
+#
+#
 #  $Id$
 #
 #  If you set in your Device resource

diff --git a/bacula/src/dird/inc_conf.c b/bacula/src/dird/inc_conf.c
index e5598f1e4552d42d0ed143e7162c09e79cc7b3bb..658c2f29d21e9fba4f0a695daa19a7713074033f 100644 (file)
--- a/bacula/src/dird/inc_conf.c
+++ b/bacula/src/dird/inc_conf.c
@@ -67,7 +67,7 @@ static void setup_current_opts(void);
  */
 #if defined(_MSC_VER)
 extern "C" { // work around visual compiler mangling variables
-    extern URES res_all;
+   extern URES res_all;
 }
 #else
 extern URES res_all;