Merge pull request #238 from benibr/testing_sendpluginoptions

sending all related Plugin Options to FD
bareos · Sep 5, 2019 · 02f7223 · 02f7223
2 parents acdaa62 + 912a29b
commit 02f7223
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/core/src/dird/backup.cc b/core/src/dird/backup.cc
@@ -493,6 +493,8 @@ bool DoNativeBackup(JobControlRecord* jcr)
 
   if (!SendExcludeList(jcr)) { goto bail_out; }
 
+  if (!SendPluginOptions(jcr)) { goto bail_out; }
+
   if (!SendPreviousRestoreObjects(jcr)) { goto bail_out; }
 
   if (!SendSecureEraseReqToFd(jcr)) {

diff --git a/core/src/dird/fd_cmds.cc b/core/src/dird/fd_cmds.cc
@@ -962,6 +962,9 @@ static int RestoreObjectHandler(void* ctx, int num_fields, char** row)
 bool SendPluginOptions(JobControlRecord* jcr)
 {
   BareosSocket* fd = jcr->file_bsock;
+  int i;
+  PoolMem cur_plugin_options(PM_MESSAGE);
+  const char* plugin_options;
   POOLMEM* msg;
 
   if (jcr->plugin_options) {
@@ -977,6 +980,20 @@ bool SendPluginOptions(JobControlRecord* jcr)
       return false;
     }
   }
+  if (jcr->res.job && jcr->res.job->FdPluginOptions &&
+      jcr->res.job->FdPluginOptions->size()) {
+    Dmsg2(200, "dird: sendpluginoptions found FdPluginOptions in res.job");
+    foreach_alist_index (i, plugin_options, jcr->res.job->FdPluginOptions) {
+      PmStrcpy(cur_plugin_options, plugin_options);
+      BashSpaces(cur_plugin_options.c_str());
+
+      fd->fsend(pluginoptionscmd, cur_plugin_options.c_str());
+      if (!response(jcr, fd, OKPluginOptions, "PluginOptions", DISPLAY_ERROR)) {
+      	Jmsg(jcr, M_FATAL, 0, _("Plugin options failed.\n"));
+        return false;
+      }
+    }
+  }
 
   return true;
 }