From: Kern Sibbald Date: Thu, 14 Feb 2008 13:22:35 +0000 (+0000) Subject: Temp fix to plugin name file_index. X-Git-Tag: Release-7.0.0~5020 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ad35b7103821fa69b0daf5ba92c51b8f7a967e6c;p=bacula%2Fbacula Temp fix to plugin name file_index. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6419 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/filed/fd-plugins.c b/bacula/src/filed/fd-plugins.c index 961ff3db4a..8df62d1906 100644 --- a/bacula/src/filed/fd-plugins.c +++ b/bacula/src/filed/fd-plugins.c @@ -207,7 +207,7 @@ bool send_plugin_name(JCR *jcr, BSOCK *sd, bool start) struct save_pkt *sp = (struct save_pkt *)jcr->plugin_sp; Dmsg1(000, "send_plugin_name=%s\n", sp->cmd); - if (!sd->fsend("%ld %d 0", jcr->JobFiles, STREAM_PLUGIN_NAME)) { + if (!sd->fsend("%ld %d 0", jcr->JobFiles+1, STREAM_PLUGIN_NAME)) { Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), sd->bstrerror()); return false; @@ -215,7 +215,7 @@ bool send_plugin_name(JCR *jcr, BSOCK *sd, bool start) Dmsg1(000, "send: %s\n", sd->msg); if (start) { - stat = sd->fsend("%ld 1 %d %s%c", jcr->JobFiles, sp->portable, sp->cmd, 0); + stat = sd->fsend("%ld 1 %d %s%c", jcr->JobFiles+1, sp->portable, sp->cmd, 0); } else { stat = sd->fsend("%ld 0"); } diff --git a/bacula/src/version.h b/bacula/src/version.h index 48b3fedd8c..0d9c0aa918 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -3,9 +3,9 @@ */ #undef VERSION -#define VERSION "2.3.9" -#define BDATE "10 February 2008" -#define LSMDATE "10Feb08" +#define VERSION "2.3.10" +#define BDATE "14 February 2008" +#define LSMDATE "14Feb08" #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n" #define BYEAR "2008" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3 index 25d3d70137..1f137286c4 100644 --- a/bacula/technotes-2.3 +++ b/bacula/technotes-2.3 @@ -1,6 +1,9 @@ Technical notes on version 2.3 General: +14Feb08 +kes Temp fix to plugin name file_index. +kes Bacula backed up and restored a MySQL database. 13Feb08 kes Implement plugin restore. kes Implement parsing of db_driver to give db_type index.