From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 7 Aug 2006 07:21:58 +0000 (+0000)
Subject: ebl  Fix runscript bug
X-Git-Tag: Release-2.0.0~642
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9734bad3769af7dfdd841378e998eb543f4b1fe5;p=bacula%2Fbacula

ebl  Fix runscript bug


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

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index a7f3fd88a9..fb9e3b6bed 100644
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -456,7 +456,11 @@ static int runbeforenow_cmd(JCR *jcr)
    BSOCK *dir = jcr->dir_bsock;
 
    run_scripts(jcr, jcr->RunScripts, "ClientBeforeJob");
-   return  bnet_fsend(dir, OKRunBeforeNow);
+   if (job_canceled(jcr)) {
+      return  bnet_fsend(dir, _("2905 Bad RunBeforeNow command.\n"));
+   } else {
+      return  bnet_fsend(dir, OKRunBeforeNow);
+   }
 }
 
 static int runafter_cmd(JCR *jcr)