From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 29 Oct 2018 15:42:29 +0000 (+0100)
Subject: Fix issue between FO_PORTABLE and FO_PORTABLE_DATA
X-Git-Tag: Release-9.4.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ade42468b34a840b2d5c3d54e973f78df53b050;p=thirdparty%2Fbacula.git

Fix issue between FO_PORTABLE and FO_PORTABLE_DATA
---

diff --git a/bacula/src/filed/fd_plugins.c b/bacula/src/filed/fd_plugins.c
index b171d760e..eeec495d9 100644
--- a/bacula/src/filed/fd_plugins.c
+++ b/bacula/src/filed/fd_plugins.c
@@ -377,10 +377,10 @@ static void update_ff_pkt(FF_PKT *ff_pkt, struct save_pkt *sp)
    } else {
       ff_pkt->flags &= ~FO_SPARSE;
    }
-   if (sp->flags & FO_PORTABLE_DATA) {
-      ff_pkt->flags |= FO_PORTABLE_DATA;
+   if (sp->flags & FO_PORTABLE) {
+      ff_pkt->flags |= FO_PORTABLE;
    } else {
-      ff_pkt->flags &= ~FO_PORTABLE_DATA;
+      ff_pkt->flags &= ~FO_PORTABLE;
    }
    ff_pkt->flags |= FO_PLUGIN;       /* data from plugin */
    Dsm_check(999);
@@ -448,7 +448,6 @@ bRC plugin_option_handle_file(JCR *jcr, FF_PKT *ff_pkt, struct save_pkt *sp)
          jcr->plugin_ctx = &plugin_ctx_list[i];
 
          update_ff_pkt(ff_pkt, sp);
-
       /* reset plugin in JCR if not used this time */
       } else {
          jcr->plugin_ctx = NULL;
diff --git a/bacula/src/fileopts.h b/bacula/src/fileopts.h
index 76fbd9edd..88ca58797 100644
--- a/bacula/src/fileopts.h
+++ b/bacula/src/fileopts.h
@@ -31,7 +31,7 @@
  * Options saved int "options" of the include/exclude lists.
  * They are directly jammed ito  "flag" of ff packet
  */
-#define FO_PORTABLE_DATA (1<<0)       /* Data is portable */
+#define FO_PORTABLE_DATA (1<<0)       /* Data is portable (Not used) */
 #define FO_MD5           (1<<1)       /* Do MD5 checksum */
 #define FO_COMPRESS      (1<<2)       /* Do compression */
 #define FO_NO_RECURSION  (1<<3)       /* no recursion in directories */