]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/dird/ua_run.c
Backport from Bacula Enterprise
[bacula/bacula] / bacula / src / dird / ua_run.c
index 5b1267d70d674c9e9563dc1dd289136e6fd6db05..f5756d2f0003c51641594b6917c38a21ce44538d 100644 (file)
@@ -1,29 +1,21 @@
 /*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of John Walker.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  *
  *
  *     Kern Sibbald, December MMI
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
 #include "dird.h"
 
+const char *get_command(int index);
+
 class run_ctx {
 public:
    char *job_name, *level_name, *jid, *store_name, *pool_name;
    char *where, *fileset_name, *client_name, *bootstrap, *regexwhere;
-   char *restore_client_name;
+   char *restore_client_name, *comment, *media_type, *next_pool_name;
    const char *replace;
    char *when, *verify_job_name, *catalog_name;
    char *previous_job_name;
    char *since;
+   char *plugin_options;
    const char *verify_list;
    JOB *job;
    JOB *verify_job;
    JOB *previous_job;
+   JOB_DBR jr;
    USTORE *store;
    CLIENT *client;
    FILESET *fileset;
    POOL *pool;
+   POOL *next_pool;
    CAT *catalog;
+   JobId_t JobId;
+   alist *JobIds;
    int Priority;
    int files;
    bool cloned;
    bool mod;
-
+   bool restart;
+   bool done;
+   bool alljobid;
+   int spool_data;
+   bool spool_data_set;
+   int accurate;
+   bool accurate_set;
+   int ignoreduplicatecheck;
+   bool ignoreduplicatecheck_set;
    /* Methods */
-   run_ctx() { memset(this, 0, sizeof(run_ctx)); 
+   run_ctx() { memset(this, 0, sizeof(run_ctx));
                store = new USTORE; };
    ~run_ctx() { delete store; };
 };
 
 /* Forward referenced subroutines */
 static void select_job_level(UAContext *ua, JCR *jcr);
-static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, 
+static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job,
                 const char *verify_list, char *jid, const char *replace,
                 char *client_name);
 static void select_where_regexp(UAContext *ua, JCR *jcr);
-static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc);
+static bool scan_run_command_line_arguments(UAContext *ua, run_ctx &rc);
+static bool set_run_context_in_jcr(UAContext *ua, JCR *jcr, run_ctx &rc);
+static int modify_job_parameters(UAContext *ua, JCR *jcr, run_ctx &rc);
+static JobId_t start_job(UAContext *ua, JCR *jcr, run_ctx &rc);
 
 /* Imported variables */
 extern struct s_kw ReplaceOptions[];
@@ -82,7 +91,7 @@ extern struct s_kw ReplaceOptions[];
  *     run [job=]<job-name> level=<level-name>
  *
  * For Restore Jobs
- *     run <job-name> 
+ *     run <job-name>
  *
  *  Returns: 0 on error
  *           JobId if OK
@@ -92,14 +101,14 @@ int run_cmd(UAContext *ua, const char *cmd)
 {
    JCR *jcr = NULL;
    run_ctx rc;
-   int i, opt;
+   int status;
 
    if (!open_client_db(ua)) {
-      return 1;
+      goto bail_out;
    }
 
-   if (!scan_command_line_arguments(ua, rc)) {
-      return 0;
+   if (!scan_run_command_line_arguments(ua, rc)) {
+      goto bail_out;
    }
 
    if (find_arg(ua, NT_("fdcalled")) > 0) {
@@ -107,159 +116,535 @@ int run_cmd(UAContext *ua, const char *cmd)
       ua->quit = true;
    }
 
-try_again:
-   /*
-    * Create JCR to run job.  NOTE!!! after this point, free_jcr()
-    *  before returning.
-    */
-   if (!jcr) {
-      jcr = new_jcr(sizeof(JCR), dird_free_jcr);
-      set_jcr_defaults(jcr, rc.job);
-      jcr->unlink_bsr = ua->jcr->unlink_bsr;    /* copy unlink flag from caller */
-      ua->jcr->unlink_bsr = false;
+   for ( ;; ) {
+      /*
+       * Create JCR to run job.  NOTE!!! after this point, free_jcr()
+       *  before returning.
+       */
+      if (!jcr) {
+         jcr = new_jcr(sizeof(JCR), dird_free_jcr);
+         set_jcr_defaults(jcr, rc.job);
+         jcr->unlink_bsr = ua->jcr->unlink_bsr;    /* copy unlink flag from caller */
+         ua->jcr->unlink_bsr = false;
+      }
+      /* Transfer JobIds to new restore Job */
+      if (ua->jcr->JobIds) {
+         jcr->JobIds = ua->jcr->JobIds;
+         ua->jcr->JobIds = NULL;
+      }
+      /* Transfer VSS component info */
+      if (ua->jcr->component_fname) {
+         jcr->component_fname = ua->jcr->component_fname;
+         ua->jcr->component_fname = NULL;
+         jcr->component_fd = ua->jcr->component_fd;
+         ua->jcr->component_fd = NULL;
+      }
+
+      if (!set_run_context_in_jcr(ua, jcr, rc)) {
+         break; /* error get out of while loop */
+      }
+
+
+      /* Run without prompting? */
+      if (ua->batch || find_arg(ua, NT_("yes")) > 0) {
+         return start_job(ua, jcr, rc);
+      }
+
+      /*
+       * Prompt User to see if all run job parameters are correct, and
+       *   allow him to modify them.
+       */
+      if (!display_job_parameters(ua, jcr, rc.job, rc.verify_list, rc.jid, rc.replace,
+           rc.client_name)) {
+         break; /* error get out of while loop */
+      }
+
+      if (!get_cmd(ua, _("OK to run? (yes/mod/no): "))) {
+         break; /* error get out of while loop */
+      }
+
+      if (strncasecmp(ua->cmd, ".mod ", 5) == 0 ||
+          (strncasecmp(ua->cmd, "mod ", 4) == 0 && strlen(ua->cmd) > 6)) {
+         parse_ua_args(ua);
+         rc.mod = true;
+         if (!scan_run_command_line_arguments(ua, rc)) {
+            break; /* error get out of while loop */
+         }
+         continue;   /* another round with while loop */
+      }
+
+      /* Allow the user to modify the settings */
+      status = modify_job_parameters(ua, jcr, rc);
+      if (status == 0) {
+         continue;   /* another round with while loop */
+      }
+      if (status == -1) { /* error */
+         break; /* error get out of while loop */
+      }
+
+      if (ua->cmd[0] == 0 || strncasecmp(ua->cmd, _("yes"), strlen(ua->cmd)) == 0) {
+         return start_job(ua, jcr, rc);
+      }
+      if (strncasecmp(ua->cmd, _("no"), strlen(ua->cmd)) == 0) {
+         break; /* get out of while loop */
+      }
+      ua->send_msg(_("\nBad response: %s. You must answer yes, mod, or no.\n\n"), ua->cmd);
    }
 
-   jcr->verify_job = rc.verify_job;
-   jcr->previous_job = rc.previous_job;
-   jcr->pool = rc.pool;
-   if (jcr->pool != jcr->job->pool) {
-      pm_strcpy(jcr->pool_source, _("User input"));
+bail_out:
+   ua->send_msg(_("Job not run.\n"));
+   if (ua->jcr->component_fd) {
+      fclose(ua->jcr->component_fd);
+      ua->jcr->component_fd = NULL;
    }
-   set_rwstorage(jcr, rc.store);
-   jcr->client = rc.client;
-   pm_strcpy(jcr->client_name, rc.client->name());
-   jcr->fileset = rc.fileset;
-   jcr->ExpectedFiles = rc.files;
-   if (rc.catalog) {
-      jcr->catalog = rc.catalog;
+   if (ua->jcr->component_fname) {
+      unlink(ua->jcr->component_fname);
+      free_and_null_pool_memory(ua->jcr->component_fname);
    }
-   if (rc.where) {
-      if (jcr->where) {
-         free(jcr->where);
+   if (jcr) {
+      if (jcr->component_fd) {
+         fclose(jcr->component_fd);
+         jcr->component_fd = NULL;
       }
-      jcr->where = bstrdup(rc.where);
-      rc.where = NULL;
+      if (jcr->component_fname) {
+         unlink(jcr->component_fname);
+         free_and_null_pool_memory(jcr->component_fname);
+      }
+      free_jcr(jcr);
    }
+   return 0;                       /* do not run */
+}
 
-   if (rc.regexwhere) {
-      if (jcr->RegexWhere) {
-         free(jcr->RegexWhere);
-      }
-      jcr->RegexWhere = bstrdup(rc.regexwhere);       
-      rc.regexwhere = NULL;
+static JobId_t start_job(UAContext *ua, JCR *jcr, run_ctx &rc)
+{
+   JobId_t JobId;
+
+   if (rc.jr.JobStatus == JS_Incomplete) {
+      Dmsg1(100, "Ressuming JobId=%d\n", rc.jr.JobId);
+      JobId = resume_job(jcr, &rc.jr);
+   } else {
+      Dmsg1(100, "Starting JobId=%d\n", rc.jr.JobId);
+      JobId = run_job(jcr);
    }
+   Dmsg4(100, "JobId=%u NewJobId=%d pool=%s priority=%d\n", (int)jcr->JobId,
+         JobId, jcr->pool->name(), jcr->JobPriority);
+   free_jcr(jcr);                  /* release jcr */
+   if (JobId == 0) {
+      ua->error_msg(_("Job failed.\n"));
+   } else {
+      char ed1[50];
+      ua->send_msg(_("Job queued. JobId=%s\n"), edit_int64(JobId, ed1));
+   }
+   return JobId;
+}
 
-   if (rc.when) {
-      jcr->sched_time = str_to_utime(rc.when);
-      if (jcr->sched_time == 0) {
-         ua->send_msg(_("Invalid time, using current time.\n"));
-         jcr->sched_time = time(NULL);
+/*
+ * If no job_name defined in the run context, ask
+ *  the user for it.
+ * Then put the job resource in the run context and
+ *  check the access rights.
+ */
+static bool get_job(UAContext *ua, run_ctx &rc)
+{
+   if (rc.job_name) {
+      /* Find Job */
+      rc.job = GetJobResWithName(rc.job_name);
+      if (!rc.job) {
+         if (*rc.job_name != 0) {
+            ua->send_msg(_("Job \"%s\" not found\n"), rc.job_name);
+         }
+         rc.job = select_job_resource(ua);
+      } else {
+         Dmsg1(100, "Found job=%s\n", rc.job_name);
       }
-      rc.when = NULL;
+   } else if (!rc.job) {
+      ua->send_msg(_("A job name must be specified.\n"));
+      rc.job = select_job_resource(ua);
+   }
+   if (!rc.job) {
+      return false;
+   } else if (!acl_access_ok(ua, Job_ACL, rc.job->name())) {
+      ua->error_msg( _("No authorization. Job \"%s\".\n"), rc.job->name());
+      return false;
    }
+   return true;
+}
 
-   if (rc.bootstrap) {
-      if (jcr->RestoreBootstrap) {
-         free(jcr->RestoreBootstrap);
+/*
+ * If no pool_name defined in the run context, ask
+ *  the user for it.
+ * Then put the pool resource in the run context and
+ *  check the access rights.
+ */
+static bool get_pool(UAContext *ua, run_ctx &rc)
+{
+   if (rc.pool_name) {
+      rc.pool = GetPoolResWithName(rc.pool_name);
+      if (!rc.pool) {
+         if (*rc.pool_name != 0) {
+            ua->warning_msg(_("Pool \"%s\" not found.\n"), rc.pool_name);
+         }
+         rc.pool = select_pool_resource(ua);
       }
-      jcr->RestoreBootstrap = bstrdup(rc.bootstrap);
-      rc.bootstrap = NULL;
+   } else if (!rc.pool) {
+      rc.pool = rc.job->pool;             /* use default */
+   }
+   if (!rc.pool) {
+      return false;
+   } else if (!acl_access_ok(ua, Pool_ACL, rc.pool->name())) {
+      ua->error_msg(_("No authorization. Pool \"%s\".\n"), rc.pool->name());
+      return false;
    }
+   Dmsg1(100, "Using Pool=%s\n", rc.pool->name());
+   return true;
+}
 
-   if (rc.replace) {
-      jcr->replace = 0;
-      for (i=0; ReplaceOptions[i].name; i++) {
-         if (strcasecmp(rc.replace, ReplaceOptions[i].name) == 0) {
-            jcr->replace = ReplaceOptions[i].token;
+static bool get_next_pool(UAContext *ua, run_ctx &rc)
+{
+   if (rc.next_pool_name) {
+      Dmsg1(100, "Have next pool=%s\n", rc.next_pool_name);
+      rc.next_pool = GetPoolResWithName(rc.next_pool_name);
+      if (!rc.next_pool) {
+         if (*rc.next_pool_name != 0) {
+            ua->warning_msg(_("NextPool \"%s\" not found.\n"), rc.next_pool_name);
          }
+         rc.next_pool = select_pool_resource(ua);
       }
-      if (!jcr->replace) {
-         ua->send_msg(_("Invalid replace option: %s\n"), rc.replace);
-         goto bail_out;
-      }
-   } else if (rc.job->replace) {
-      jcr->replace = rc.job->replace;
-   } else {
-      jcr->replace = REPLACE_ALWAYS;
    }
-   rc.replace = NULL;
-
-   if (rc.Priority) {
-      jcr->JobPriority = rc.Priority;
-      rc.Priority = 0;
+   if (!rc.next_pool) {
+      rc.next_pool = rc.pool->NextPool;      /* use default */
    }
+   if (rc.next_pool && !acl_access_ok(ua, Pool_ACL, rc.next_pool->name())) {
+      ua->error_msg(_("No authorization. NextPool \"%s\".\n"), rc.next_pool->name());
+      return false;
+   }
+   if (rc.next_pool) {
+      Dmsg1(100, "Using NextPool=%s\n", NPRT(rc.next_pool->name()));
+   }
+   return true;
+}
 
-   if (rc.since) {
-      if (!jcr->stime) {
-         jcr->stime = get_pool_memory(PM_MESSAGE);
+
+/*
+ * Fill in client data according to what is setup
+ *  in the run context, and make sure the user
+ *  has authorized access to it.
+ */
+static bool get_client(UAContext *ua, run_ctx &rc)
+{
+   if (rc.client_name) {
+      rc.client = GetClientResWithName(rc.client_name);
+      if (!rc.client) {
+         if (*rc.client_name != 0) {
+            ua->warning_msg(_("Client \"%s\" not found.\n"), rc.client_name);
+         }
+         rc.client = select_client_resource(ua);
       }
-      pm_strcpy(jcr->stime, rc.since);
-      rc.since = NULL;
+   } else if (!rc.client) {
+      rc.client = rc.job->client;           /* use default */
+   }
+   if (!rc.client) {
+      return false;
+   } else if (!acl_access_ok(ua, Client_ACL, rc.client->name())) {
+      ua->error_msg(_("No authorization. Client \"%s\".\n"),
+               rc.client->name());
+      return false;
    }
+   Dmsg1(800, "Using client=%s\n", rc.client->name());
 
-   if (rc.cloned) {
-      jcr->cloned = rc.cloned;
-      rc.cloned = false;
+   if (rc.restore_client_name) {
+      rc.client = GetClientResWithName(rc.restore_client_name);
+      if (!rc.client) {
+         if (*rc.restore_client_name != 0) {
+            ua->warning_msg(_("Restore Client \"%s\" not found.\n"), rc.restore_client_name);
+         }
+         rc.client = select_client_resource(ua);
+      }
+   } else if (!rc.client) {
+      rc.client = rc.job->client;           /* use default */
+   }
+   if (!rc.client) {
+      return false;
+   } else if (!acl_access_ok(ua, Client_ACL, rc.client->name())) {
+      ua->error_msg(_("No authorization. Client \"%s\".\n"),
+               rc.client->name());
+      return false;
    }
+   Dmsg1(800, "Using restore client=%s\n", rc.client->name());
+   return true;
+}
 
 
-   /* If pool changed, update migration write storage */
-   if (jcr->JobType == JT_MIGRATE) {
-      if (!set_migration_wstorage(jcr, rc.pool)) {
-         goto bail_out;
+/*
+ * Fill in fileset data according to what is setup
+ *  in the run context, and make sure the user
+ *  has authorized access to it.
+ */
+static bool get_fileset(UAContext *ua, run_ctx &rc)
+{
+   if (rc.fileset_name) {
+      rc.fileset = GetFileSetResWithName(rc.fileset_name);
+      if (!rc.fileset) {
+         ua->send_msg(_("FileSet \"%s\" not found.\n"), rc.fileset_name);
+         rc.fileset = select_fileset_resource(ua);
       }
+   } else if (!rc.fileset) {
+      rc.fileset = rc.job->fileset;           /* use default */
    }
-   rc.replace = ReplaceOptions[0].name;
-   for (i=0; ReplaceOptions[i].name; i++) {
-      if (ReplaceOptions[i].token == jcr->replace) {
-         rc.replace = ReplaceOptions[i].name;
-      }
+   if (!rc.fileset) {
+      return false;
+   } else if (!acl_access_ok(ua, FileSet_ACL, rc.fileset->name())) {
+      ua->send_msg(_("No authorization. FileSet \"%s\".\n"),
+               rc.fileset->name());
+      return false;
    }
-   if (rc.level_name) {
-      if (!get_level_from_name(jcr, rc.level_name)) {
-         ua->send_msg(_("Level %s not valid.\n"), rc.level_name);
-         goto bail_out;
+   return true;
+}
+
+/*
+ * Fill in storage data according to what is setup
+ *  in the run context, and make sure the user
+ *  has authorized access to it.
+ */
+static bool get_storage(UAContext *ua, run_ctx &rc)
+{
+   if (rc.store_name) {
+      rc.store->store = GetStoreResWithName(rc.store_name);
+      pm_strcpy(rc.store->store_source, _("command line"));
+      if (!rc.store->store) {
+         if (*rc.store_name != 0) {
+            ua->warning_msg(_("Storage \"%s\" not found.\n"), rc.store_name);
+         }
+         rc.store->store = select_storage_resource(ua);
+         pm_strcpy(rc.store->store_source, _("user selection"));
       }
-      rc.level_name = NULL;
+   } else if (!rc.store->store) {
+      get_job_storage(rc.store, rc.job, NULL);      /* use default */
    }
-   if (rc.jid) {
-      /* Note, this is also MigrateJobId */
-      jcr->RestoreJobId = str_to_int64(rc.jid);
-      rc.jid = 0;
+   if (!rc.store->store) {
+      ua->error_msg(_("No storage specified.\n"));
+      return false;
+   } else if (!acl_access_ok(ua, Storage_ACL, rc.store->store->name())) {
+      ua->error_msg(_("No authorization. Storage \"%s\".\n"),
+               rc.store->store->name());
+      return false;
    }
+   Dmsg1(800, "Using storage=%s\n", rc.store->store->name());
+   return true;
+}
 
-   /* Run without prompting? */
-   if (ua->batch || find_arg(ua, NT_("yes")) > 0) {
-      goto start_job;
+/*
+ * Get and pass back a list of Jobids in rc.jid
+ */
+static bool get_jobid_list(UAContext *ua, sellist &sl, run_ctx &rc)
+{
+   int i, JobId;
+   JOB_DBR jr;
+   char *pJobId;
+   bool found = false;
+
+   memset(&jr, 0, sizeof(jr));
+   rc.jid = NULL;
+   /* See if any JobId is specified */
+   if ((i=find_arg(ua, "jobid")) >= 0) {
+      rc.jid = ua->argv[i];
+      if (!rc.jid) {
+         ua->send_msg(_("No JobId specified.\n"));
+         return false;
+      }
+      if (!sl.set_string(ua->argv[i], true)) {
+         ua->send_msg("%s", sl.get_errmsg());
+         return false;
+      }
+      return true;
    }
 
+   /* No JobId list give, so see if he specified a Job */
+   if ((i=find_arg(ua, "job")) >= 0) {
+      rc.job_name = ua->argv[i];
+      if (!get_job(ua, rc)) {
+         ua->send_msg(_("Invalid or no Job name specified.\n"));
+         return false;
+      }
+   }
+   jr.limit = 100;  /* max 100 records */
+   if (rc.job_name) {
+      bstrncpy(jr.Name, rc.job_name, sizeof(jr.Name));
+   } else {
+      jr.Name[0] = 0;
+   }
+   jr.JobStatus = rc.jr.JobStatus;
+   Dmsg2(100, "JobStatus=%d JobName=%s\n", jr.JobStatus, jr.Name);
+   /* rc.JobIds is alist of all records found and printed */
+   rc.JobIds = db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, INCOMPLETE_JOBS);
+   if (!rc.JobIds || rc.JobIds->size()==0 ||
+       !get_selection_list(ua, sl, _("Enter the JobId list to select: "), false)) {
+      return false;
+   }
+   Dmsg1(100, "list=%s\n", sl.get_list());
    /*
-    * Prompt User to see if all run job parameters are correct, and
-    *   allow him to modify them.
+    * Make sure each item entered is in the JobIds list
     */
-   if (!display_job_parameters(ua, jcr, rc.job, rc.verify_list, rc.jid, rc.replace,
-        rc.client_name)) {
-      goto bail_out;
+   while ( (JobId = sl.next()) > 0) {
+      foreach_alist(pJobId, rc.JobIds) {
+         if (JobId == str_to_int64(pJobId)) {
+            pJobId[0] = 0;
+            found = true;
+            break;
+         }
+      }
+      if (!found) {
+         ua->error_msg(_("JobId=%d entered is not in the list.\n"), JobId);
+         return false;
+      }
    }
+   sl.begin();         /* reset to walk list again */
+   rc.done = false;
+   return true;
+}
 
-   if (!get_cmd(ua, _("OK to run? (yes/mod/no): "))) {
-      goto bail_out;
+static bool get_jobid_from_list(UAContext *ua, sellist &sl, run_ctx &rc)
+{
+   int JobId;
+
+   if (rc.done) {
+      return false;
+   }
+   if ((JobId = sl.next()) < 0) {
+      Dmsg1(100, "sl.next()=%d\n", JobId);
+      rc.done = true;
+      return false;
+   }
+   rc.jr.JobId = rc.JobId = JobId;
+   Dmsg1(100, "Next JobId=%d\n", rc.JobId);
+   if (!db_get_job_record(ua->jcr, ua->db, &rc.jr)) {
+      ua->error_msg(_("Could not get job record for selected JobId=%d. ERR=%s"),
+                    rc.JobId, db_strerror(ua->db));
+      return false;
+   }
+   Dmsg3(100, "Job=%s JobId=%d JobStatus=%c\n", rc.jr.Name, rc.jr.JobId,
+         rc.jr.JobStatus);
+   rc.job_name = rc.jr.Name;
+   if (!get_job(ua, rc)) {
+      return false;
+   }
+   if (!get_pool(ua, rc)) {
+      return false;
+   }
+   get_job_storage(rc.store, rc.job, NULL);
+   rc.client_name = rc.job->client->hdr.name;
+   if (!get_client(ua, rc)) {
+      return false;
+   }
+   if (!get_fileset(ua, rc)) {
+      return false;
+   }
+   if (!get_storage(ua, rc)) {
+      return false;
+   }
+   return true;
+}
+
+/*
+ * Restart Canceled, Failed, or Incomplete Jobs
+ *
+ *  Returns: 0 on error
+ *           JobId if OK
+ *
+ */
+int restart_cmd(UAContext *ua, const char *cmd)
+{
+   JCR *jcr = NULL;
+   run_ctx rc;
+   sellist sl;
+   int i, j;
+   bool got_kw = false;
+   struct s_js {
+      const char *status_name;
+      int32_t job_status;
+   };
+   struct s_js kw[] = {
+      {"Incomplete", JS_Incomplete},
+      {"Canceled",   JS_Canceled},
+      {"Failed",     JS_FatalError},
+      {"All",        0},
+      {NULL,         0}
+   };
+
+   if (!open_client_db(ua)) {
+      return 0;
    }
 
-   if (strncasecmp(ua->cmd, ".mod ", 5) == 0 || 
-       (strncasecmp(ua->cmd, "mod ", 4) == 0 && strlen(ua->cmd) > 6)) {
-      parse_ua_args(ua);
-      rc.mod = true;
-      if (!scan_command_line_arguments(ua, rc)) {
+   rc.jr.JobStatus = 0;
+   for (i=1; i<ua->argc; i++) {
+      for (j=0; kw[j].status_name; j++) {
+         if (strcasecmp(ua->argk[i], kw[j].status_name) == 0) {
+            rc.jr.JobStatus = kw[j].job_status;
+            got_kw = true;
+            break;
+         }
+      }
+   }
+   if (!got_kw) {  /* Must prompt user */
+      start_prompt(ua, _("You have the following choices:\n"));
+      for (i=0; kw[i].status_name; i++) {
+         add_prompt(ua, kw[i].status_name);
+      }
+      i = do_prompt(ua, NULL, _("Select termination code: "), NULL, 0);
+      if (i < 0) {
          return 0;
       }
-      goto try_again;
+      rc.jr.JobStatus = kw[i].job_status;
+   }
+
+   /* type now has what job termination code we want to look at */
+   Dmsg1(100, "Termination code=%c\n", rc.jr.JobStatus);
+
+   /* Get a list of JobIds to restore */
+   if (!get_jobid_list(ua, sl, rc)) {
+      if (rc.JobIds) {
+         rc.JobIds->destroy();
+      }
+      return false;
+   }
+   Dmsg1(100, "list=%s\n", sl.get_list());
+
+   while (get_jobid_from_list(ua, sl, rc)) {
+      /*
+       * Create JCR to run job.  NOTE!!! after this point, free_jcr()
+       *  before returning.
+       */
+      if (!jcr) {
+         jcr = new_jcr(sizeof(JCR), dird_free_jcr);
+         set_jcr_defaults(jcr, rc.job);
+         jcr->unlink_bsr = ua->jcr->unlink_bsr;    /* copy unlink flag from caller */
+         ua->jcr->unlink_bsr = false;
+      }
+
+      if (!set_run_context_in_jcr(ua, jcr, rc)) {
+         break;
+      }
+      start_job(ua, jcr, rc);
+      jcr = NULL;
    }
 
+   if (jcr) {
+      free_jcr(jcr);
+   }
+   if (rc.JobIds) {
+      rc.JobIds->destroy();
+   }
+   return 0;                       /* do not run */
+}
+
+int modify_job_parameters(UAContext *ua, JCR *jcr, run_ctx &rc)
+{
+   int i, opt;
+
    /*
     * At user request modify parameters of job to be run.
     */
-   if (ua->cmd[0] != 0 && strncasecmp(ua->cmd, _("mod"), strlen(ua->cmd)) == 0) {
+   if (ua->cmd[0] != 0 && strncasecmp(ua->cmd, _("mod"), strlen(ua->cmd)) == 0){
       FILE *fd;
 
       start_prompt(ua, _("Parameters to modify:\n"));
@@ -267,27 +652,36 @@ try_again:
       add_prompt(ua, _("Storage"));          /* 1 */
       add_prompt(ua, _("Job"));              /* 2 */
       add_prompt(ua, _("FileSet"));          /* 3 */
-      if (jcr->JobType == JT_RESTORE) {
+      if (jcr->getJobType() == JT_RESTORE) {
          add_prompt(ua, _("Restore Client"));   /* 4 */
       } else {
          add_prompt(ua, _("Client"));        /* 4 */
       }
       add_prompt(ua, _("When"));             /* 5 */
       add_prompt(ua, _("Priority"));         /* 6 */
-      if (jcr->JobType == JT_BACKUP ||
-          jcr->JobType == JT_MIGRATE ||
-          jcr->JobType == JT_VERIFY) {
+      if (jcr->getJobType() == JT_BACKUP ||
+          jcr->getJobType() == JT_COPY ||
+          jcr->getJobType() == JT_MIGRATE ||
+          jcr->getJobType() == JT_VERIFY) {
          add_prompt(ua, _("Pool"));          /* 7 */
-         if (jcr->JobType == JT_VERIFY) {
+         if ((jcr->getJobType() == JT_BACKUP &&   /* Virtual full */
+              jcr->is_JobLevel(L_VIRTUAL_FULL)) ||
+             jcr->getJobType() == JT_COPY ||
+             jcr->getJobType() == JT_MIGRATE) {
+            add_prompt(ua, _("NextPool"));          /* 8 */
+         } else if (jcr->getJobType() == JT_VERIFY) {
             add_prompt(ua, _("Verify Job"));  /* 8 */
          }
-      } else if (jcr->JobType == JT_RESTORE) {
+      } else if (jcr->getJobType() == JT_RESTORE) {
          add_prompt(ua, _("Bootstrap"));     /* 7 */
          add_prompt(ua, _("Where"));         /* 8 */
-         add_prompt(ua, _("File Relocation"));/* 9 */    
+         add_prompt(ua, _("File Relocation"));/* 9 */
          add_prompt(ua, _("Replace"));       /* 10 */
          add_prompt(ua, _("JobId"));         /* 11 */
       }
+      if (jcr->getJobType() == JT_BACKUP || jcr->getJobType() == JT_RESTORE) {
+         add_prompt(ua, _("Plugin Options")); /* 12 */
+      }
       switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
       case 0:
          /* Level */
@@ -355,9 +749,10 @@ try_again:
          goto try_again;
       case 7:
          /* Pool or Bootstrap depending on JobType */
-         if (jcr->JobType == JT_BACKUP ||
-             jcr->JobType == JT_MIGRATE ||
-             jcr->JobType == JT_VERIFY) {      /* Pool */
+         if (jcr->getJobType() == JT_BACKUP ||
+             jcr->getJobType() == JT_COPY ||
+             jcr->getJobType() == JT_MIGRATE ||
+             jcr->getJobType() == JT_VERIFY) {      /* Pool */
             rc.pool = select_pool_resource(ua);
             if (rc.pool) {
                jcr->pool = rc.pool;
@@ -390,8 +785,19 @@ try_again:
          }
          goto try_again;
       case 8:
+         /* Specify Next Pool */
+         if ((jcr->getJobType() == JT_BACKUP &&   /* Virtual full */
+              jcr->is_JobLevel(L_VIRTUAL_FULL)) ||
+             jcr->getJobType() == JT_COPY ||
+             jcr->getJobType() == JT_MIGRATE) {
+            rc.next_pool = select_pool_resource(ua);
+            if (rc.next_pool) {
+               jcr->next_pool = rc.next_pool;
+               goto try_again;
+            }
+         }
          /* Verify Job */
-         if (jcr->JobType == JT_VERIFY) {
+         if (jcr->getJobType() == JT_VERIFY) {
             rc.verify_job = select_job_resource(ua);
             if (rc.verify_job) {
               jcr->verify_job = rc.verify_job;
@@ -399,7 +805,7 @@ try_again:
             goto try_again;
          }
          /* Where */
-         if (!get_cmd(ua, _("Please enter path prefix for restore (/ for none): "))) {
+         if (!get_cmd(ua, _("Please enter the full path prefix for restore (/ for none): "))) {
             break;
          }
          if (jcr->RegexWhere) { /* cannot use regexwhere and where */
@@ -415,7 +821,7 @@ try_again:
          }
          jcr->where = bstrdup(ua->cmd);
          goto try_again;
-      case 9: 
+      case 9:
          /* File relocation */
          select_where_regexp(ua, jcr);
          goto try_again;
@@ -439,6 +845,18 @@ try_again:
             ua->send_msg(_("You must set the bootstrap file to NULL to be able to specify a JobId.\n"));
          }
          goto try_again;
+      case 12:
+         /* Plugin Options */
+         //generate_plugin_event(jcr, bEventJobConfig, &rc);
+         if (!get_cmd(ua, _("Please Plugin Options string: "))) {
+            break;
+         }
+         if (jcr->plugin_options) {
+            free(jcr->plugin_options);
+            jcr->plugin_options = NULL;
+         }
+         jcr->plugin_options = bstrdup(ua->cmd);
+         goto try_again;
       case -1:                        /* error or cancel */
          goto bail_out;
       default:
@@ -446,31 +864,203 @@ try_again:
       }
       goto bail_out;
    }
+   return 1;
 
-   if (ua->cmd[0] == 0 || strncasecmp(ua->cmd, _("yes"), strlen(ua->cmd)) == 0) {
-      JobId_t JobId;
-      Dmsg1(800, "Calling run_job job=%x\n", jcr->job);
+bail_out:
+   return -1;
+try_again:
+   return 0;
+}
 
-start_job:
-      Dmsg3(100, "JobId=%u using pool %s priority=%d\n", (int)jcr->JobId, 
-            jcr->pool->name(), jcr->JobPriority);
-      JobId = run_job(jcr);
-      Dmsg4(100, "JobId=%u NewJobId=%d using pool %s priority=%d\n", (int)jcr->JobId, 
-            JobId, jcr->pool->name(), jcr->JobPriority);
-      free_jcr(jcr);                  /* release jcr */
-      if (JobId == 0) {
-         ua->error_msg(_("Job failed.\n"));
-      } else {
-         char ed1[50];
-         ua->send_msg(_("Job queued. JobId=%s\n"), edit_int64(JobId, ed1));
+/*
+ * Put the run context that we have at this point into the JCR.
+ * That allows us to re-ask for the run context.
+ * This subroutine can be called multiple times, so it
+ *  must keep any prior settings.
+ */
+static bool set_run_context_in_jcr(UAContext *ua, JCR *jcr, run_ctx &rc)
+{
+   int i;
+
+   jcr->verify_job = rc.verify_job;
+   jcr->previous_job = rc.previous_job;
+   jcr->pool = rc.pool;
+   jcr->next_pool = rc.next_pool;
+   if (rc.next_pool) {
+      jcr->cmdline_next_pool_override = true;
+   }
+   if (rc.pool_name) {
+      pm_strcpy(jcr->pool_source, _("Command input"));
+   } else if (jcr->pool != jcr->job->pool) {
+      pm_strcpy(jcr->pool_source, _("User input"));
+   }
+   if (rc.next_pool_name) {
+      pm_strcpy(jcr->next_pool_source, _("Command input"));
+   } else if (jcr->next_pool != jcr->pool->NextPool) {
+      pm_strcpy(jcr->next_pool_source, _("User input"));
+   }
+
+   set_rwstorage(jcr, rc.store);
+   jcr->client = rc.client;
+   if (jcr->client) {
+      pm_strcpy(jcr->client_name, rc.client->name());
+   } else {
+      pm_strcpy(jcr->client_name, "**Dummy**");
+   }
+   if (rc.media_type) {
+      if (!jcr->media_type) {
+         jcr->media_type = get_pool_memory(PM_NAME);
+      }
+      pm_strcpy(jcr->media_type, rc.media_type);
+   }
+   jcr->fileset = rc.fileset;
+   jcr->ExpectedFiles = rc.files;
+   if (rc.catalog) {
+      jcr->catalog = rc.catalog;
+      pm_strcpy(jcr->catalog_source, _("User input"));
+   }
+
+   pm_strcpy(jcr->comment, rc.comment);
+
+   if (rc.where) {
+      if (jcr->where) {
+         free(jcr->where);
       }
-      return JobId;
+      jcr->where = bstrdup(rc.where);
+      rc.where = NULL;
    }
 
-bail_out:
-   ua->send_msg(_("Job not run.\n"));
-   free_jcr(jcr);
-   return 0;                       /* do not run */
+   if (rc.regexwhere) {
+      if (jcr->RegexWhere) {
+         free(jcr->RegexWhere);
+      }
+      jcr->RegexWhere = bstrdup(rc.regexwhere);
+      rc.regexwhere = NULL;
+   }
+
+   if (rc.when) {
+      jcr->sched_time = str_to_utime(rc.when);
+      if (jcr->sched_time == 0) {
+         ua->send_msg(_("Invalid time, using current time.\n"));
+         jcr->sched_time = time(NULL);
+      }
+      rc.when = NULL;
+   }
+
+   if (rc.bootstrap) {
+      if (jcr->RestoreBootstrap) {
+         free(jcr->RestoreBootstrap);
+      }
+      jcr->RestoreBootstrap = bstrdup(rc.bootstrap);
+      rc.bootstrap = NULL;
+   }
+
+   if (rc.plugin_options) {
+      if (jcr->plugin_options) {
+         free(jcr->plugin_options);
+      }
+      jcr->plugin_options = bstrdup(rc.plugin_options);
+      rc.plugin_options = NULL;
+   }
+
+   if (rc.replace) {
+      jcr->replace = 0;
+      for (i=0; ReplaceOptions[i].name; i++) {
+         if (strcasecmp(rc.replace, ReplaceOptions[i].name) == 0) {
+            jcr->replace = ReplaceOptions[i].token;
+         }
+      }
+      if (!jcr->replace) {
+         ua->send_msg(_("Invalid replace option: %s\n"), rc.replace);
+         return false;
+      }
+   } else if (rc.job->replace) {
+      jcr->replace = rc.job->replace;
+   } else {
+      jcr->replace = REPLACE_ALWAYS;
+   }
+   rc.replace = NULL;
+
+   /* Set Snapshot Retention (Job <- Client) */
+   if (jcr->client) {
+      jcr->snapshot_retention = jcr->client->SnapRetention;
+   }
+   if (jcr->job && jcr->job->SnapRetention > 0) {
+      jcr->snapshot_retention = jcr->job->SnapRetention;
+   }
+
+   if (rc.Priority) {
+      jcr->JobPriority = rc.Priority;
+      rc.Priority = 0;
+   }
+
+   if (rc.since) {
+      if (!jcr->stime) {
+         jcr->stime = get_pool_memory(PM_MESSAGE);
+      }
+      pm_strcpy(jcr->stime, rc.since);
+      rc.since = NULL;
+   }
+
+   if (rc.cloned) {
+      jcr->cloned = rc.cloned;
+      rc.cloned = false;
+   }
+
+   /* If pool changed, update migration write storage */
+   if (jcr->is_JobType(JT_MIGRATE) || jcr->is_JobType(JT_COPY) ||
+      (jcr->is_JobType(JT_BACKUP) && jcr->is_JobLevel(L_VIRTUAL_FULL))) {
+      if (!set_mac_wstorage(ua, jcr, rc.pool, rc.next_pool,
+            jcr->next_pool_source)) {
+         return false;
+      }
+   }
+   rc.replace = ReplaceOptions[0].name;
+   for (i=0; ReplaceOptions[i].name; i++) {
+      if (ReplaceOptions[i].token == jcr->replace) {
+         rc.replace = ReplaceOptions[i].name;
+      }
+   }
+   if (rc.level_name) {
+      if (!get_level_from_name(jcr, rc.level_name)) {
+         ua->send_msg(_("Level \"%s\" not valid.\n"), rc.level_name);
+         return false;
+      }
+      rc.level_name = NULL;
+   }
+   if (rc.jid) {
+      /* Note, this is also MigrateJobId and a VerifyJobId */
+      jcr->RestoreJobId = str_to_int64(rc.jid);
+
+      /* Copy also this parameter for VirtualFull in jcr->JobIds */
+      if (!jcr->JobIds) {
+         jcr->JobIds = get_pool_memory(PM_FNAME);
+      }
+      pm_strcpy(jcr->JobIds, rc.jid);
+      jcr->use_all_JobIds = rc.alljobid; /* if we found the "alljobid=" kw */
+      rc.alljobid = false;
+      rc.jid = 0;
+   }
+
+   /* Some options are not available through the menu
+    * TODO: Add an advanced menu?
+    */
+   if (rc.spool_data_set) {
+      jcr->spool_data = rc.spool_data;
+   }
+
+   if (rc.accurate_set) {
+      jcr->accurate = rc.accurate;
+   }
+
+   /* Used by migration jobs that can have the same name,
+    * but can run at the same time
+    */
+   if (rc.ignoreduplicatecheck_set) {
+      jcr->IgnoreDuplicateJobChecking = rc.ignoreduplicatecheck;
+   }
+
+   return true;
 }
 
 static void select_where_regexp(UAContext *ua, JCR *jcr)
@@ -490,19 +1080,19 @@ try_again_reg:
    add_prompt(ua, _("Enter a regexp"));              /* 3 */
    add_prompt(ua, _("Test filename manipulation"));  /* 4 */
    add_prompt(ua, _("Use this ?"));                  /* 5 */
-   
+
    switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
    case 0:
       /* Strip prefix */
-      if (get_cmd(ua, _("Please enter path prefix to strip: "))) {
+      if (get_cmd(ua, _("Please enter the path prefix to strip: "))) {
          if (strip_prefix) bfree(strip_prefix);
          strip_prefix = bstrdup(ua->cmd);
       }
-      
+
       goto try_again_reg;
    case 1:
       /* Add prefix */
-      if (get_cmd(ua, _("Please enter path prefix to add (/ for none): "))) {
+      if (get_cmd(ua, _("Please enter the path prefix to add (/ for none): "))) {
          if (IsPathSeparator(ua->cmd[0]) && ua->cmd[1] == '\0') {
             ua->cmd[0] = 0;
          }
@@ -513,10 +1103,10 @@ try_again_reg:
       goto try_again_reg;
    case 2:
       /* Add suffix */
-      if (get_cmd(ua, _("Please enter file suffix to add: "))) {
+      if (get_cmd(ua, _("Please enter the file suffix to add: "))) {
          if (add_suffix) bfree(add_suffix);
          add_suffix = bstrdup(ua->cmd);
-      }      
+      }
       goto try_again_reg;
    case 3:
       /* Add rwhere */
@@ -524,13 +1114,13 @@ try_again_reg:
          if (rwhere) bfree(rwhere);
          rwhere = bstrdup(ua->cmd);
       }
-      
-      goto try_again_reg;      
+
+      goto try_again_reg;
    case 4:
-      /* Test regexp */ 
+      /* Test regexp */
       char *result;
       char *regexp;
-      
+
       if (rwhere && rwhere[0] != '\0') {
          regs = get_bregexps(rwhere);
          ua->send_msg(_("regexwhere=%s\n"), NPRT(rwhere));
@@ -541,7 +1131,7 @@ try_again_reg:
          regs = get_bregexps(regexp);
          ua->send_msg(_("strip_prefix=%s add_prefix=%s add_suffix=%s result=%s\n"),
                       NPRT(strip_prefix), NPRT(add_prefix), NPRT(add_suffix), NPRT(regexp));
-         
+
          bfree(regexp);
       }
 
@@ -549,7 +1139,7 @@ try_again_reg:
          ua->send_msg(_("Cannot use your regexp\n"));
          goto try_again_reg;
       }
-
+      ua->send_msg(_("Enter a period (.) to stop this test\n"));
       while (get_cmd(ua, _("Please enter filename to test: "))) {
          apply_bregexps(ua->cmd, regs, &result);
          ua->send_msg(_("%s -> %s\n"), ua->cmd, result);
@@ -608,33 +1198,37 @@ bail_out_reg:
 
 static void select_job_level(UAContext *ua, JCR *jcr)
 {
-   if (jcr->JobType == JT_BACKUP) {
+   if (jcr->getJobType() == JT_BACKUP) {
       start_prompt(ua, _("Levels:\n"));
-      add_prompt(ua, _("Base"));
+//    add_prompt(ua, _("Base"));
       add_prompt(ua, _("Full"));
       add_prompt(ua, _("Incremental"));
       add_prompt(ua, _("Differential"));
       add_prompt(ua, _("Since"));
+      add_prompt(ua, _("VirtualFull"));
       switch (do_prompt(ua, "", _("Select level"), NULL, 0)) {
+//    case 0:
+//       jcr->JobLevel = L_BASE;
+//       break;
       case 0:
-         jcr->JobLevel = L_BASE;
+         jcr->setJobLevel(L_FULL);
          break;
       case 1:
-         jcr->JobLevel = L_FULL;
+         jcr->setJobLevel(L_INCREMENTAL);
          break;
       case 2:
-         jcr->JobLevel = L_INCREMENTAL;
+         jcr->setJobLevel(L_DIFFERENTIAL);
          break;
       case 3:
-         jcr->JobLevel = L_DIFFERENTIAL;
+         jcr->setJobLevel(L_SINCE);
          break;
       case 4:
-         jcr->JobLevel = L_SINCE;
+         jcr->setJobLevel(L_VIRTUAL_FULL);
          break;
       default:
          break;
       }
-   } else if (jcr->JobType == JT_VERIFY) {
+   } else if (jcr->getJobType() == JT_VERIFY) {
       start_prompt(ua, _("Levels:\n"));
       add_prompt(ua, _("Initialize Catalog"));
       add_prompt(ua, _("Verify Catalog"));
@@ -643,19 +1237,19 @@ static void select_job_level(UAContext *ua, JCR *jcr)
       add_prompt(ua, _("Verify Volume Data (not yet implemented)"));
       switch (do_prompt(ua, "",  _("Select level"), NULL, 0)) {
       case 0:
-         jcr->JobLevel = L_VERIFY_INIT;
+         jcr->setJobLevel(L_VERIFY_INIT);
          break;
       case 1:
-         jcr->JobLevel = L_VERIFY_CATALOG;
+         jcr->setJobLevel(L_VERIFY_CATALOG);
          break;
       case 2:
-         jcr->JobLevel = L_VERIFY_VOLUME_TO_CATALOG;
+         jcr->setJobLevel(L_VERIFY_VOLUME_TO_CATALOG);
          break;
       case 3:
-         jcr->JobLevel = L_VERIFY_DISK_TO_CATALOG;
+         jcr->setJobLevel(L_VERIFY_DISK_TO_CATALOG);
          break;
       case 4:
-         jcr->JobLevel = L_VERIFY_DATA;
+         jcr->setJobLevel(L_VERIFY_DATA);
          break;
       default:
          break;
@@ -667,56 +1261,127 @@ static void select_job_level(UAContext *ua, JCR *jcr)
 }
 
 static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char *verify_list,
-   char *jid, const char *replace, char *client_name) 
+   char *jid, const char *replace, char *client_name)
 {
-   Dmsg1(800, "JobType=%c\n", jcr->JobType);
-   switch (jcr->JobType) {
-      char ec1[30];
-      char dt[MAX_TIME_LENGTH];
+   char ec1[30];
+   char dt[MAX_TIME_LENGTH];
+
+   Dmsg1(800, "JobType=%c\n", jcr->getJobType());
+   switch (jcr->getJobType()) {
    case JT_ADMIN:
-      if (ua->api) ua->signal(BNET_RUN_CMD);   
-      ua->send_msg(_("Run %s job\n"
+      if (ua->api) {
+         ua->signal(BNET_RUN_CMD);
+         ua->send_msg("Type: Admin\n"
+                     "Title: Run Admin Job\n"
+                     "JobName:  %s\n"
+                     "FileSet:  %s\n"
+                     "Client:   %s\n"
+                     "Storage:  %s\n"
+                     "When:     %s\n"
+                     "Priority: %d\n",
+                 job->name(),
+                 jcr->fileset->name(),
+                 NPRT(jcr->client->name()),
+                 jcr->wstore?jcr->wstore->name():"*None*",
+                 bstrutime(dt, sizeof(dt), jcr->sched_time),
+                 jcr->JobPriority);
+      } else {
+         ua->send_msg(_("Run Admin Job\n"
                      "JobName:  %s\n"
                      "FileSet:  %s\n"
                      "Client:   %s\n"
                      "Storage:  %s\n"
                      "When:     %s\n"
                      "Priority: %d\n"),
-                 _("Admin"),
                  job->name(),
                  jcr->fileset->name(),
                  NPRT(jcr->client->name()),
                  jcr->wstore?jcr->wstore->name():"*None*",
                  bstrutime(dt, sizeof(dt), jcr->sched_time),
                  jcr->JobPriority);
-      jcr->JobLevel = L_FULL;
+      }
+      jcr->setJobLevel(L_FULL);
       break;
    case JT_BACKUP:
    case JT_VERIFY:
-      if (jcr->JobType == JT_BACKUP) {
-         if (ua->api) ua->signal(BNET_RUN_CMD);   
-         ua->send_msg(_("Run %s job\n"
+      char next_pool[MAX_NAME_LENGTH + 50];
+      next_pool[0] = 0;
+      if (jcr->getJobType() == JT_BACKUP) {
+         if (ua->api) {
+            ua->signal(BNET_RUN_CMD);
+            if (jcr->is_JobLevel(L_VIRTUAL_FULL)) {
+               bsnprintf(next_pool, sizeof(next_pool), "NextPool: %s\n",
+                  jcr->next_pool ? jcr->next_pool->name() : "*None*");
+            }
+            ua->send_msg("Type: Backup\n"
+                        "Title: Run Backup Job\n"
+                        "JobName:  %s\n"
+                        "Level:    %s\n"
+                        "Client:   %s\n"
+                        "FileSet:  %s\n"
+                        "Pool:     %s\n"
+                        "%s"
+                        "Storage:  %s\n"
+                        "When:     %s\n"
+                        "Priority: %d\n"
+                        "%s%s%s",
+                 job->name(),
+                 level_to_str(jcr->getJobLevel()),
+                 jcr->client->name(),
+                 jcr->fileset->name(),
+                 NPRT(jcr->pool->name()),
+                 next_pool,
+                 jcr->wstore?jcr->wstore->name():"*None*",
+                 bstrutime(dt, sizeof(dt), jcr->sched_time),
+                 jcr->JobPriority,
+                 jcr->plugin_options?"Plugin Options: ":"",
+                 jcr->plugin_options?jcr->plugin_options:"",
+                 jcr->plugin_options?"\n":"");
+         } else {
+            if (jcr->is_JobLevel(L_VIRTUAL_FULL)) {
+               bsnprintf(next_pool, sizeof(next_pool),
+                  "NextPool: %s (From %s)\n",
+                  jcr->next_pool ? jcr->next_pool->name() : "*None*",
+                  jcr->next_pool_source);
+            }
+            ua->send_msg(_("Run Backup job\n"
                         "JobName:  %s\n"
                         "Level:    %s\n"
                         "Client:   %s\n"
                         "FileSet:  %s\n"
                         "Pool:     %s (From %s)\n"
+                        "%s"
                         "Storage:  %s (From %s)\n"
                         "When:     %s\n"
-                        "Priority: %d\n"),
-                 _("Backup"),
+                        "Priority: %d\n"
+                        "%s%s%s"),
                  job->name(),
-                 level_to_str(jcr->JobLevel),
+                 level_to_str(jcr->getJobLevel()),
                  jcr->client->name(),
                  jcr->fileset->name(),
                  NPRT(jcr->pool->name()), jcr->pool_source,
+                 next_pool,
                  jcr->wstore?jcr->wstore->name():"*None*", jcr->wstore_source,
                  bstrutime(dt, sizeof(dt), jcr->sched_time),
-                 jcr->JobPriority);
+                 jcr->JobPriority,
+                 jcr->plugin_options?"Plugin Options: ":"",
+                 jcr->plugin_options?jcr->plugin_options:"",
+                 jcr->plugin_options?"\n":"");
+         }
       } else {  /* JT_VERIFY */
+         JOB_DBR jr;
          const char *Name;
          if (jcr->verify_job) {
             Name = jcr->verify_job->name();
+         } else if (jcr->RestoreJobId) { /* Display job name if jobid requested */
+            memset(&jr, 0, sizeof(jr));
+            jr.JobId = jcr->RestoreJobId;
+            if (!db_get_job_record(jcr, ua->db, &jr)) {
+               ua->error_msg(_("Could not get job record for selected JobId. ERR=%s"),
+                    db_strerror(ua->db));
+               return false;
+            }
+            Name = jr.Job;
          } else {
             Name = "";
          }
@@ -726,8 +1391,32 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
          if (!verify_list) {
             verify_list = "";
          }
-         if (ua->api) ua->signal(BNET_RUN_CMD);   
-         ua->send_msg(_("Run %s job\n"
+         if (ua->api) {
+            ua->signal(BNET_RUN_CMD);
+            ua->send_msg("Type: Verify\n"
+                        "Title: Run Verify Job\n"
+                        "JobName:     %s\n"
+                        "Level:       %s\n"
+                        "Client:      %s\n"
+                        "FileSet:     %s\n"
+                        "Pool:        %s (From %s)\n"
+                        "Storage:     %s (From %s)\n"
+                        "Verify Job:  %s\n"
+                        "Verify List: %s\n"
+                        "When:        %s\n"
+                        "Priority:    %d\n",
+              job->name(),
+              level_to_str(jcr->getJobLevel()),
+              jcr->client->name(),
+              jcr->fileset->name(),
+              NPRT(jcr->pool->name()), jcr->pool_source,
+              jcr->rstore->name(), jcr->rstore_source,
+              Name,
+              verify_list,
+              bstrutime(dt, sizeof(dt), jcr->sched_time),
+              jcr->JobPriority);
+         } else {
+            ua->send_msg(_("Run Verify Job\n"
                         "JobName:     %s\n"
                         "Level:       %s\n"
                         "Client:      %s\n"
@@ -738,9 +1427,8 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
                         "Verify List: %s\n"
                         "When:        %s\n"
                         "Priority:    %d\n"),
-              _("Verify"),
               job->name(),
-              level_to_str(jcr->JobLevel),
+              level_to_str(jcr->getJobLevel()),
               jcr->client->name(),
               jcr->fileset->name(),
               NPRT(jcr->pool->name()), jcr->pool_source,
@@ -749,6 +1437,7 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
               verify_list,
               bstrutime(dt, sizeof(dt), jcr->sched_time),
               jcr->JobPriority);
+         }
       }
       break;
    case JT_RESTORE:
@@ -762,14 +1451,16 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
             jcr->RestoreJobId = ua->int64_val;
          }
       }
-      jcr->JobLevel = L_FULL;      /* default level */
+      jcr->setJobLevel(L_FULL);      /* default level */
       Dmsg1(800, "JobId to restore=%d\n", jcr->RestoreJobId);
       if (jcr->RestoreJobId == 0) {
-         if (ua->api) ua->signal(BNET_RUN_CMD);   
          /* RegexWhere is take before RestoreWhere */
          if (jcr->RegexWhere || (job->RegexWhere && !jcr->where)) {
-            ua->send_msg(_("Run Restore job\n"
-                        "JobName:        f%s\n"
+            if (ua->api) {
+               ua->signal(BNET_RUN_CMD);
+               ua->send_msg("Type: Restore\n"
+                        "Title: Run Restore Job\n"
+                        "JobName:         %s\n"
                         "Bootstrap:       %s\n"
                         "RegexWhere:      %s\n"
                         "Replace:         %s\n"
@@ -779,9 +1470,10 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
                         "Storage:         %s\n"
                         "When:            %s\n"
                         "Catalog:         %s\n"
-                        "Priority:        %d\n"),
+                        "Priority:        %d\n"
+                        "Plugin Options:  %s\n",
                  job->name(),
-                 NPRT(jcr->RestoreBootstrap), 
+                 NPRT(jcr->RestoreBootstrap),
                  jcr->RegexWhere?jcr->RegexWhere:job->RegexWhere,
                  replace,
                  jcr->fileset->name(),
@@ -790,10 +1482,41 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
                  jcr->rstore->name(),
                  bstrutime(dt, sizeof(dt), jcr->sched_time),
                  jcr->catalog->name(),
-                 jcr->JobPriority);
+                 jcr->JobPriority,
+                 NPRTB(jcr->plugin_options));
 
+            } else {
+               ua->send_msg(_("Run Restore job\n"
+                        "JobName:         %s\n"
+                        "Bootstrap:       %s\n"
+                        "RegexWhere:      %s\n"
+                        "Replace:         %s\n"
+                        "FileSet:         %s\n"
+                        "Backup Client:   %s\n"
+                        "Restore Client:  %s\n"
+                        "Storage:         %s\n"
+                        "When:            %s\n"
+                        "Catalog:         %s\n"
+                        "Priority:        %d\n"
+                        "Plugin Options:  %s\n"),
+                 job->name(),
+                 NPRT(jcr->RestoreBootstrap),
+                 jcr->RegexWhere?jcr->RegexWhere:job->RegexWhere,
+                 replace,
+                 jcr->fileset->name(),
+                 client_name,
+                 jcr->client->name(),
+                 jcr->rstore->name(),
+                 bstrutime(dt, sizeof(dt), jcr->sched_time),
+                 jcr->catalog->name(),
+                 jcr->JobPriority,
+                 NPRTB(jcr->plugin_options));
+            }
          } else {
-            ua->send_msg(_("Run Restore job\n"
+            if (ua->api) {
+               ua->signal(BNET_RUN_CMD);
+               ua->send_msg("Type: Restore\n"
+                        "Title: Run Restore job\n"
                         "JobName:         %s\n"
                         "Bootstrap:       %s\n"
                         "Where:           %s\n"
@@ -804,10 +1527,11 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
                         "Storage:         %s\n"
                         "When:            %s\n"
                         "Catalog:         %s\n"
-                        "Priority:        %d\n"),
+                        "Priority:        %d\n"
+                        "Plugin Options:  %s\n",
                  job->name(),
-                 NPRT(jcr->RestoreBootstrap), 
-                 jcr->where?jcr->where:NPRT(job->RestoreWhere), 
+                 NPRT(jcr->RestoreBootstrap),
+                 jcr->where?jcr->where:NPRT(job->RestoreWhere),
                  replace,
                  jcr->fileset->name(),
                  client_name,
@@ -815,17 +1539,47 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
                  jcr->rstore->name(),
                  bstrutime(dt, sizeof(dt), jcr->sched_time),
                  jcr->catalog->name(),
-                 jcr->JobPriority);
+                 jcr->JobPriority,
+                 NPRTB(jcr->plugin_options));
+
+            } else {
+               ua->send_msg(_("Run Restore job\n"
+                        "JobName:         %s\n"
+                        "Bootstrap:       %s\n"
+                        "Where:           %s\n"
+                        "Replace:         %s\n"
+                        "FileSet:         %s\n"
+                        "Backup Client:   %s\n"
+                        "Restore Client:  %s\n"
+                        "Storage:         %s\n"
+                        "When:            %s\n"
+                        "Catalog:         %s\n"
+                        "Priority:        %d\n"
+                        "Plugin Options:  %s\n"),
+                 job->name(),
+                 NPRT(jcr->RestoreBootstrap),
+                 jcr->where?jcr->where:NPRT(job->RestoreWhere),
+                 replace,
+                 jcr->fileset->name(),
+                 client_name,
+                 jcr->client->name(),
+                 jcr->rstore->name(),
+                 bstrutime(dt, sizeof(dt), jcr->sched_time),
+                 jcr->catalog->name(),
+                 jcr->JobPriority,
+                 NPRTB(jcr->plugin_options));
+            }
          }
 
       } else {
-         if (ua->api) ua->signal(BNET_RUN_CMD);   
+         /* ***FIXME*** This needs to be fixed for bat */
+         if (ua->api) ua->signal(BNET_RUN_CMD);
          ua->send_msg(_("Run Restore job\n"
                         "JobName:    %s\n"
                         "Bootstrap:  %s\n"),
                       job->name(),
                       NPRT(jcr->RestoreBootstrap));
-                      
+
          /* RegexWhere is take before RestoreWhere */
          if (jcr->RegexWhere || (job->RegexWhere && !jcr->where)) {
             ua->send_msg(_("RegexWhere: %s\n"),
@@ -835,63 +1589,110 @@ static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, const char
                          jcr->where?jcr->where:NPRT(job->RestoreWhere));
          }
 
-         ua->send_msg(_("Replace:    %s\n"
-                        "Client:     %s\n"
-                        "Storage:    %s\n"
-                        "JobId:      %s\n"
-                        "When:       %s\n"
-                        "Catalog:    %s\n"
-                        "Priority:   %d\n"),
+         ua->send_msg(_("Replace:         %s\n"
+                        "Client:          %s\n"
+                        "Storage:         %s\n"
+                        "JobId:           %s\n"
+                        "When:            %s\n"
+                        "Catalog:         %s\n"
+                        "Priority:        %d\n"
+                        "Plugin Options:  %s\n"),
               replace,
               jcr->client->name(),
               jcr->rstore->name(),
               jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1),
               bstrutime(dt, sizeof(dt), jcr->sched_time),
               jcr->catalog->name(),
-              jcr->JobPriority);
-      }
+              jcr->JobPriority,
+              NPRTB(jcr->plugin_options));
+       }
       break;
+   case JT_COPY:
    case JT_MIGRATE:
-      jcr->JobLevel = L_FULL;      /* default level */
-      if (ua->api) ua->signal(BNET_RUN_CMD);   
-      ua->send_msg(_("Run Migration job\n"
+      char *prt_type;
+      jcr->setJobLevel(L_FULL);      /* default level */
+      if (ua->api) {
+         ua->signal(BNET_RUN_CMD);
+         if (jcr->getJobType() == JT_COPY) {
+            prt_type = (char *)"Type: Copy\nTitle: Run Copy Job\n";
+         } else {
+            prt_type = (char *)"Type: Migration\nTitle: Run Migration Job\n";
+         }
+         ua->send_msg("%s"
+                     "JobName:       %s\n"
+                     "Bootstrap:     %s\n"
+                     "Client:        %s\n"
+                     "FileSet:       %s\n"
+                     "Pool:          %s\n"
+                     "NextPool:      %s\n"
+                     "Read Storage:  %s\n"
+                     "Write Storage: %s\n"
+                     "JobId:         %s\n"
+                     "When:          %s\n"
+                     "Catalog:       %s\n"
+                     "Priority:      %d\n",
+           prt_type,
+           job->name(),
+           NPRT(jcr->RestoreBootstrap),
+           jcr->client->name(),
+           jcr->fileset->name(),
+           NPRT(jcr->pool->name()),
+           jcr->next_pool?jcr->next_pool->name():"*None*",
+           jcr->rstore->name(),
+           jcr->wstore?jcr->wstore->name():"*None*",
+           jcr->MigrateJobId==0?"*None*":edit_uint64(jcr->MigrateJobId, ec1),
+           bstrutime(dt, sizeof(dt), jcr->sched_time),
+           jcr->catalog->name(),
+           jcr->JobPriority);
+      } else {
+         if (jcr->getJobType() == JT_COPY) {
+            prt_type = _("Run Copy job\n");
+         } else {
+            prt_type = _("Run Migration job\n");
+         }
+         ua->send_msg("%s"
                      "JobName:       %s\n"
                      "Bootstrap:     %s\n"
                      "Client:        %s\n"
                      "FileSet:       %s\n"
                      "Pool:          %s (From %s)\n"
+                     "NextPool:      %s (From %s)\n"
                      "Read Storage:  %s (From %s)\n"
                      "Write Storage: %s (From %s)\n"
                      "JobId:         %s\n"
                      "When:          %s\n"
                      "Catalog:       %s\n"
-                     "Priority:      %d\n"),
+                     "Priority:      %d\n",
+           prt_type,
            job->name(),
            NPRT(jcr->RestoreBootstrap),
            jcr->client->name(),
            jcr->fileset->name(),
            NPRT(jcr->pool->name()), jcr->pool_source,
+           jcr->next_pool?jcr->next_pool->name():"*None*",
+               NPRT(jcr->next_pool_source),
            jcr->rstore->name(), jcr->rstore_source,
            jcr->wstore?jcr->wstore->name():"*None*", jcr->wstore_source,
            jcr->MigrateJobId==0?"*None*":edit_uint64(jcr->MigrateJobId, ec1),
            bstrutime(dt, sizeof(dt), jcr->sched_time),
            jcr->catalog->name(),
            jcr->JobPriority);
+      }
       break;
    default:
-      ua->error_msg(_("Unknown Job Type=%d\n"), jcr->JobType);
+      ua->error_msg(_("Unknown Job Type=%d\n"), jcr->getJobType());
       return false;
    }
    return true;
 }
 
 
-static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
+static bool scan_run_command_line_arguments(UAContext *ua, run_ctx &rc)
 {
    bool kw_ok;
    int i, j;
    static const char *kw[] = {        /* command line arguments */
-      "job",                          /*  Used in a switch() */
+      "alljobid",                     /* 0 Used in a switch() */
       "jobid",                        /* 1 */
       "client",                       /* 2 */
       "fd",
@@ -905,7 +1706,7 @@ static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
       "replace",                      /* 11 */
       "when",                         /* 12 */
       "priority",                     /* 13 */
-      "yes",          /* 14  -- if you change this change YES_POS too */
+      "yes",        /* 14  -- if you change this change YES_POS too */
       "verifyjob",                    /* 15 */
       "files",                        /* 16 number of files to restore */
       "catalog",                      /* 17 override catalog */
@@ -916,6 +1717,14 @@ static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
       "pool",                         /* 22 */
       "backupclient",                 /* 23 */
       "restoreclient",                /* 24 */
+      "pluginoptions",                /* 25 */
+      "spooldata",                    /* 26 */
+      "comment",                      /* 27 */
+      "ignoreduplicatecheck",         /* 28 */
+      "accurate",                     /* 29 */
+      "job",                          /* 30 */
+      "mediatype",                    /* 31 */
+      "nextpool",                     /* 32 override next pool name */
       NULL};
 
 #define YES_POS 14
@@ -923,13 +1732,19 @@ static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
    rc.catalog_name = NULL;
    rc.job_name = NULL;
    rc.pool_name = NULL;
+   rc.next_pool_name = NULL;
    rc.store_name = NULL;
    rc.client_name = NULL;
+   rc.media_type = NULL;
    rc.restore_client_name = NULL;
    rc.fileset_name = NULL;
    rc.verify_job_name = NULL;
    rc.previous_job_name = NULL;
-
+   rc.accurate_set = false;
+   rc.spool_data_set = false;
+   rc.ignoreduplicatecheck = false;
+   rc.comment = NULL;
+   rc.plugin_options = NULL;
 
    for (i=1; i<ua->argc; i++) {
       Dmsg2(800, "Doing arg %d = %s\n", i, ua->argk[i]);
@@ -942,17 +1757,12 @@ static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
                ua->send_msg(_("Value missing for keyword %s\n"), ua->argk[i]);
                return false;
             }
-            Dmsg1(800, "Got keyword=%s\n", NPRT(kw[j]));
+            Dmsg2(800, "Got j=%d keyword=%s\n", j, NPRT(kw[j]));
             switch (j) {
-            case 0: /* job */
-               if (rc.job_name) {
-                  ua->send_msg(_("Job name specified twice.\n"));
-                  return false;
-               }
-               rc.job_name = ua->argv[i];
-               kw_ok = true;
-               break;
-            case 1: /* JobId */
+            case 0: /* alljobid */
+               rc.alljobid = true;
+               /* Fall through wanted */
+            case 1:  /* JobId */
                if (rc.jid && !rc.mod) {
                   ua->send_msg(_("JobId specified twice.\n"));
                   return false;
@@ -1069,22 +1879,18 @@ static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
                rc.files = atoi(ua->argv[i]);
                kw_ok = true;
                break;
-
             case 17: /* catalog */
                rc.catalog_name = ua->argv[i];
                kw_ok = true;
                break;
-
             case 18: /* since */
                rc.since = ua->argv[i];
-               kw_ok = true; 
+               kw_ok = true;
                break;
-
             case 19: /* cloned */
                rc. cloned = true;
                kw_ok = true;
                break;
-
             case 20: /* write verify list output */
                rc.verify_list = ua->argv[i];
                kw_ok = true;
@@ -1121,11 +1927,90 @@ static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
                rc.restore_client_name = ua->argv[i];
                kw_ok = true;
                break;
+            case 25: /* pluginoptions */
+               ua->send_msg(_("Plugin Options not yet implemented.\n"));
+               return false;
+               if (rc.plugin_options) {
+                  ua->send_msg(_("Plugin Options specified twice.\n"));
+                  return false;
+               }
+               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"));
+                  return false;
+               }
+               kw_ok = true;
+               break;
+            case 26: /* spooldata */
+               if (rc.spool_data_set) {
+                  ua->send_msg(_("Spool flag specified twice.\n"));
+                  return false;
+               }
+               if (is_yesno(ua->argv[i], &rc.spool_data)) {
+                  rc.spool_data_set = true;
+                  kw_ok = true;
+               } else {
+                  ua->send_msg(_("Invalid spooldata flag.\n"));
+               }
+               break;
+            case 27: /* comment */
+               rc.comment = ua->argv[i];
+               kw_ok = true;
+               break;
+            case 28: /* ignoreduplicatecheck */
+               if (rc.ignoreduplicatecheck_set) {
+                  ua->send_msg(_("IgnoreDuplicateCheck flag specified twice.\n"));
+                  return false;
+               }
+               if (is_yesno(ua->argv[i], &rc.ignoreduplicatecheck)) {
+                  rc.ignoreduplicatecheck_set = true;
+                  kw_ok = true;
+               } else {
+                  ua->send_msg(_("Invalid ignoreduplicatecheck flag.\n"));
+               }
+               break;
+            case 29: /* accurate */
+               if (rc.accurate_set) {
+                  ua->send_msg(_("Accurate flag specified twice.\n"));
+                  return false;
+               }
+               if (is_yesno(ua->argv[i], &rc.accurate)) {
+                  rc.accurate_set = true;
+                  kw_ok = true;
+               } else {
+                  ua->send_msg(_("Invalid accurate flag.\n"));
+               }
+               break;
+            case 30: /* job */
+               if (rc.job_name) {
+                  ua->send_msg(_("Job name specified twice.\n"));
+                  return false;
+               }
+               rc.job_name = ua->argv[i];
+               kw_ok = true;
+               break;
+            case 31: /* mediatype */
+               if (rc.media_type) {
+                  ua->send_msg(_("Media Type specified twice.\n"));
+                  return false;
+               }
+               rc.media_type = ua->argv[i];
+               kw_ok = true;
+               break;
+            case 32: /* Next Pool */
+               if (rc.next_pool_name) {
+                  ua->send_msg(_("NextPool specified twice.\n"));
+                  return false;
+               }
+               rc.next_pool_name = ua->argv[i];
+               kw_ok = true;
+               break;
             default:
                break;
             }
          } /* end strcase compare */
       } /* end keyword loop */
+
       /*
        * End of keyword for loop -- if not found, we got a bogus keyword
        */
@@ -1144,9 +2029,13 @@ static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
          }
       }
    } /* end argc loop */
-             
-   Dmsg0(800, "Done scan.\n");
 
+   Dmsg0(800, "Done scan.\n");
+   if (rc.comment) {
+      if (!is_comment_legal(ua, rc.comment)) {
+         return false;
+      }
+   }
    if (rc.catalog_name) {
        rc.catalog = GetCatalogResWithName(rc.catalog_name);
        if (rc.catalog == NULL) {
@@ -1160,125 +2049,28 @@ static bool scan_command_line_arguments(UAContext *ua, run_ctx &rc)
    }
    Dmsg1(800, "Using catalog=%s\n", NPRT(rc.catalog_name));
 
-   if (rc.job_name) {
-      /* Find Job */
-      rc.job = GetJobResWithName(rc.job_name);
-      if (!rc.job) {
-         if (*rc.job_name != 0) {
-            ua->send_msg(_("Job \"%s\" not found\n"), rc.job_name);
-         }
-         rc.job = select_job_resource(ua);
-      } else {
-         Dmsg1(800, "Found job=%s\n", rc.job_name);
-      }
-   } else if (!rc.job) {
-      ua->send_msg(_("A job name must be specified.\n"));
-      rc.job = select_job_resource(ua);
-   }
-   if (!rc.job) {
-      return false;
-   } else if (!acl_access_ok(ua, Job_ACL, rc.job->name())) {
-      ua->error_msg( _("No authorization. Job \"%s\".\n"), rc.job->name());
+   if (!get_job(ua, rc)) {
       return false;
    }
 
-   if (rc.pool_name) {
-      rc.pool = GetPoolResWithName(rc.pool_name);
-      if (!rc.pool) {
-         if (*rc.pool_name != 0) {
-            ua->warning_msg(_("Pool \"%s\" not found.\n"), rc.pool_name);
-         }
-         rc.pool = select_pool_resource(ua);
-      }
-   } else if (!rc.pool) {
-      rc.pool = rc.job->pool;             /* use default */
-   }
-   if (!rc.pool) {
-      return false;
-   } else if (!acl_access_ok(ua, Pool_ACL, rc.pool->name())) {
-      ua->error_msg(_("No authorization. Pool \"%s\".\n"), rc.pool->name());
+   if (!get_pool(ua, rc)) {
       return false;
    }
-   Dmsg1(100, "Using pool %s\n", rc.pool->name());
 
-   if (rc.store_name) {
-      rc.store->store = GetStoreResWithName(rc.store_name);
-      pm_strcpy(rc.store->store_source, _("command line"));
-      if (!rc.store->store) {
-         if (*rc.store_name != 0) {
-            ua->warning_msg(_("Storage \"%s\" not found.\n"), rc.store_name);
-         }
-         rc.store->store = select_storage_resource(ua);
-         pm_strcpy(rc.store->store_source, _("user selection"));
-      }
-   } else if (!rc.store->store) {
-      get_job_storage(rc.store, rc.job, NULL);      /* use default */
-   }
-   if (!rc.store->store) {
-      ua->error_msg(_("No storage specified.\n"));
-      return false;
-   } else if (!acl_access_ok(ua, Storage_ACL, rc.store->store->name())) {
-      ua->error_msg(_("No authorization. Storage \"%s\".\n"),
-               rc.store->store->name());
+   if (!get_next_pool(ua, rc)) {
       return false;
    }
-   Dmsg1(800, "Using storage=%s\n", rc.store->store->name());
 
-   if (rc.client_name) {
-      rc.client = GetClientResWithName(rc.client_name);
-      if (!rc.client) {
-         if (*rc.client_name != 0) {
-            ua->warning_msg(_("Client \"%s\" not found.\n"), rc.client_name);
-         }
-         rc.client = select_client_resource(ua);
-      }
-   } else if (!rc.client) {
-      rc.client = rc.job->client;           /* use default */
-   }
-   if (!rc.client) {
-      return false;
-   } else if (!acl_access_ok(ua, Client_ACL, rc.client->name())) {
-      ua->error_msg(_("No authorization. Client \"%s\".\n"),
-               rc.client->name());
+   if (!get_storage(ua, rc)) {
       return false;
    }
-   Dmsg1(800, "Using client=%s\n", rc.client->name());
 
-   if (rc.restore_client_name) {
-      rc.client = GetClientResWithName(rc.restore_client_name);
-      if (!rc.client) {
-         if (*rc.restore_client_name != 0) {
-            ua->warning_msg(_("Restore Client \"%s\" not found.\n"), rc.restore_client_name);
-         }
-         rc.client = select_client_resource(ua);
-      }
-   } else if (!rc.client) {
-      rc.client = rc.job->client;           /* use default */
-   }
-   if (!rc.client) {
-      return false;
-   } else if (!acl_access_ok(ua, Client_ACL, rc.client->name())) {
-      ua->error_msg(_("No authorization. Client \"%s\".\n"),
-               rc.client->name());
+
+   if (!get_client(ua, rc)) {
       return false;
    }
-   Dmsg1(800, "Using restore client=%s\n", rc.client->name());
-
 
-   if (rc.fileset_name) {
-      rc.fileset = GetFileSetResWithName(rc.fileset_name);
-      if (!rc.fileset) {
-         ua->send_msg(_("FileSet \"%s\" not found.\n"), rc.fileset_name);
-         rc.fileset = select_fileset_resource(ua);
-      }
-   } else if (!rc.fileset) {
-      rc.fileset = rc.job->fileset;           /* use default */
-   }
-   if (!rc.fileset) {
-      return false;
-   } else if (!acl_access_ok(ua, FileSet_ACL, rc.fileset->name())) {
-      ua->send_msg(_("No authorization. FileSet \"%s\".\n"),
-               rc.fileset->name());
+   if (!get_fileset(ua, rc)) {
       return false;
    }