Fail a job that references a plugin if no Plugin Directory is

     defined.

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

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 62dc2d22ed0d33b9f135d810564e3c6f3c4a38cb..ecbc2de3b0b4ddd31cbc11fa7ce308eda4f4ca70 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 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.
@@ -707,7 +707,12 @@ static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *filese
       if (is_file) {
          fileset->incexe->name_list.append(new_dlistString(fname));
       } else {
-         fileset->incexe->plugin_list.append(new_dlistString(fname));
+         if (me->plugin_directory) {
+            fileset->incexe->plugin_list.append(new_dlistString(fname));
+         } else {
+            Jmsg(jcr, M_FATAL, 0, _("Plugin Directory not defined. Cannot use plugin: \"%\"\n"),
+               fname);
+         }
       }
       break;
    }

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 1b36cb8e468ac8fa3a198ba5f114859ac5fa0b5f..4f7df6759047aac509ec4af044244310f6145cf9 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.5.30"
-#define BDATE   "22 January 2009"
-#define LSMDATE "22Jan09"
+#define BDATE   "24 January 2009"
+#define LSMDATE "24Jan09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 8dcd2ce6d7a1ebb2bd95f8553743c9a4dcbc8a23..e525fe41da65d00d39af94ad209d682e4e187715 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,6 +10,9 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+24Jan09
+kes  Fail a job that references a plugin if no Plugin Directory is
+     defined.
 22Jan09
 kes  Fix bug #1211 crash during reload with bad dird.conf file.
 21Jan09