]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/dird/ua_run.c
Apply Preben 'Peppe' Guldberg <peppe@wielders.org>
[bacula/bacula] / bacula / src / dird / ua_run.c
index 52aeff5a5549abf96a1c07fc4465ecbe1555fba3..94dfb2d937016efe685a996be7dca2e58753edc0 100644 (file)
@@ -8,7 +8,7 @@
  */
 
 /*
-   Copyright (C) 2001-2004 Kern Sibbald and John Walker
+   Copyright (C) 2001-2004 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -42,6 +42,9 @@ extern struct s_kw ReplaceOptions[];
  * For Restore Jobs
  *     run <job-name> jobid=nn
  *
+ *  Returns: 0 on error
+ *          JobId if OK
+ *
  */
 int run_cmd(UAContext *ua, const char *cmd)
 {
@@ -63,7 +66,7 @@ int run_cmd(UAContext *ua, const char *cmd)
       N_("job"),                      /*  Used in a switch() */
       N_("jobid"),                    /* 1 */
       N_("client"),                   /* 2 */
-      N_("fd"), 
+      N_("fd"),
       N_("fileset"),                  /* 4 */
       N_("level"),                    /* 5 */
       N_("storage"),                  /* 6 */
@@ -101,30 +104,30 @@ int run_cmd(UAContext *ua, const char *cmd)
    catalog_name = NULL;
 
    for (i=1; i<ua->argc; i++) {
-      Dmsg2(200, "Doing arg %d = %s\n", i, ua->argk[i]);
+      Dmsg2(800, "Doing arg %d = %s\n", i, ua->argk[i]);
       kw_ok = false;
       /* Keep looking until we find a good keyword */
       for (j=0; !kw_ok && kw[j]; j++) {
         if (strcasecmp(ua->argk[i], _(kw[j])) == 0) {
            /* Note, yes and run have no value, so do not err */
-           if (!ua->argv[i] && j != YES_POS /*yes*/) {  
+           if (!ua->argv[i] && j != YES_POS /*yes*/) {
                bsendmsg(ua, _("Value missing for keyword %s\n"), ua->argk[i]);
               return 1;
            }
-            Dmsg1(200, "Got keyword=%s\n", kw[j]);
+            Dmsg1(800, "Got keyword=%s\n", kw[j]);
            switch (j) {
            case 0: /* job */
               if (job_name) {
                   bsendmsg(ua, _("Job name specified twice.\n"));
-                 return 1;
+                 return 0;
               }
               job_name = ua->argv[i];
               kw_ok = true;
               break;
            case 1: /* JobId */
               if (jid) {
-                  bsendmsg(ua, _("JobId specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("JobId specified twice.\n"));
+                 return 0;
               }
               jid = ua->argv[i];
               kw_ok = true;
@@ -132,24 +135,24 @@ int run_cmd(UAContext *ua, const char *cmd)
            case 2: /* client */
            case 3: /* fd */
               if (client_name) {
-                  bsendmsg(ua, _("Client specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Client specified twice.\n"));
+                 return 0;
               }
               client_name = ua->argv[i];
               kw_ok = true;
               break;
            case 4: /* fileset */
               if (fileset_name) {
-                  bsendmsg(ua, _("FileSet specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("FileSet specified twice.\n"));
+                 return 0;
               }
               fileset_name = ua->argv[i];
               kw_ok = true;
               break;
            case 5: /* level */
               if (level_name) {
-                  bsendmsg(ua, _("Level specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Level specified twice.\n"));
+                 return 0;
               }
               level_name = ua->argv[i];
               kw_ok = true;
@@ -157,60 +160,60 @@ int run_cmd(UAContext *ua, const char *cmd)
            case 6: /* storage */
            case 7: /* sd */
               if (store_name) {
-                  bsendmsg(ua, _("Storage specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Storage specified twice.\n"));
+                 return 0;
               }
               store_name = ua->argv[i];
               kw_ok = true;
               break;
            case 8: /* pool */
               if (pool_name) {
-                  bsendmsg(ua, _("Pool specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Pool specified twice.\n"));
+                 return 0;
               }
               pool_name = ua->argv[i];
               kw_ok = true;
               break;
            case 9: /* where */
               if (where) {
-                  bsendmsg(ua, _("Where specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Where specified twice.\n"));
+                 return 0;
               }
               where = ua->argv[i];
               kw_ok = true;
               break;
            case 10: /* bootstrap */
               if (bootstrap) {
-                  bsendmsg(ua, _("Bootstrap specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Bootstrap specified twice.\n"));
+                 return 0;
               }
               bootstrap = ua->argv[i];
               kw_ok = true;
               break;
            case 11: /* replace */
               if (replace) {
-                  bsendmsg(ua, _("Replace specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Replace specified twice.\n"));
+                 return 0;
               }
               replace = ua->argv[i];
               kw_ok = true;
               break;
            case 12: /* When */
               if (when) {
-                  bsendmsg(ua, _("When specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("When specified twice.\n"));
+                 return 0;
               }
               when = ua->argv[i];
               kw_ok = true;
               break;
            case 13:  /* Priority */
               if (Priority) {
-                  bsendmsg(ua, _("Priority specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Priority specified twice.\n"));
+                 return 0;
               }
               Priority = atoi(ua->argv[i]);
               if (Priority <= 0) {
-                  bsendmsg(ua, _("Priority must be positive nonzero setting it to 10.\n"));
+                 bsendmsg(ua, _("Priority must be positive nonzero setting it to 10.\n"));
                  Priority = 10;
               }
               kw_ok = true;
@@ -220,8 +223,8 @@ int run_cmd(UAContext *ua, const char *cmd)
               break;
            case 15: /* Verify Job */
               if (verify_job_name) {
-                  bsendmsg(ua, _("Verify Job specified twice.\n"));
-                 return 1;
+                 bsendmsg(ua, _("Verify Job specified twice.\n"));
+                 return 0;
               }
               verify_job_name = ua->argv[i];
               kw_ok = true;
@@ -245,60 +248,61 @@ int run_cmd(UAContext *ua, const char *cmd)
        * End of keyword for loop -- if not found, we got a bogus keyword
        */
       if (!kw_ok) {
-         Dmsg1(200, "%s not found\n", ua->argk[i]);
+        Dmsg1(200, "%s not found\n", ua->argk[i]);
         /*
          * Special case for Job Name, it can be the first
          * keyword that has no value.
          */
         if (!job_name && !ua->argv[i]) {
            job_name = ua->argk[i];   /* use keyword as job name */
-            Dmsg1(200, "Set jobname=%s\n", job_name);
+           Dmsg1(200, "Set jobname=%s\n", job_name);
         } else {
-            bsendmsg(ua, _("Invalid keyword: %s\n"), ua->argk[i]);
-           return 1;
+           bsendmsg(ua, _("Invalid keyword: %s\n"), ua->argk[i]);
+           return 0;
         }
       }
    } /* end argc loop */
             
-   Dmsg0(200, "Done scan.\n");
+   Dmsg0(800, "Done scan.\n");
 
    CAT *catalog = NULL;
    if (catalog_name != NULL) {
        catalog = (CAT *)GetResWithName(R_CATALOG, catalog_name);
        if (catalog == NULL) {
-            bsendmsg(ua, _("Catalog \"%s\" not found\n"), catalog_name);
-          return 1;
+           bsendmsg(ua, _("Catalog \"%s\" not found\n"), catalog_name);
+          return 0;
        }
    }
+   Dmsg1(200, "Using catalog=%s\n", catalog_name);
 
    if (job_name) {
       /* Find Job */
       job = (JOB *)GetResWithName(R_JOB, job_name);
       if (!job) {
         if (*job_name != 0) {
-            bsendmsg(ua, _("Job \"%s\" not found\n"), job_name);
+           bsendmsg(ua, _("Job \"%s\" not found\n"), job_name);
         }
         job = select_job_resource(ua);
       } else {
-         Dmsg1(200, "Found job=%s\n", job_name);
+        Dmsg1(200, "Found job=%s\n", job_name);
       }
    } else {
       bsendmsg(ua, _("A job name must be specified.\n"));
       job = select_job_resource(ua);
    }
    if (!job) {
-      return 1;
+      return 0;
    } else if (!acl_access_ok(ua, Job_ACL, job->hdr.name)) {
       bsendmsg(ua, _("No authorization. Job \"%s\".\n"),
         job->hdr.name);
-      return 1;
+      return 0;
    }
 
    if (store_name) {
       store = (STORE *)GetResWithName(R_STORAGE, store_name);
       if (!store) {
         if (*store_name != 0) {
-            bsendmsg(ua, _("Storage \"%s\" not found.\n"), store_name);
+           bsendmsg(ua, _("Storage \"%s\" not found.\n"), store_name);
         }
         store = select_storage_resource(ua);
       }
@@ -310,14 +314,15 @@ int run_cmd(UAContext *ua, const char *cmd)
    } else if (!acl_access_ok(ua, Storage_ACL, store->hdr.name)) {
       bsendmsg(ua, _("No authorization. Storage \"%s\".\n"),
               store->hdr.name);
-      return 1;
+      return 0;
    }
+   Dmsg1(200, "Using storage=%s\n", store->hdr.name);
 
    if (pool_name) {
       pool = (POOL *)GetResWithName(R_POOL, pool_name);
       if (!pool) {
         if (*pool_name != 0) {
-            bsendmsg(ua, _("Pool \"%s\" not found.\n"), pool_name);
+           bsendmsg(ua, _("Pool \"%s\" not found.\n"), pool_name);
         }
         pool = select_pool_resource(ua);
       }
@@ -325,18 +330,19 @@ int run_cmd(UAContext *ua, const char *cmd)
       pool = job->pool;            /* use default */
    }
    if (!pool) {
-      return 1;
+      return 0;
    } else if (!acl_access_ok(ua, Pool_ACL, store->hdr.name)) {
       bsendmsg(ua, _("No authorization. Pool \"%s\".\n"),
               pool->hdr.name);
-      return 1;
+      return 0;
    }
+   Dmsg1(200, "Using pool\n", pool->hdr.name);
 
    if (client_name) {
       client = (CLIENT *)GetResWithName(R_CLIENT, client_name);
       if (!client) {
         if (*client_name != 0) {
-            bsendmsg(ua, _("Client \"%s\" not found.\n"), client_name);
+           bsendmsg(ua, _("Client \"%s\" not found.\n"), client_name);
         }
         client = select_client_resource(ua);
       }
@@ -344,34 +350,35 @@ int run_cmd(UAContext *ua, const char *cmd)
       client = job->client;          /* use default */
    }
    if (!client) {
-      return 1;
+      return 0;
    } else if (!acl_access_ok(ua, Client_ACL, store->hdr.name)) {
       bsendmsg(ua, _("No authorization. Client \"%s\".\n"),
               client->hdr.name);
-      return 1;
+      return 0;
    }
+   Dmsg1(200, "Using client=%s\n", client->hdr.name);
 
    if (fileset_name) {
       fileset = (FILESET *)GetResWithName(R_FILESET, fileset_name);
       if (!fileset) {
-         bsendmsg(ua, _("FileSet \"%s\" not found.\n"), fileset_name);
+        bsendmsg(ua, _("FileSet \"%s\" not found.\n"), fileset_name);
         fileset = select_fileset_resource(ua);
       }
    } else {
       fileset = job->fileset;          /* use default */
    }
    if (!fileset) {
-      return 1;
+      return 0;
    } else if (!acl_access_ok(ua, FileSet_ACL, store->hdr.name)) {
       bsendmsg(ua, _("No authorization. FileSet \"%s\".\n"),
               fileset->hdr.name);
-      return 1;
+      return 0;
    }
 
    if (verify_job_name) {
       verify_job = (JOB *)GetResWithName(R_JOB, verify_job_name);
       if (!verify_job) {
-         bsendmsg(ua, _("Verify Job \"%s\" not found.\n"), verify_job_name);
+        bsendmsg(ua, _("Verify Job \"%s\" not found.\n"), verify_job_name);
         verify_job = select_job_resource(ua);
       }
    } else {
@@ -386,7 +393,7 @@ int run_cmd(UAContext *ua, const char *cmd)
    set_jcr_defaults(jcr, job);
 
    jcr->verify_job = verify_job;
-   jcr->store = store;
+   set_storage(jcr, store);
    jcr->client = client;
    jcr->fileset = fileset;
    jcr->pool = pool;
@@ -404,11 +411,11 @@ int run_cmd(UAContext *ua, const char *cmd)
    if (when) {
       jcr->sched_time = str_to_utime(when);
       if (jcr->sched_time == 0) {
-         bsendmsg(ua, _("Invalid time, using current time.\n"));
+        bsendmsg(ua, _("Invalid time, using current time.\n"));
         jcr->sched_time = time(NULL);
       }
    }
-        
+
    if (bootstrap) {
       if (jcr->RestoreBootstrap) {
         free(jcr->RestoreBootstrap);
@@ -424,7 +431,7 @@ int run_cmd(UAContext *ua, const char *cmd)
         }
       }
       if (!jcr->replace) {
-         bsendmsg(ua, _("Invalid replace option: %s\n"), replace);
+        bsendmsg(ua, _("Invalid replace option: %s\n"), replace);
         goto bail_out;
       }
    } else if (job->replace) {
@@ -436,7 +443,7 @@ int run_cmd(UAContext *ua, const char *cmd)
    if (Priority) {
       jcr->JobPriority = Priority;
    }
-      
+
    if (find_arg(ua, _("fdcalled")) > 0) {
       jcr->file_bsock = dup_bsock(ua->UA_sock);
       ua->quit = true;
@@ -451,7 +458,7 @@ try_again:
    }
    if (level_name) {
       if (!get_level_from_name(jcr, level_name)) {
-         bsendmsg(ua, _("Level %s not valid.\n"), level_name);
+        bsendmsg(ua, _("Level %s not valid.\n"), level_name);
         goto bail_out;
       }
    }
@@ -460,11 +467,11 @@ try_again:
    }
 
    /* Run without prompting? */
-   if (find_arg(ua, _("yes")) > 0) {
+   if (ua->batch || find_arg(ua, _("yes")) > 0) {
       goto start_job;
    }
 
-   /*  
+   /*
     * Prompt User to see if all run job parameters are correct, and
     *  allow him to modify them.
     */
@@ -473,41 +480,41 @@ try_again:
       char ec1[30];
       char dt[MAX_TIME_LENGTH];
    case JT_ADMIN:
-         bsendmsg(ua, _("Run %s job\n\
-JobName:  %s\n\
-FileSet:  %s\n\
-Client:   %s\n\
-Storage:  %s\n\
-When:     %s\n\
-Priority: %d\n"),
-                 _("Admin"),
+        bsendmsg(ua, _("Run %s job\n"
+"JobName:  %s\n"
+"FileSet:  %s\n"
+"Client:   %s\n"
+"Storage:  %s\n"
+"When:     %s\n"
+"Priority: %d\n"),
+                _("Admin"),
                 job->hdr.name,
                 jcr->fileset->hdr.name,
                 NPRT(jcr->client->hdr.name),
-                NPRT(jcr->store->hdr.name), 
-                bstrutime(dt, sizeof(dt), jcr->sched_time), 
+                NPRT(jcr->store->hdr.name),
+                bstrutime(dt, sizeof(dt), jcr->sched_time),
                 jcr->JobPriority);
       jcr->JobLevel = L_FULL;
       break;
    case JT_BACKUP:
    case JT_VERIFY:
       if (jcr->JobType == JT_BACKUP) {
-         bsendmsg(ua, _("Run %s job\n\
-JobName:  %s\n\
-FileSet:  %s\n\
-Level:    %s\n\
-Client:   %s\n\
-Storage:  %s\n\
-Pool:     %s\n\
-When:     %s\n\
-Priority: %d\n"),
-                 _("Backup"),
+        bsendmsg(ua, _("Run %s job\n"
+"JobName:  %s\n"
+"FileSet:  %s\n"
+"Level:    %s\n"
+"Client:   %s\n"
+"Storage:  %s\n"
+"Pool:     %s\n"
+"When:     %s\n"
+"Priority: %d\n"),
+                _("Backup"),
                 job->hdr.name,
                 jcr->fileset->hdr.name,
                 level_to_str(jcr->JobLevel),
                 jcr->client->hdr.name,
                 jcr->store->hdr.name,
-                NPRT(jcr->pool->hdr.name), 
+                NPRT(jcr->pool->hdr.name),
                 bstrutime(dt, sizeof(dt), jcr->sched_time),
                 jcr->JobPriority);
       } else { /* JT_VERIFY */
@@ -515,26 +522,26 @@ Priority: %d\n"),
         if (jcr->verify_job) {
            Name = jcr->verify_job->hdr.name;
         } else {
-            Name = "";
+           Name = "";
         }
-         bsendmsg(ua, _("Run %s job\n\
-JobName:     %s\n\
-FileSet:     %s\n\
-Level:       %s\n\
-Client:      %s\n\
-Storage:     %s\n\
-Pool:        %s\n\
-Verify Job:  %s\n\
-When:        %s\n\
-Priority:    %d\n"),
-              _("Verify"),
+        bsendmsg(ua, _("Run %s job\n"
+"JobName:     %s\n"
+"FileSet:     %s\n"
+"Level:       %s\n"
+"Client:      %s\n"
+"Storage:     %s\n"
+"Pool:        %s\n"
+"Verify Job:  %s\n"
+"When:        %s\n"
+"Priority:    %d\n"),
+             _("Verify"),
              job->hdr.name,
              jcr->fileset->hdr.name,
              level_to_str(jcr->JobLevel),
              jcr->client->hdr.name,
              jcr->store->hdr.name,
-             NPRT(jcr->pool->hdr.name), 
-             Name,            
+             NPRT(jcr->pool->hdr.name),
+             Name,
              bstrutime(dt, sizeof(dt), jcr->sched_time),
              jcr->JobPriority);
       }
@@ -544,55 +551,55 @@ Priority:    %d\n"),
         if (jid) {
            jcr->RestoreJobId = atoi(jid);
         } else {
-            if (!get_pint(ua, _("Please enter a JobId for restore: "))) {
+           if (!get_pint(ua, _("Please enter a JobId for restore: "))) {
               goto bail_out;
-           }  
+           }
            jcr->RestoreJobId = ua->pint32_val;
         }
       }
       jcr->JobLevel = L_FULL;     /* default level */
       Dmsg1(20, "JobId to restore=%d\n", jcr->RestoreJobId);
       if (jcr->RestoreJobId == 0) {
-         bsendmsg(ua, _("Run Restore job\n"
-                        "JobName:    %s\n"
-                        "Bootstrap:  %s\n"
-                        "Where:      %s\n"
-                        "Replace:    %s\n"
-                        "FileSet:    %s\n"
-                        "Client:     %s\n"
-                        "Storage:    %s\n"
-                        "When:       %s\n"
-                        "Catalog:    %s\n"
-                        "Priority:   %d\n"),
+        bsendmsg(ua, _("Run Restore job\n"
+                       "JobName:    %s\n"
+                       "Bootstrap:  %s\n"
+                       "Where:      %s\n"
+                       "Replace:    %s\n"
+                       "FileSet:    %s\n"
+                       "Client:     %s\n"
+                       "Storage:    %s\n"
+                       "When:       %s\n"
+                       "Catalog:    %s\n"
+                       "Priority:   %d\n"),
              job->hdr.name,
              NPRT(jcr->RestoreBootstrap),
              jcr->where?jcr->where:NPRT(job->RestoreWhere),
              replace,
              jcr->fileset->hdr.name,
              jcr->client->hdr.name,
-             jcr->store->hdr.name, 
+             jcr->store->hdr.name,
              bstrutime(dt, sizeof(dt), jcr->sched_time),
              jcr->catalog->hdr.name,
              jcr->JobPriority);
       } else {
-         bsendmsg(ua, _("Run Restore job\n"
-                       "JobName:    %s\n"
-                       "Bootstrap:  %s\n"
-                       "Where:      %s\n"
-                       "Replace:    %s\n"
-                       "Client:     %s\n"
-                       "Storage:    %s\n"
-                       "JobId:      %s\n"
-                       "When:       %s\n"
-                       "Catalog:    %s\n"
-                       "Priority:   %d\n"),
+        bsendmsg(ua, _("Run Restore job\n"
+                      "JobName:    %s\n"
+                      "Bootstrap:  %s\n"
+                      "Where:      %s\n"
+                      "Replace:    %s\n"
+                      "Client:     %s\n"
+                      "Storage:    %s\n"
+                      "JobId:      %s\n"
+                      "When:       %s\n"
+                      "Catalog:    %s\n"
+                      "Priority:   %d\n"),
              job->hdr.name,
              NPRT(jcr->RestoreBootstrap),
              jcr->where?jcr->where:NPRT(job->RestoreWhere),
              replace,
              jcr->client->hdr.name,
-             jcr->store->hdr.name, 
-              jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1), 
+             jcr->store->hdr.name,
+             jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1),
              bstrutime(dt, sizeof(dt), jcr->sched_time),
              jcr->catalog->hdr.name,
              jcr->JobPriority);
@@ -626,27 +633,27 @@ Priority:    %d\n"),
       add_prompt(ua, _("Priority"));         /* 6 */
       if (jcr->JobType == JT_BACKUP ||
          jcr->JobType == JT_VERIFY) {
-         add_prompt(ua, _("Pool"));          /* 7 */
+        add_prompt(ua, _("Pool"));          /* 7 */
         if (jcr->JobType == JT_VERIFY) {
-            add_prompt(ua, _("Verify Job"));  /* 8 */
+           add_prompt(ua, _("Verify Job"));  /* 8 */
         }
       } else if (jcr->JobType == JT_RESTORE) {
-         add_prompt(ua, _("Bootstrap"));     /* 7 */
-         add_prompt(ua, _("Where"));         /* 8 */
-         add_prompt(ua, _("Replace"));       /* 9 */
-         add_prompt(ua, _("JobId"));         /* 10 */
+        add_prompt(ua, _("Bootstrap"));     /* 7 */
+        add_prompt(ua, _("Where"));         /* 8 */
+        add_prompt(ua, _("Replace"));       /* 9 */
+        add_prompt(ua, _("JobId"));         /* 10 */
       }
       switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
       case 0:
         /* Level */
         if (jcr->JobType == JT_BACKUP) {
-            start_prompt(ua, _("Levels:\n"));
-            add_prompt(ua, _("Base"));
-            add_prompt(ua, _("Full"));
-            add_prompt(ua, _("Incremental"));
-            add_prompt(ua, _("Differential"));
-            add_prompt(ua, _("Since"));
-            switch (do_prompt(ua, "", _("Select level"), NULL, 0)) {
+           start_prompt(ua, _("Levels:\n"));
+           add_prompt(ua, _("Base"));
+           add_prompt(ua, _("Full"));
+           add_prompt(ua, _("Incremental"));
+           add_prompt(ua, _("Differential"));
+           add_prompt(ua, _("Since"));
+           switch (do_prompt(ua, "", _("Select level"), NULL, 0)) {
            case 0:
               jcr->JobLevel = L_BASE;
               break;
@@ -667,13 +674,13 @@ Priority:    %d\n"),
            }
            goto try_again;
         } else if (jcr->JobType == JT_VERIFY) {
-            start_prompt(ua, _("Levels:\n"));
-            add_prompt(ua, _("Initialize Catalog"));
-            add_prompt(ua, _("Verify Catalog"));
-            add_prompt(ua, _("Verify Volume to Catalog"));
-            add_prompt(ua, _("Verify Disk to Catalog"));
-            add_prompt(ua, _("Verify Volume Data (not yet implemented)"));
-            switch (do_prompt(ua, "",  _("Select level"), NULL, 0)) {
+           start_prompt(ua, _("Levels:\n"));
+           add_prompt(ua, _("Initialize Catalog"));
+           add_prompt(ua, _("Verify Catalog"));
+           add_prompt(ua, _("Verify Volume to Catalog"));
+           add_prompt(ua, _("Verify Disk to Catalog"));
+           add_prompt(ua, _("Verify Volume Data (not yet implemented)"));
+           switch (do_prompt(ua, "",  _("Select level"), NULL, 0)) {
            case 0:
               jcr->JobLevel = L_VERIFY_INIT;
               break;
@@ -694,14 +701,14 @@ Priority:    %d\n"),
            }
            goto try_again;
         } else {
-            bsendmsg(ua, _("Level not appropriate for this Job. Cannot be changed.\n"));
+           bsendmsg(ua, _("Level not appropriate for this Job. Cannot be changed.\n"));
         }
         goto try_again;
       case 1:
         /* Storage */
         store = select_storage_resource(ua);
         if (store) {
-           jcr->store = store;
+           set_storage(jcr, store);
            goto try_again;
         }
         break;
@@ -720,7 +727,7 @@ Priority:    %d\n"),
         if (fileset) {
            jcr->fileset = fileset;
            goto try_again;
-        }      
+        }
         break;
       case 4:
         /* Client */
@@ -732,7 +739,7 @@ Priority:    %d\n"),
         break;
       case 5:
         /* When */
-         if (!get_cmd(ua, _("Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now): "))) {
+        if (!get_cmd(ua, _("Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now): "))) {
            break;
         }
         if (ua->cmd[0] == 0) {
@@ -740,18 +747,18 @@ Priority:    %d\n"),
         } else {
            jcr->sched_time = str_to_utime(ua->cmd);
            if (jcr->sched_time == 0) {
-               bsendmsg(ua, _("Invalid time, using current time.\n"));
+              bsendmsg(ua, _("Invalid time, using current time.\n"));
               jcr->sched_time = time(NULL);
            }
         }
         goto try_again;
       case 6:
         /* Priority */
-         if (!get_pint(ua, _("Enter new Priority: "))) {
+        if (!get_pint(ua, _("Enter new Priority: "))) {
            break;
         }
         if (ua->pint32_val == 0) {
-            bsendmsg(ua, _("Priority must be a positive integer.\n"));
+           bsendmsg(ua, _("Priority must be a positive integer.\n"));
         } else {
            jcr->JobPriority = ua->pint32_val;
         }
@@ -769,7 +776,7 @@ Priority:    %d\n"),
         }
 
         /* Bootstrap */
-         if (!get_cmd(ua, _("Please enter the Bootstrap file name: "))) {
+        if (!get_cmd(ua, _("Please enter the Bootstrap file name: "))) {
            break;
         }
         if (jcr->RestoreBootstrap) {
@@ -778,9 +785,9 @@ Priority:    %d\n"),
         }
         if (ua->cmd[0] != 0) {
            jcr->RestoreBootstrap = bstrdup(ua->cmd);
-            fd = fopen(jcr->RestoreBootstrap, "r");
+           fd = fopen(jcr->RestoreBootstrap, "r");
            if (!fd) {
-               bsendmsg(ua, _("Warning cannot open %s: ERR=%s\n"),
+              bsendmsg(ua, _("Warning cannot open %s: ERR=%s\n"),
                  jcr->RestoreBootstrap, strerror(errno));
               free(jcr->RestoreBootstrap);
               jcr->RestoreBootstrap = NULL;
@@ -799,25 +806,25 @@ Priority:    %d\n"),
            goto try_again;
         }
         /* Where */
-         if (!get_cmd(ua, _("Please enter path prefix for restore (/ for none): "))) {
+        if (!get_cmd(ua, _("Please enter path prefix for restore (/ for none): "))) {
            break;
         }
         if (jcr->where) {
            free(jcr->where);
            jcr->where = NULL;
         }
-         if (ua->cmd[0] == '/' && ua->cmd[1] == 0) {
+        if (ua->cmd[0] == '/' && ua->cmd[1] == 0) {
            ua->cmd[0] = 0;
         }
         jcr->where = bstrdup(ua->cmd);
         goto try_again;
       case 9:
         /* Replace */
-         start_prompt(ua, _("Replace:\n"));
+        start_prompt(ua, _("Replace:\n"));
         for (i=0; ReplaceOptions[i].name; i++) {
            add_prompt(ua, ReplaceOptions[i].name);
         }
-         opt = do_prompt(ua, "", _("Select replace option"), NULL, 0);
+        opt = do_prompt(ua, "", _("Select replace option"), NULL, 0);
         if (opt >=  0) {
            jcr->replace = ReplaceOptions[opt].token;
         }
@@ -827,10 +834,10 @@ Priority:    %d\n"),
         jid = NULL;                  /* force reprompt */
         jcr->RestoreJobId = 0;
         if (jcr->RestoreBootstrap) {
-            bsendmsg(ua, _("You must set the bootstrap file to NULL to be able to specify a JobId.\n"));
+           bsendmsg(ua, _("You must set the bootstrap file to NULL to be able to specify a JobId.\n"));
         }
         goto try_again;
-      default: 
+      default:
         goto try_again;
       }
       goto bail_out;
@@ -843,11 +850,11 @@ start_job:
       JobId = run_job(jcr);
       free_jcr(jcr);                 /* release jcr */
       if (JobId == 0) {
-         bsendmsg(ua, _("Job failed.\n"));
+        bsendmsg(ua, _("Job failed.\n"));
       } else {
-         bsendmsg(ua, _("Job started. JobId=%u\n"), JobId);
+        bsendmsg(ua, _("Job started. JobId=%u\n"), JobId);
       }
-      return 1;
+      return JobId;
    }
 
 bail_out: