Allow restoreoptions to be specified with restore.

bareos · Feb 17, 2015 · 67190b1 · 67190b1
1 parent e59ba5d
commit 67190b1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/dird/ua.h b/src/dird/ua.h
@@ -117,6 +117,7 @@ struct RESTORE_CTX {
    char *where;
    char *RegexWhere;
    char *replace;
+   char *plugin_options;
    RBSR *bsr;
    POOLMEM *fname;                    /* Filename only */
    POOLMEM *path;                     /* Path only */

diff --git a/src/dird/ua_restore.c b/src/dird/ua_restore.c
@@ -109,6 +109,11 @@ int restore_cmd(UAContext *ua, const char *cmd)
       rx.replace = ua->argv[i];
    }
 
+   i = find_arg_with_value(ua, "pluginoptions");
+   if (i >= 0) {
+      rx.plugin_options = ua->argv[i];
+   }
+
    i = find_arg_with_value(ua, "strip_prefix");
    if (i >= 0) {
       strip_prefix = ua->argv[i];
@@ -270,6 +275,11 @@ int restore_cmd(UAContext *ua, const char *cmd)
       pm_strcat(ua->cmd, buf);
    }
 
+   if (rx.plugin_options) {
+      Mmsg(buf, " pluginoptions=%s", rx.plugin_options);
+      pm_strcat(ua->cmd, buf);
+   }
+
    if (rx.comment) {
       Mmsg(buf, " comment=\"%s\"", rx.comment);
       pm_strcat(ua->cmd, buf);
@@ -290,6 +300,7 @@ int restore_cmd(UAContext *ua, const char *cmd)
    if (find_arg(ua, NT_("yes")) > 0) {
       pm_strcat(ua->cmd, " yes");    /* pass it on to the run command */
    }
+
    Dmsg1(200, "Submitting: %s\n", ua->cmd);
 
    /*
@@ -506,6 +517,7 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx)
       "comment",       /* 21 */
       "restorejob",    /* 22 */
       "replace",       /* 23 */
+      "pluginoptions", /* 24 */
       NULL
    };
 

diff --git a/src/dird/ua_run.c b/src/dird/ua_run.c
@@ -1826,7 +1826,7 @@ static bool scan_command_line_arguments(UAContext *ua, RUN_CTX &rc)
                }
                rc.plugin_options = ua->argv[i];
                if (!acl_access_ok(ua, PluginOptions_ACL, rc.plugin_options)) {
-                  ua->send_msg(_("No authoriztion for \"PluginOptions\" specification.\n"));
+                  ua->send_msg(_("No authorization for \"PluginOptions\" specification.\n"));
                   return false;
                }
                kw_ok = true;