From 534c794b4b3bb2c42e4e64ccb015c5e2263b7a9b Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 24 Jan 2009 15:54:47 +0000 Subject: [PATCH] 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 --- bacula/src/filed/job.c | 9 +++++++-- bacula/src/version.h | 4 ++-- bacula/technotes-2.5 | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 62dc2d22ed..ecbc2de3b0 100644 --- 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 1b36cb8e46..4f7df67590 100644 --- 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 8dcd2ce6d7..e525fe41da 100644 --- 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 -- 2.39.5