X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_cmds.c;h=118e91c1d0b1c1e0d64316fc9e745fc0d6d69e93;hb=fc92e04201e428fbf206dbd01518a02490ba50f9;hp=0c479ccd7c5be46b09e8b9102c92549ce5e86c0b;hpb=ea7a3095983e859272a7e8a90fd5fc7af6547c75;p=bacula%2Fbacula

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 0c479ccd7c..29feea937e 100644
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -6,24 +6,18 @@
  *
  *   Version $Id$
  */
-
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2006 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
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -31,143 +25,174 @@
 #include "dird.h"
 
 /* Imported subroutines */
-extern void run_job(JCR *jcr);
 
 /* Imported variables */
 extern int r_first;
 extern int r_last;
 extern struct s_res resources[];
 extern char my_name[];
-#ifndef USE_SEMAPHORE 
-extern workq_t job_wq;		      /* work queue */
-#endif
+extern jobq_t job_queue;              /* job queue */
 
-extern char *list_pool;
 
 /* Imported functions */
-extern int statuscmd(UAContext *ua, char *cmd);
-extern int listcmd(UAContext *ua, char *cmd);
-extern int llistcmd(UAContext *ua, char *cmd);
-extern int showcmd(UAContext *ua, char *cmd);
-extern int messagescmd(UAContext *ua, char *cmd);
-extern int autodisplaycmd(UAContext *ua, char *cmd);
-extern int sqlquerycmd(UAContext *ua, char *cmd);
-extern int querycmd(UAContext *ua, char *cmd);
-extern int runcmd(UAContext *ua, char *cmd);
-extern int retentioncmd(UAContext *ua, char *cmd);
-extern int prunecmd(UAContext *ua, char *cmd);
-extern int purgecmd(UAContext *ua, char *cmd);
-extern int restorecmd(UAContext *ua, char *cmd);
-extern int labelcmd(UAContext *ua, char *cmd);
-extern int relabelcmd(UAContext *ua, char *cmd);
-extern int update_slots(UAContext *ua);  /* ua_label.c */
+extern int status_cmd(UAContext *ua, const char *cmd);
+extern int list_cmd(UAContext *ua, const char *cmd);
+extern int llist_cmd(UAContext *ua, const char *cmd);
+extern int show_cmd(UAContext *ua, const char *cmd);
+extern int messagescmd(UAContext *ua, const char *cmd);
+extern int autodisplay_cmd(UAContext *ua, const char *cmd);
+extern int gui_cmd(UAContext *ua, const char *cmd);
+extern int sqlquerycmd(UAContext *ua, const char *cmd);
+extern int querycmd(UAContext *ua, const char *cmd);
+extern int retentioncmd(UAContext *ua, const char *cmd);
+extern int prunecmd(UAContext *ua, const char *cmd);
+extern int purgecmd(UAContext *ua, const char *cmd);
+extern int restore_cmd(UAContext *ua, const char *cmd);
+extern int label_cmd(UAContext *ua, const char *cmd);
+extern int relabel_cmd(UAContext *ua, const char *cmd);
+extern int update_cmd(UAContext *ua, const char *cmd);
 
 /* Forward referenced functions */
-static int addcmd(UAContext *ua, char *cmd),  createcmd(UAContext *ua, char *cmd), cancelcmd(UAContext *ua, char *cmd);
-static int setdebugcmd(UAContext *ua, char *cmd);
-static int helpcmd(UAContext *ua, char *cmd);
-static int deletecmd(UAContext *ua, char *cmd);
-static int usecmd(UAContext *ua, char *cmd),  unmountcmd(UAContext *ua, char *cmd);
-static int versioncmd(UAContext *ua, char *cmd), automountcmd(UAContext *ua, char *cmd);
-static int timecmd(UAContext *ua, char *cmd);
-static int update_volume(UAContext *ua);
-static int update_pool(UAContext *ua);
+static int add_cmd(UAContext *ua, const char *cmd);
+static int create_cmd(UAContext *ua, const char *cmd);
+static int cancel_cmd(UAContext *ua, const char *cmd);
+static int enable_cmd(UAContext *ua, const char *cmd);
+static int disable_cmd(UAContext *ua, const char *cmd);
+static int setdebug_cmd(UAContext *ua, const char *cmd);
+static int trace_cmd(UAContext *ua, const char *cmd);
+static int var_cmd(UAContext *ua, const char *cmd);
+static int estimate_cmd(UAContext *ua, const char *cmd);
+static int help_cmd(UAContext *ua, const char *cmd);
+static int delete_cmd(UAContext *ua, const char *cmd);
+static int use_cmd(UAContext *ua, const char *cmd);
+static int unmount_cmd(UAContext *ua, const char *cmd);
+static int version_cmd(UAContext *ua, const char *cmd);
+static int automount_cmd(UAContext *ua, const char *cmd);
+static int time_cmd(UAContext *ua, const char *cmd);
+static int reload_cmd(UAContext *ua, const char *cmd);
 static int delete_volume(UAContext *ua);
 static int delete_pool(UAContext *ua);
-static int mountcmd(UAContext *ua, char *cmd);
-static int updatecmd(UAContext *ua, char *cmd);
+static void delete_job(UAContext *ua);
+static int mount_cmd(UAContext *ua, const char *cmd);
+static int release_cmd(UAContext *ua, const char *cmd);
+static int wait_cmd(UAContext *ua, const char *cmd);
+static int setip_cmd(UAContext *ua, const char *cmd);
+static int python_cmd(UAContext *ua, const char *cmd);
+static void do_job_delete(UAContext *ua, JobId_t JobId);
+static void delete_job_id_range(UAContext *ua, char *tok);
 
-int quitcmd(UAContext *ua, char *cmd);
+int qhelp_cmd(UAContext *ua, const char *cmd);
+int quit_cmd(UAContext *ua, const char *cmd);
 
 
-struct cmdstruct { char *key; int (*func)(UAContext *ua, char *cmd); char *help; }; 
+struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; };
 static struct cmdstruct commands[] = {
- { N_("add"),        addcmd,       _("add media to a pool")},
- { N_("autodisplay"), autodisplaycmd, _("autodisplay [on/off] -- console messages")},
- { N_("automount"),   automountcmd,   _("automount [on/off] -- after label")},
- { N_("cancel"),     cancelcmd,    _("cancel job=nnn -- cancel a job")},
- { N_("create"),     createcmd,    _("create DB Pool from resource")},  
- { N_("delete"),     deletecmd,    _("delete [pool=<pool-name> | media volume=<volume-name>]")},    
- { N_("help"),       helpcmd,      _("print this command")},
- { N_("label"),      labelcmd,     _("label a tape")},
- { N_("relabel"),    relabelcmd,   _("relabel a tape")},
- { N_("list"),       listcmd,      _("list [pools | jobs | jobtotals | media <pool> | files job=<nn>]; from catalog")},
- { N_("llist"),      llistcmd,     _("full or long list like list command")},
- { N_("messages"),   messagescmd,  _("messages")},
- { N_("mount"),      mountcmd,     _("mount <storage-name>")},
- { N_("restore"),    restorecmd,   _("restore files")},
- { N_("prune"),      prunecmd,     _("prune expired records from catalog")},
- { N_("purge"),      purgecmd,     _("purge records from catalog")},
- { N_("run"),        runcmd,       _("run <job-name>")},
- { N_("setdebug"),   setdebugcmd,  _("sets debug level")},
- { N_("show"),       showcmd,      _("show (resource records) [jobs | pools | ... | all]")},
- { N_("sqlquery"),   sqlquerycmd,  _("use SQL to query catalog")}, 
- { N_("status"),     statuscmd,    _("status [storage | client]=<name>")},
- { N_("unmount"),    unmountcmd,   _("unmount <storage-name>")},
- { N_("update"),     updatecmd,    _("update Volume or Pool")},
- { N_("use"),        usecmd,       _("use catalog xxx")},
- { N_("version"),    versioncmd,   _("print Director version")},
- { N_("quit"),       quitcmd,      _("quit")},
- { N_("query"),      querycmd,     _("query catalog")},
- { N_("time"),       timecmd,      _("print current time")},
- { N_("exit"),       quitcmd,      _("exit = quit")},
-	     };
+ { NT_("add"),        add_cmd,         _("add media to a pool")},
+ { NT_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages")},
+ { NT_("automount"),   automount_cmd,  _("automount [on|off] -- after label")},
+ { NT_("cancel"),     cancel_cmd,    _("cancel [<jobid=nnn> | <job=name>] -- cancel a job")},
+ { NT_("create"),     create_cmd,    _("create DB Pool from resource")},
+ { NT_("delete"),     delete_cmd,    _("delete [pool=<pool-name> | media volume=<volume-name>]")},
+ { NT_("disable"),    disable_cmd,   _("disable <job=name> -- disable a job")},
+ { NT_("enable"),     enable_cmd,    _("enable <job=name> -- enable a job")},
+ { NT_("estimate"),   estimate_cmd,  _("performs FileSet estimate, listing gives full listing")},
+ { NT_("exit"),       quit_cmd,      _("exit = quit")},
+ { NT_("gui"),        gui_cmd,       _("gui [on|off] -- non-interactive gui mode")},
+ { NT_("help"),       help_cmd,      _("print this command")},
+ { NT_("list"),       list_cmd,      _("list [pools | jobs | jobtotals | media <pool=pool-name> | files <jobid=nn>]; from catalog")},
+ { NT_("label"),      label_cmd,     _("label a tape")},
+ { NT_("llist"),      llist_cmd,     _("full or long list like list command")},
+ { NT_("messages"),   messagescmd,   _("messages")},
+ { NT_("mount"),      mount_cmd,     _("mount <storage-name>")},
+ { NT_("prune"),      prunecmd,      _("prune expired records from catalog")},
+ { NT_("purge"),      purgecmd,      _("purge records from catalog")},
+ { NT_("python"),     python_cmd,    _("python control commands")},
+ { NT_("quit"),       quit_cmd,      _("quit")},
+ { NT_("query"),      querycmd,      _("query catalog")},
+ { NT_("restore"),    restore_cmd,   _("restore files")},
+ { NT_("relabel"),    relabel_cmd,   _("relabel a tape")},
+ { NT_("release"),    release_cmd,   _("release <storage-name>")},
+ { NT_("reload"),     reload_cmd,    _("reload conf file")},
+ { NT_("run"),        run_cmd,       _("run <job-name>")},
+ { NT_("status"),     status_cmd,    _("status [storage | client]=<name>")},
+ { NT_("setdebug"),   setdebug_cmd,  _("sets debug level")},
+ { NT_("setip"),      setip_cmd,     _("sets new client address -- if authorized")},
+ { NT_("show"),       show_cmd,      _("show (resource records) [jobs | pools | ... | all]")},
+ { NT_("sqlquery"),   sqlquerycmd,   _("use SQL to query catalog")},
+ { NT_("time"),       time_cmd,      _("print current time")},
+ { NT_("trace"),      trace_cmd,     _("turn on/off trace to file")},
+ { NT_("unmount"),    unmount_cmd,   _("unmount <storage-name>")},
+ { NT_("umount"),     unmount_cmd,   _("umount <storage-name> for old-time Unix guys")},
+ { NT_("update"),     update_cmd,    _("update Volume, Pool or slots")},
+ { NT_("use"),        use_cmd,       _("use catalog xxx")},
+ { NT_("var"),        var_cmd,       _("does variable expansion")},
+ { NT_("version"),    version_cmd,   _("print Director version")},
+ { NT_("wait"),       wait_cmd,      _("wait until no jobs are running [<jobname=name> | <jobid=nnn> | <ujobid=complete_name>]")},
+             };
 #define comsize (sizeof(commands)/sizeof(struct cmdstruct))
 
 /*
  * Execute a command from the UA
  */
-int do_a_command(UAContext *ua, char *cmd)
+int do_a_command(UAContext *ua, const char *cmd)
 {
    unsigned int i;
    int len, stat;
-   int found;
+   bool found = false;
 
-   found = 0;
    stat = 1;
 
-   Dmsg1(120, "Command: %s\n", ua->UA_sock->msg);
+   Dmsg1(900, "Command: %s\n", ua->UA_sock->msg);
    if (ua->argc == 0) {
       return 1;
    }
 
+   while (ua->jcr->storage->size()) {
+      ua->jcr->storage->remove(0);
+   }
+
    len = strlen(ua->argk[0]);
-   for (i=0; i<comsize; i++)	   /* search for command */
-      if (strncasecmp(ua->argk[0],  _(commands[i].key), len) == 0) {
-	 stat = (*commands[i].func)(ua, cmd);	/* go execute command */
-	 found = 1;
-	 break;
+   for (i=0; i<comsize; i++) {     /* search for command */
+      if (strncasecmp(ua->argk[0],  commands[i].key, len) == 0) {
+         /* Check if command permitted, but "quit" is always OK */
+         if (strcmp(ua->argk[0], NT_("quit")) != 0 &&
+             !acl_access_ok(ua, Command_ACL, ua->argk[0], len)) {
+            break;
+         }
+         stat = (*commands[i].func)(ua, cmd);   /* go execute command */
+         found = true;
+         break;
       }
+   }
    if (!found) {
-      strcat(ua->UA_sock->msg, _(": is an illegal command\n"));
-      ua->UA_sock->msglen = strlen(ua->UA_sock->msg);
-      bnet_send(ua->UA_sock);
+      bnet_fsend(ua->UA_sock, _("%s: is an illegal command.\n"), ua->argk[0]);
    }
    return stat;
 }
 
 /*
  * This is a common routine used to stuff the Pool DB record defaults
- *   into the Media DB record just before creating a media (Volume) 
+ *   into the Media DB record just before creating a media (Volume)
  *   record.
  */
 void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr)
 {
    mr->PoolId = pr->PoolId;
-   strcpy(mr->VolStatus, "Append");
+   bstrncpy(mr->VolStatus, NT_("Append"), sizeof(mr->VolStatus));
    mr->Recycle = pr->Recycle;
    mr->VolRetention = pr->VolRetention;
    mr->VolUseDuration = pr->VolUseDuration;
    mr->MaxVolJobs = pr->MaxVolJobs;
    mr->MaxVolFiles = pr->MaxVolFiles;
    mr->MaxVolBytes = pr->MaxVolBytes;
+   mr->LabelType = pr->LabelType;
 }
 
 
 /*
  *  Add Volumes to an existing Pool
  */
-static int addcmd(UAContext *ua, char *cmd) 
+static int add_cmd(UAContext *ua, const char *cmd)
 {
    POOL_DBR pr;
    MEDIA_DBR mr;
@@ -175,7 +200,7 @@ static int addcmd(UAContext *ua, char *cmd)
    int first_id = 0;
    char name[MAX_NAME_LENGTH];
    STORE *store;
-   int slot = 0;
+   int Slot = 0, InChanger = 0;
 
    bsendmsg(ua, _(
 "You probably don't want to be using this command since it\n"
@@ -197,58 +222,52 @@ static int addcmd(UAContext *ua, char *cmd)
       pr.MaxVols, pr.PoolType);
 
    while (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
-      bsendmsg(ua, _("Pool already has maximum volumes = %d\n"), pr.MaxVols);
+      bsendmsg(ua, _("Pool already has maximum volumes=%d\n"), pr.MaxVols);
       for (;;) {
-         if (!get_cmd(ua, _("Enter new maximum (zero for unlimited): "))) {
-	    return 1;
-	 }
-	 pr.MaxVols = atoi(ua->cmd);
-	 if (pr.MaxVols < 0) {
-            bsendmsg(ua, _("Max vols must be zero or greater.\n"));
-	    continue;
-	 }
-	 break;
+         if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) {
+            return 1;
+         }
+         pr.MaxVols = ua->pint32_val;
       }
    }
 
    /* Get media type */
-   if ((store = get_storage_resource(ua, 0)) != NULL) {
-      strcpy(mr.MediaType, store->media_type);
+   if ((store = get_storage_resource(ua, false/*no default*/)) != NULL) {
+      bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType));
    } else if (!get_media_type(ua, mr.MediaType, sizeof(mr.MediaType))) {
       return 1;
    }
-      
+
    if (pr.MaxVols == 0) {
       max = 1000;
    } else {
       max = pr.MaxVols - pr.NumVols;
    }
    for (;;) {
-      char buf[100]; 
-      sprintf(buf, _("Enter number of Volumes to create. 0=>fixed name. Max=%d: "), max);
-      if (!get_cmd(ua, buf)) {
-	 return 1;
+      char buf[100];
+      bsnprintf(buf, sizeof(buf), _("Enter number of Volumes to create. 0=>fixed name. Max=%d: "), max);
+      if (!get_pint(ua, buf)) {
+         return 1;
       }
-      num = atoi(ua->cmd);
+      num = ua->pint32_val;
       if (num < 0 || num > max) {
          bsendmsg(ua, _("The number must be between 0 and %d\n"), max);
-	 continue;
+         continue;
       }
       break;
    }
 getVolName:
    if (num == 0) {
       if (!get_cmd(ua, _("Enter Volume name: "))) {
-	 return 1;
+         return 1;
       }
    } else {
       if (!get_cmd(ua, _("Enter base volume name: "))) {
-	 return 1;
+         return 1;
       }
    }
    /* Don't allow | in Volume name because it is the volume separator character */
-   if (strchr(ua->cmd, '|')) {
-      bsendmsg(ua, _("Illegal character | in a volume name.\n"));
+   if (!is_volume_name_legal(ua, ua->cmd)) {
       goto getVolName;
    }
    if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) {
@@ -260,20 +279,20 @@ getVolName:
       goto getVolName;
    }
 
-   strcpy(name, ua->cmd);
+   bstrncpy(name, ua->cmd, sizeof(name));
    if (num > 0) {
-      strcat(name, "%04d");
+      bstrncat(name, "%04d", sizeof(name));
 
       for (;;) {
-         if (!get_cmd(ua, _("Enter the starting number: "))) {
-	    return 1;
-	 }
-	 startnum = atoi(ua->cmd);
-	 if (startnum < 1) {
+         if (!get_pint(ua, _("Enter the starting number: "))) {
+            return 1;
+         }
+         startnum = ua->pint32_val;
+         if (startnum < 1) {
             bsendmsg(ua, _("Start number must be greater than zero.\n"));
-	    continue;
-	 }
-	 break;
+            continue;
+         }
+         break;
       }
    } else {
       startnum = 1;
@@ -281,29 +300,35 @@ getVolName:
    }
 
    if (store && store->autochanger) {
-      if (!get_cmd(ua, _("Enter slot (0 for none): "))) {
-	 return 1;
+      if (!get_pint(ua, _("Enter slot (0 for none): "))) {
+         return 1;
+      }
+      Slot = ua->pint32_val;
+      if (!get_yesno(ua, _("InChanger? yes/no: "))) {
+         return 1;
       }
-      slot = atoi(ua->cmd);
+      InChanger = ua->pint32_val;
    }
-	   
+
    set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
-   for (i=startnum; i < num+startnum; i++) { 
-      sprintf(mr.VolumeName, name, i);
-      mr.Slot = slot++;
+   for (i=startnum; i < num+startnum; i++) {
+      bsnprintf(mr.VolumeName, sizeof(mr.VolumeName), name, i);
+      mr.Slot = Slot++;
+      mr.InChanger = InChanger;
+      mr.StorageId = store->StorageId;
       Dmsg1(200, "Create Volume %s\n", mr.VolumeName);
       if (!db_create_media_record(ua->jcr, ua->db, &mr)) {
-	 bsendmsg(ua, db_strerror(ua->db));
-	 return 1;
+         bsendmsg(ua, "%s", db_strerror(ua->db));
+         return 1;
       }
       if (i == startnum) {
-	 first_id = mr.PoolId;
+         first_id = mr.PoolId;
       }
    }
    pr.NumVols += num;
-   Dmsg0(200, "Update pool record.\n"); 
+   Dmsg0(200, "Update pool record.\n");
    if (db_update_pool_record(ua->jcr, ua->db, &pr) != 1) {
-      bsendmsg(ua, db_strerror(ua->db));
+      bsendmsg(ua, "%s", db_strerror(ua->db));
       return 1;
    }
    bsendmsg(ua, _("%d Volumes created in pool %s\n"), num, pr.Name);
@@ -312,37 +337,36 @@ getVolName:
 }
 
 /*
- * Turn auto mount on/off  
- * 
- *  automount on 
+ * Turn auto mount on/off
+ *
+ *  automount on
  *  automount off
  */
-int automountcmd(UAContext *ua, char *cmd)
+int automount_cmd(UAContext *ua, const char *cmd)
 {
    char *onoff;
 
    if (ua->argc != 2) {
       if (!get_cmd(ua, _("Turn on or off? "))) {
-	    return 1;
+            return 1;
       }
       onoff = ua->cmd;
    } else {
       onoff = ua->argk[1];
    }
 
-   ua->automount = (strcasecmp(onoff, _("off")) == 0) ? 0 : 1;
-   return 1; 
+   ua->automount = (strcasecmp(onoff, NT_("off")) == 0) ? 0 : 1;
+   return 1;
 }
 
 
 /*
  * Cancel a job
  */
-static int cancelcmd(UAContext *ua, char *cmd)
+static int cancel_cmd(UAContext *ua, const char *cmd)
 {
-   int i;
+   int i, ret;
    int njobs = 0;
-   BSOCK *sd, *fd;
    JCR *jcr = NULL;
    char JobName[MAX_NAME_LENGTH];
 
@@ -351,127 +375,88 @@ static int cancelcmd(UAContext *ua, char *cmd)
    }
 
    for (i=1; i<ua->argc; i++) {
-      if (strcasecmp(ua->argk[i], _("jobid")) == 0) {
-	 if (!ua->argv[i]) {
-	    break;
-	 }
-	 if (!(jcr=get_jcr_by_id(atoi(ua->argv[i])))) {
-            bsendmsg(ua, _("JobId %d is not running.\n"), atoi(ua->argv[i]));
-	    return 1;
-	 }
-	 break;
-      } else if (strcasecmp(ua->argk[i], _("job")) == 0) {
-	 if (!ua->argv[i]) {
-	    break;
-	 }
-	 if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) {
-            bsendmsg(ua, _("Job %s is not running.\n"), ua->argv[i]);
-	    return 1;
-	 }
-	 break;
+      if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) {
+         uint32_t JobId;
+         if (!ua->argv[i]) {
+            break;
+         }
+         JobId = str_to_int64(ua->argv[i]);
+         if (!(jcr=get_jcr_by_id(JobId))) {
+            bsendmsg(ua, _("JobId %s is not running. Use Job name to cancel inactive jobs.\n"),  ua->argv[i]);
+            return 1;
+         }
+         break;
+      } else if (strcasecmp(ua->argk[i], NT_("job")) == 0) {
+         if (!ua->argv[i]) {
+            break;
+         }
+         if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) {
+            bsendmsg(ua, _("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
+            jcr = new_jcr(sizeof(JCR), dird_free_jcr);
+            bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job));
+         }
+         break;
+      } else if (strcasecmp(ua->argk[i], NT_("ujobid")) == 0) {
+         if (!ua->argv[i]) {
+            break;
+         }
+         if (!(jcr=get_jcr_by_full_name(ua->argv[i]))) {
+            bsendmsg(ua, _("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
+            jcr = new_jcr(sizeof(JCR), dird_free_jcr);
+            bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job));
+         }
+         break;
       }
+
    }
    /* If we still do not have a jcr,
-    *	throw up a list and ask the user to select one.
+    *   throw up a list and ask the user to select one.
     */
    if (!jcr) {
+      char buf[1000];
       /* Count Jobs running */
-      lock_jcr_chain();
-      for (jcr=NULL; (jcr=get_next_jcr(jcr)); njobs++) {
-	 if (jcr->JobId == 0) {      /* this is us */
-	    free_locked_jcr(jcr);
-	    njobs--;
-	    continue;
-	 }
-	 free_locked_jcr(jcr);
+      foreach_jcr(jcr) {
+         if (jcr->JobId == 0) {      /* this is us */
+            continue;
+         }
+         njobs++;
       }
-      unlock_jcr_chain();
+      endeach_jcr(jcr);
 
       if (njobs == 0) {
          bsendmsg(ua, _("No Jobs running.\n"));
-	 return 1;
+         return 1;
       }
       start_prompt(ua, _("Select Job:\n"));
-      lock_jcr_chain();
-      for (jcr=NULL; (jcr=get_next_jcr(jcr)); ) {
-	 if (jcr->JobId == 0) {      /* this is us */
-	    free_locked_jcr(jcr);
-	    continue;
-	 }
-	 add_prompt(ua, jcr->Job);
-	 free_locked_jcr(jcr);
+      foreach_jcr(jcr) {
+         char ed1[50];
+         if (jcr->JobId == 0) {      /* this is us */
+            continue;
+         }
+         bsnprintf(buf, sizeof(buf), _("JobId=%s Job=%s"), edit_int64(jcr->JobId, ed1), jcr->Job);
+         add_prompt(ua, buf);
       }
-      unlock_jcr_chain();
+      endeach_jcr(jcr);
 
-      if (do_prompt(ua, _("Choose Job to cancel"), JobName, sizeof(JobName)) < 0) {
-	 return 1;
+      if (do_prompt(ua, _("Job"),  _("Choose Job to cancel"), buf, sizeof(buf)) < 0) {
+         return 1;
       }
       if (njobs == 1) {
-         if (!get_cmd(ua, _("Confirm cancel (yes/no): "))) {
-	    return 1;
-	 }
-         if (strcasecmp(ua->cmd, _("yes")) != 0) {
-	    return 1;
-	 }
+         if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) {
+            return 1;
+         }
       }
+      sscanf(buf, "JobId=%d Job=%127s", &njobs, JobName);
       jcr = get_jcr_by_full_name(JobName);
       if (!jcr) {
          bsendmsg(ua, _("Job %s not found.\n"), JobName);
-	 return 1;
+         return 1;
       }
    }
-     
-   switch (jcr->JobStatus) {
-   case JS_Created:
-      set_jcr_job_status(jcr, JS_Canceled);
-      bsendmsg(ua, _("JobId %d, Job %s marked to be canceled.\n"),
-	      jcr->JobId, jcr->Job);
-#ifndef USE_SEMAPHORE
-      workq_remove(&job_wq, jcr->work_item); /* attempt to remove it from queue */
-#endif
-      free_jcr(jcr);
-      return 1;
-	 
-   default:
-      set_jcr_job_status(jcr, JS_Canceled);
-      /* Cancel File daemon */
-      ua->jcr->client = jcr->client;
-      if (!connect_to_file_daemon(ua->jcr, 10, FDConnectTimeout, 1)) {
-         bsendmsg(ua, _("Failed to connect to File daemon.\n"));
-	 free_jcr(jcr);
-	 return 1;
-      }
-      Dmsg0(200, "Connected to file daemon\n");
-      fd = ua->jcr->file_bsock;
-      bnet_fsend(fd, "cancel Job=%s\n", jcr->Job);
-      while (bnet_recv(fd) >= 0) {
-         bsendmsg(ua, "%s", fd->msg);
-      }
-      bnet_sig(fd, BNET_TERMINATE);
-      bnet_close(fd);
-      ua->jcr->file_bsock = NULL;
-
-      /* Cancel Storage daemon */
-      ua->jcr->store = jcr->store;
-      if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
-         bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
-	 free_jcr(jcr);
-	 return 1;
-      }
-      Dmsg0(200, "Connected to storage daemon\n");
-      sd = ua->jcr->store_bsock;
-      bnet_fsend(sd, "cancel Job=%s\n", jcr->Job);
-      while (bnet_recv(sd) >= 0) {
-         bsendmsg(ua, "%s", sd->msg);
-      }
-      bnet_sig(sd, BNET_TERMINATE);
-      bnet_close(sd);
-      ua->jcr->store_bsock = NULL;
 
-   }
+   ret = cancel_job(ua, jcr);
    free_jcr(jcr);
-
-   return 1; 
+   return ret;
 }
 
 /*
@@ -481,20 +466,21 @@ static int cancelcmd(UAContext *ua, char *cmd)
  *   depending on if we are creating the Pool or we are
  *   simply bringing it into agreement with the resource (updage).
  */
-void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, int create)
+void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op)
 {
-   strcpy(pr->PoolType, pool->pool_type);
-   if (create) {
+   bstrncpy(pr->PoolType, pool->pool_type, sizeof(pr->PoolType));
+   if (op == POOL_OP_CREATE) {
       pr->MaxVols = pool->max_volumes;
       pr->NumVols = 0;
-   } else {	     /* update pool */
+   } else {          /* update pool */
       if (pr->MaxVols != pool->max_volumes) {
-	 pr->MaxVols = pool->max_volumes;
+         pr->MaxVols = pool->max_volumes;
       }
       if (pr->MaxVols != 0 && pr->MaxVols < pr->NumVols) {
-	 pr->MaxVols = pr->NumVols;
+         pr->MaxVols = pr->NumVols;
       }
    }
+   pr->LabelType = pool->LabelType;
    pr->UseOnce = pool->use_volume_once;
    pr->UseCatalog = pool->use_catalog;
    pr->AcceptAnyVolume = pool->accept_any_volume;
@@ -504,10 +490,12 @@ void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, int create)
    pr->MaxVolJobs = pool->MaxVolJobs;
    pr->MaxVolFiles = pool->MaxVolFiles;
    pr->MaxVolBytes = pool->MaxVolBytes;
+   pr->AutoPrune = pool->AutoPrune;
+   pr->Recycle = pool->Recycle;
    if (pool->label_format) {
-      strcpy(pr->LabelFormat, pool->label_format);
+      bstrncpy(pr->LabelFormat, pool->label_format, sizeof(pr->LabelFormat));
    } else {
-      strcpy(pr->LabelFormat, "*");    /* none */
+      bstrncpy(pr->LabelFormat, "*", sizeof(pr->LabelFormat));    /* none */
    }
 }
 
@@ -515,32 +503,32 @@ void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, int create)
 /*
  * Create a pool record from a given Pool resource
  *   Also called from backup.c
- * Returns: -1	on error
- *	     0	record already exists
- *	     1	record created
+ * Returns: -1  on error
+ *           0  record already exists
+ *           1  record created
  */
 
-int create_pool(JCR *jcr, B_DB *db, POOL *pool, int create)
+int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op)
 {
    POOL_DBR  pr;
 
    memset(&pr, 0, sizeof(POOL_DBR));
 
-   strcpy(pr.Name, pool->hdr.name);
+   bstrncpy(pr.Name, pool->hdr.name, sizeof(pr.Name));
 
    if (db_get_pool_record(jcr, db, &pr)) {
       /* Pool Exists */
-      if (!create) {  /* update request */
-	 set_pooldbr_from_poolres(&pr, pool, 0);
-	 db_update_pool_record(jcr, db, &pr);
+      if (op == POOL_OP_UPDATE) {  /* update request */
+         set_pooldbr_from_poolres(&pr, pool, op);
+         db_update_pool_record(jcr, db, &pr);
       }
-      return 0; 		      /* exists */
+      return 0;                       /* exists */
    }
 
-   set_pooldbr_from_poolres(&pr, pool, 1);
+   set_pooldbr_from_poolres(&pr, pool, op);
 
    if (!db_create_pool_record(jcr, db, &pr)) {
-      return -1;		      /* error */
+      return -1;                      /* error */
    }
    return 1;
 }
@@ -551,7 +539,7 @@ int create_pool(JCR *jcr, B_DB *db, POOL *pool, int create)
  * Create a Pool Record in the database.
  *  It is always created from the Resource record.
  */
-static int createcmd(UAContext *ua, char *cmd) 
+static int create_cmd(UAContext *ua, const char *cmd)
 {
    POOL *pool;
 
@@ -564,14 +552,14 @@ static int createcmd(UAContext *ua, char *cmd)
       return 1;
    }
 
-   switch (create_pool(ua->jcr, ua->db, pool, 1)) {
+   switch (create_pool(ua->jcr, ua->db, pool, POOL_OP_CREATE)) {
    case 0:
-      bsendmsg(ua, _("Error: Pool %s already exists.\n\
-Use update to change it.\n"), pool->hdr.name);
+      bsendmsg(ua, _("Error: Pool %s already exists.\n"
+               "Use update to change it.\n"), pool->hdr.name);
       break;
 
    case -1:
-      bsendmsg(ua, db_strerror(ua->db));
+      bsendmsg(ua, "%s", db_strerror(ua->db));
       break;
 
    default:
@@ -582,396 +570,129 @@ Use update to change it.\n"), pool->hdr.name);
 }
 
 
-
+extern DIRRES *director;
 
 /*
- * Update a Pool Record in the database.
- *  It is always updated from the Resource record.
- *
- *    update pool=<pool-name>
- *	   updates pool from Pool resource
- *    update media pool=<pool-name> volume=<volume-name>
- *	   changes pool info for volume
+ * Python control command
+ *  python restart (restarts interpreter)
  */
-static int updatecmd(UAContext *ua, char *cmd) 
+static int python_cmd(UAContext *ua, const char *cmd)
 {
-   static char *kw[] = {
-      N_("media"),  /* 0 */
-      N_("volume"), /* 1 */
-      N_("pool"),   /* 2 */
-      N_("slots"),  /* 3 */
-      NULL};
-
-   if (!open_db(ua)) {
-      return 1;
-   }
-
-   switch (find_arg_keyword(ua, kw)) {
-      case 0:
-      case 1:
-	 update_volume(ua);
-	 return 1;
-      case 2:
-	 update_pool(ua);
-	 return 1;
-      case 3:
-	 update_slots(ua);
-	 return 1;
-      default:
-	 break;
-   }
-    
-   start_prompt(ua, _("Update choice:\n"));
-   add_prompt(ua, _("Volume parameters"));
-   add_prompt(ua, _("Pool from resource"));
-   add_prompt(ua, _("Slots from autochanger"));
-   switch (do_prompt(ua, _("Choose catalog item to update"), NULL, 0)) {
-      case 0:
-	 update_volume(ua);
-	 break;
-      case 1:
-	 update_pool(ua);
-	 break;
-      case 2:
-	 update_slots(ua);
-	 break;
-      default:
-	 break;
+   if (ua->argc >= 1 && strcasecmp(ua->argk[1], NT_("restart")) == 0) {
+      term_python_interpreter();
+      init_python_interpreter(director->hdr.name, 
+         director->scripts_directory, "DirStartUp");
+      bsendmsg(ua, _("Python interpreter restarted.\n"));
+   } else {
+      bsendmsg(ua, _("Nothing done.\n"));
    }
    return 1;
 }
 
+
 /*
- * Update a media record -- allows you to change the
- *  Volume status. E.g. if you want Bacula to stop
- *  writing on the volume, set it to anything other
- *  than Append.
- */		 
-static int update_volume(UAContext *ua)
+ * Set a new address in a Client resource. We do this only
+ *  if the Console name is the same as the Client name
+ *  and the Console can access the client.
+ */
+static int setip_cmd(UAContext *ua, const char *cmd)
 {
-   POOL_DBR pr;
-   MEDIA_DBR mr;
-   POOLMEM *query;
-   char ed1[30];
-
-   if (!select_pool_and_media_dbr(ua, &pr, &mr)) {
-      return 0;
+   CLIENT *client;
+   char buf[1024];
+   if (!ua->cons || !acl_access_ok(ua, Client_ACL, ua->cons->hdr.name)) {
+      bsendmsg(ua, _("Illegal command from this console.\n"));
+      return 1;
    }
+   LockRes();
+   client = (CLIENT *)GetResWithName(R_CLIENT, ua->cons->hdr.name);
 
-   for (int done=0; !done; ) {
-      if (!db_get_media_record(ua->jcr, ua->db, &mr)) {
-	 if (mr.MediaId != 0) {
-            bsendmsg(ua, _("Volume record for MediaId %d not found.\n"), mr.MediaId);
-	 } else {
-            bsendmsg(ua, _("Volume record for %s not found.\n"), mr.VolumeName);
-	 }
-	 return 0;
-      }
-      bsendmsg(ua, _("Updating Volume \"%s\"\n"), mr.VolumeName);
-      start_prompt(ua, _("Parameters to modify:\n"));
-      add_prompt(ua, _("Volume Status"));
-      add_prompt(ua, _("Volume Retention Period"));
-      add_prompt(ua, _("Volume Use Duration"));
-      add_prompt(ua, _("Maximum Volume Jobs"));
-      add_prompt(ua, _("Maximum Volume Files"));
-      add_prompt(ua, _("Maximum Volume Bytes"));
-      add_prompt(ua, _("Recycle Flag"));
-      add_prompt(ua, _("Slot"));
-      add_prompt(ua, _("Volume Files"));
-      add_prompt(ua, _("Done"));
-      switch (do_prompt(ua, _("Select parameter to modify"), NULL, 0)) {
-      case 0:			      /* Volume Status */
-	 /* Modify Volume Status */
-         bsendmsg(ua, _("Current Volume status is: %s\n"), mr.VolStatus);
-         start_prompt(ua, _("Possible Values are:\n"));
-         add_prompt(ua, "Append");      /* Better not translate these as */
-         add_prompt(ua, "Archive");     /* They are known in the database code */
-         add_prompt(ua, "Disabled");
-         add_prompt(ua, "Full");
-         add_prompt(ua, "Used");
-         if (strcmp(mr.VolStatus, "Purged") == 0) {
-            add_prompt(ua, "Recycle");
-	 }
-         add_prompt(ua, "Read-Only");
-         if (do_prompt(ua, _("Choose new Volume Status"), ua->cmd, sizeof(mr.VolStatus)) < 0) {
-	    return 1;
-	 }
-	 bstrncpy(mr.VolStatus, ua->cmd, sizeof(mr.VolStatus));
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET VolStatus='%s' WHERE MediaId=%u",
-	    mr.VolStatus, mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {
-            bsendmsg(ua, _("New Volume status is: %s\n"), mr.VolStatus);
-	 }
-	 free_pool_memory(query);
-	 break;
-      case 1:			      /* Retention */
-         bsendmsg(ua, _("Current retention seconds is: %s\n"),
-	    edit_utime(mr.VolRetention, ed1));
-         if (!get_cmd(ua, _("Enter Volume Retention period: "))) {
-	    return 0;
-	 }
-	 if (!duration_to_utime(ua->cmd, &mr.VolRetention)) {
-            bsendmsg(ua, _("Invalid retention period specified.\n"));
-	    break;
-	 }
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET VolRetention=%s WHERE MediaId=%u",
-	    edit_uint64(mr.VolRetention, ed1), mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {
-            bsendmsg(ua, _("New retention seconds is: %s\n"),
-	       edit_utime(mr.VolRetention, ed1));
-	 }
-	 free_pool_memory(query);
-	 break;
-
-      case 2:			      /* Use Duration */
-         bsendmsg(ua, _("Current use duration is: %s\n"),
-	    edit_utime(mr.VolUseDuration, ed1));
-         if (!get_cmd(ua, _("Enter Volume Use Duration: "))) {
-	    return 0;
-	 }
-	 if (!duration_to_utime(ua->cmd, &mr.VolUseDuration)) {
-            bsendmsg(ua, _("Invalid use duration specified.\n"));
-	    break;
-	 }
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET VolUseDuration=%s WHERE MediaId=%u",
-	    edit_uint64(mr.VolUseDuration, ed1), mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {
-            bsendmsg(ua, _("New use duration is: %s\n"),
-	       edit_utime(mr.VolUseDuration, ed1));
-	 }
-	 free_pool_memory(query);
-	 break;
-
-      case 3:			      /* Max Jobs */
-	 int32_t maxjobs;
-         bsendmsg(ua, _("Current max jobs is: %u\n"), mr.MaxVolJobs);
-         if (!get_cmd(ua, _("Enter new Maximum Jobs: "))) {
-	    return 0;
-	 }
-	 maxjobs = atoi(ua->cmd);
-	 if (maxjobs < 0) {
-            bsendmsg(ua, _("Invalid number, it must be 0 or greater\n"));
-	    break;
-	 } 
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET MaxVolJobs=%u WHERE MediaId=%u",
-	    maxjobs, mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {
-            bsendmsg(ua, _("New max jobs is: %u\n"), maxjobs);
-	 }
-	 free_pool_memory(query);
-	 break;
-
-      case 4:			      /* Max Files */
-	 int32_t maxfiles;
-         bsendmsg(ua, _("Current max files is: %u\n"), mr.MaxVolFiles);
-         if (!get_cmd(ua, _("Enter new Maximum Files: "))) {
-	    return 0;
-	 }
-	 maxfiles = atoi(ua->cmd);
-	 if (maxfiles < 0) {
-            bsendmsg(ua, _("Invalid number, it must be 0 or greater\n"));
-	    break;
-	 } 
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET MaxVolFiles=%u WHERE MediaId=%u",
-	    maxfiles, mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {
-            bsendmsg(ua, _("New max files is: %u\n"), maxfiles);
-	 }
-	 free_pool_memory(query);
-	 break;
-
-      case 5:			      /* Max Bytes */
-	 uint64_t maxbytes;
-         bsendmsg(ua, _("Current value is: %s\n"), edit_uint64(mr.MaxVolBytes, ed1));
-         if (!get_cmd(ua, _("Enter new Maximum Bytes: "))) {
-	    return 0;
-	 }
-	 if (!size_to_uint64(ua->cmd, strlen(ua->cmd), &maxbytes)) {
-            bsendmsg(ua, _("Invalid byte size specification.\n"));
-	    break;
-	 } 
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET MaxVolBytes=%s WHERE MediaId=%u",
-	    edit_uint64(maxbytes, ed1), mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {
-            bsendmsg(ua, _("New Max bytes is: %s\n"), edit_uint64(maxbytes, ed1));
-	 }
-	 free_pool_memory(query);
-	 break;
-
-
-      case 6:			      /* Recycle */
-	 int recycle;
-         bsendmsg(ua, _("Current recycle flag is: %s\n"),
-            mr.Recycle==1?_("yes"):_("no"));
-         if (!get_cmd(ua, _("Enter new Recycle status: "))) {
-	    return 0;
-	 }
-         if (strcasecmp(ua->cmd, _("yes")) == 0) {
-	    recycle = 1;
-         } else if (strcasecmp(ua->cmd, _("no")) == 0) {
-	    recycle = 0;
-	 } else {
-            bsendmsg(ua, _("Invalid recycle status specified.\n"));
-	    break;
-	 }
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET Recycle=%d WHERE MediaId=%u",
-	    recycle, mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {	
-            bsendmsg(ua, _("New recycle flag is: %s\n"),
-               mr.Recycle==1?_("yes"):_("no"));
-	 }
-	 free_pool_memory(query);
-	 break;
-
-      case 7:			      /* Slot */
-	 int slot;
-         bsendmsg(ua, _("Current Slot is: %d\n"), mr.Slot);
-         if (!get_cmd(ua, _("Enter new Slot: "))) {
-	    return 0;
-	 }
-	 slot = atoi(ua->cmd);
-	 if (slot < 0) {
-            bsendmsg(ua, _("Invalid slot, it must be 0 or greater\n"));
-	    break;
-	 } else if (pr.MaxVols > 0 && slot >(int)pr.MaxVols) {
-            bsendmsg(ua, _("Invalid slot, it must be between 0 and %d\n"),
-	       pr.MaxVols);
-	    break;
-	 }
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET Slot=%d WHERE MediaId=%u",
-	    slot, mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {
-            bsendmsg(ua, "New Slot is: %d\n", slot);
-	 }
-	 free_pool_memory(query);
-	 break;
-
-      case 8:			      /* Volume Files */
-	 int32_t VolFiles;
-         bsendmsg(ua, _("Warning changing Volume Files can result\n"
-                        "in loss of data on your Volume\n\n"));
-         bsendmsg(ua, _("Current Volume Files is: %u\n"), mr.VolFiles);
-         if (!get_cmd(ua, _("Enter new number of Files for Volume: "))) {
-	    return 0;
-	 }
-	 VolFiles = atoi(ua->cmd);
-	 if (VolFiles < 0) {
-            bsendmsg(ua, _("Invalid number, it must be 0 or greater\n"));
-	    break;
-	 } 
-	 if (VolFiles != (int)(mr.VolFiles + 1)) {
-            bsendmsg(ua, _("Normally, you should only increase Volume Files by one!\n"));
-            if (!get_cmd(ua, _("Continue? (yes/no): ")) || 
-                 strcasecmp(ua->cmd, "yes") != 0) {
-	       break;
-	    }
-	 }
-	 query = get_pool_memory(PM_MESSAGE);
-         Mmsg(&query, "UPDATE Media SET VolFiles=%u WHERE MediaId=%u",
-	    VolFiles, mr.MediaId);
-	 if (!db_sql_query(ua->db, query, NULL, NULL)) {  
-            bsendmsg(ua, "%s", db_strerror(ua->db));
-	 } else {
-            bsendmsg(ua, _("New Volume Files is: %u\n"), VolFiles);
-	 }
-	 free_pool_memory(query);
-	 break;
-
-      default:			      /* Done or error */
-         bsendmsg(ua, "Selection done.\n");
-	 return 1;
-      }
+   if (!client) {
+      bsendmsg(ua, _("Client \"%s\" not found.\n"), ua->cons->hdr.name);
+      goto get_out;
    }
+   if (client->address) {
+      free(client->address);
+   }
+   /* MA Bug 6 remove ifdef */
+   sockaddr_to_ascii(&(ua->UA_sock->client_addr), buf, sizeof(buf));
+   client->address = bstrdup(buf);
+   bsendmsg(ua, _("Client \"%s\" address set to %s\n"),
+            client->hdr.name, client->address);
+get_out:
+   UnlockRes();
    return 1;
 }
 
-/* 
- * Update pool record -- pull info from current POOL resource
- */
-static int update_pool(UAContext *ua)
+
+static void do_en_disable_cmd(UAContext *ua, bool setting)
 {
-   POOL_DBR  pr;
-   int id;
-   POOL *pool;
-   POOLMEM *query;	 
-   
-   
-   pool = get_pool_resource(ua);
-   if (!pool) {
-      return 0;
+   JOB *job;
+   int i;
+
+   i = find_arg_with_value(ua, NT_("job")); 
+   if (i < 0) { 
+      job = select_job_resource(ua);
+      if (!job) {
+         return;
+      }
+   } else {
+      LockRes();
+      job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
+      UnlockRes();
+   } 
+   if (!job) {
+      bsendmsg(ua, _("Job \"%s\" not found.\n"), ua->argv[i]);
+      return;
    }
 
-   memset(&pr, 0, sizeof(pr));
-   strcpy(pr.Name, pool->hdr.name);
-   if (!get_pool_dbr(ua, &pr)) {
-      return 0;
+   if (!acl_access_ok(ua, Job_ACL, job->hdr.name)) {
+      bsendmsg(ua, _("Illegal command from this console.\n"));
+      return;
    }
+   job->enabled = setting;
+   bsendmsg(ua, _("Job \"%s\" %sabled\n"), job->hdr.name, setting?"en":"dis");
+   return;
+}
 
-   set_pooldbr_from_poolres(&pr, pool, 0); /* update */
+static int enable_cmd(UAContext *ua, const char *cmd)
+{
+   do_en_disable_cmd(ua, true);
+   return 1;
+}
 
-   id = db_update_pool_record(ua->jcr, ua->db, &pr);
-   if (id <= 0) {
-      bsendmsg(ua, _("db_update_pool_record returned %d. ERR=%s\n"),
-	 id, db_strerror(ua->db));
-   }
-   query = get_pool_memory(PM_MESSAGE);
-   Mmsg(&query, list_pool, pr.PoolId);
-   db_list_sql_query(ua->jcr, ua->db, query, prtit, ua, 1, 0);
-   free_pool_memory(query);
-   bsendmsg(ua, _("Pool DB record updated from resource.\n"));
+static int disable_cmd(UAContext *ua, const char *cmd)
+{
+   do_en_disable_cmd(ua, false);
    return 1;
 }
 
 
-static void do_storage_setdebug(UAContext *ua, STORE *store, int level)
+static void do_storage_setdebug(UAContext *ua, STORE *store, int level, int trace_flag)
 {
    BSOCK *sd;
+   JCR *jcr = ua->jcr;
 
-   ua->jcr->store = store;
+   set_storage(jcr, store);
    /* Try connecting for up to 15 seconds */
-   bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"), 
+   bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"),
       store->hdr.name, store->address, store->SDport);
-   if (!connect_to_storage_daemon(ua->jcr, 1, 15, 0)) {
+   if (!connect_to_storage_daemon(jcr, 1, 15, 0)) {
       bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
       return;
    }
    Dmsg0(120, _("Connected to storage daemon\n"));
-   sd = ua->jcr->store_bsock;
-   bnet_fsend(sd, "setdebug=%d\n", level);
+   sd = jcr->store_bsock;
+   bnet_fsend(sd, "setdebug=%d trace=%d\n", level, trace_flag);
    if (bnet_recv(sd) >= 0) {
       bsendmsg(ua, "%s", sd->msg);
    }
    bnet_sig(sd, BNET_TERMINATE);
    bnet_close(sd);
-   ua->jcr->store_bsock = NULL;
-   return;  
+   jcr->store_bsock = NULL;
+   return;
 }
-   
-static void do_client_setdebug(UAContext *ua, CLIENT *client, int level)
+
+static void do_client_setdebug(UAContext *ua, CLIENT *client, int level, int trace_flag)
 {
    BSOCK *fd;
 
@@ -979,7 +700,7 @@ static void do_client_setdebug(UAContext *ua, CLIENT *client, int level)
 
    ua->jcr->client = client;
    /* Try to connect for 15 seconds */
-   bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"), 
+   bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
       client->hdr.name, client->address, client->FDport);
    if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
       bsendmsg(ua, _("Failed to connect to Client.\n"));
@@ -987,19 +708,18 @@ static void do_client_setdebug(UAContext *ua, CLIENT *client, int level)
    }
    Dmsg0(120, "Connected to file daemon\n");
    fd = ua->jcr->file_bsock;
-   bnet_fsend(fd, "setdebug=%d\n", level);
+   bnet_fsend(fd, "setdebug=%d trace=%d\n", level, trace_flag);
    if (bnet_recv(fd) >= 0) {
       bsendmsg(ua, "%s", fd->msg);
    }
    bnet_sig(fd, BNET_TERMINATE);
    bnet_close(fd);
    ua->jcr->file_bsock = NULL;
-
-   return;  
+   return;
 }
 
 
-static void do_all_setdebug(UAContext *ua, int level)
+static void do_all_setdebug(UAContext *ua, int level, int trace_flag)
 {
    STORE *store, **unique_store;
    CLIENT *client, **unique_client;
@@ -1011,24 +731,26 @@ static void do_all_setdebug(UAContext *ua, int level)
    /* Count Storage items */
    LockRes();
    store = NULL;
-   for (i=0; (store = (STORE *)GetNextRes(R_STORAGE, (RES *)store)); i++)
-      { }
+   i = 0;
+   foreach_res(store, R_STORAGE) {
+      i++;
+   }
    unique_store = (STORE **) malloc(i * sizeof(STORE));
-   /* Find Unique Storage address/port */	  
+   /* Find Unique Storage address/port */
    store = (STORE *)GetNextRes(R_STORAGE, NULL);
    i = 0;
    unique_store[i++] = store;
    while ((store = (STORE *)GetNextRes(R_STORAGE, (RES *)store))) {
       found = 0;
       for (j=0; j<i; j++) {
-	 if (strcmp(unique_store[j]->address, store->address) == 0 &&
-	     unique_store[j]->SDport == store->SDport) {
-	    found = 1;
-	    break;
-	 }
+         if (strcmp(unique_store[j]->address, store->address) == 0 &&
+             unique_store[j]->SDport == store->SDport) {
+            found = 1;
+            break;
+         }
       }
       if (!found) {
-	 unique_store[i++] = store;
+         unique_store[i++] = store;
          Dmsg2(140, "Stuffing: %s:%d\n", store->address, store->SDport);
       }
    }
@@ -1036,31 +758,33 @@ static void do_all_setdebug(UAContext *ua, int level)
 
    /* Call each unique Storage daemon */
    for (j=0; j<i; j++) {
-      do_storage_setdebug(ua, unique_store[j], level);
+      do_storage_setdebug(ua, unique_store[j], level, trace_flag);
    }
    free(unique_store);
 
    /* Count Client items */
    LockRes();
    client = NULL;
-   for (i=0; (client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client)); i++)
-      { }
+   i = 0;
+   foreach_res(client, R_CLIENT) {
+      i++;
+   }
    unique_client = (CLIENT **) malloc(i * sizeof(CLIENT));
-   /* Find Unique Client address/port */	 
+   /* Find Unique Client address/port */
    client = (CLIENT *)GetNextRes(R_CLIENT, NULL);
    i = 0;
    unique_client[i++] = client;
    while ((client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client))) {
       found = 0;
       for (j=0; j<i; j++) {
-	 if (strcmp(unique_client[j]->address, client->address) == 0 &&
-	     unique_client[j]->FDport == client->FDport) {
-	    found = 1;
-	    break;
-	 }
+         if (strcmp(unique_client[j]->address, client->address) == 0 &&
+             unique_client[j]->FDport == client->FDport) {
+            found = 1;
+            break;
+         }
       }
       if (!found) {
-	 unique_client[i++] = client;
+         unique_client[i++] = client;
          Dmsg2(140, "Stuffing: %s:%d\n", client->address, client->FDport);
       }
    }
@@ -1068,19 +792,20 @@ static void do_all_setdebug(UAContext *ua, int level)
 
    /* Call each unique File daemon */
    for (j=0; j<i; j++) {
-      do_client_setdebug(ua, unique_client[j], level);
+      do_client_setdebug(ua, unique_client[j], level, trace_flag);
    }
    free(unique_client);
 }
 
 /*
- * setdebug level=nn all
+ * setdebug level=nn all trace=1/0
  */
-static int setdebugcmd(UAContext *ua, char *cmd)
+static int setdebug_cmd(UAContext *ua, const char *cmd)
 {
    STORE *store;
    CLIENT *client;
    int level;
+   int trace_flag = -1;
    int i;
 
    if (!open_db(ua)) {
@@ -1089,67 +814,73 @@ static int setdebugcmd(UAContext *ua, char *cmd)
    Dmsg1(120, "setdebug:%s:\n", cmd);
 
    level = -1;
-   for (i=1; i<ua->argc; i++) {
-      if (strcasecmp(ua->argk[i], _("level")) == 0 && ua->argv[i]) {
-	 level = atoi(ua->argv[i]);
-	 break;
-      }
+   i = find_arg_with_value(ua, "level");
+   if (i >= 0) {
+      level = atoi(ua->argv[i]);
    }
    if (level < 0) {
-      if (!get_cmd(ua, _("Enter new debug level: "))) {
-	 return 1;
+      if (!get_pint(ua, _("Enter new debug level: "))) {
+         return 1;
       }
-      level = atoi(ua->cmd);
+      level = ua->pint32_val;
    }
-   if (level < 0) {
-      bsendmsg(ua, _("level cannot be negative.\n"));
-      return 1;
+
+   /* Look for trace flag. -1 => not change */
+   i = find_arg_with_value(ua, "trace");
+   if (i >= 0) {
+      trace_flag = atoi(ua->argv[i]);
+      if (trace_flag > 0) {
+         trace_flag = 1;
+      }
    }
 
    /* General debug? */
    for (i=1; i<ua->argc; i++) {
-      if (strcasecmp(ua->argk[i], _("all")) == 0) {
-	 do_all_setdebug(ua, level);
-	 return 1;
+      if (strcasecmp(ua->argk[i], "all") == 0) {
+         do_all_setdebug(ua, level, trace_flag);
+         return 1;
       }
-      if (strcasecmp(ua->argk[i], _("dir")) == 0 ||
-          strcasecmp(ua->argk[i], _("director")) == 0) {
-	 debug_level = level;
-	 return 1;
+      if (strcasecmp(ua->argk[i], "dir") == 0 ||
+          strcasecmp(ua->argk[i], "director") == 0) {
+         debug_level = level;
+         set_trace(trace_flag);
+         return 1;
       }
-      if (strcasecmp(ua->argk[i], _("client")) == 0) {
-	 client = NULL;
-	 if (ua->argv[i]) {
-	    client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
-	    if (client) {
-	       do_client_setdebug(ua, client, level);
-	       return 1;
-	    }
-	 }
-	 client = select_client_resource(ua);	
-	 if (client) {
-	    do_client_setdebug(ua, client, level);
-	    return 1;
-	 }
+      if (strcasecmp(ua->argk[i], "client") == 0 ||
+          strcasecmp(ua->argk[i], "fd") == 0) {
+         client = NULL;
+         if (ua->argv[i]) {
+            client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
+            if (client) {
+               do_client_setdebug(ua, client, level, trace_flag);
+               return 1;
+            }
+         }
+         client = select_client_resource(ua);
+         if (client) {
+            do_client_setdebug(ua, client, level, trace_flag);
+            return 1;
+         }
       }
 
-      if (strcasecmp(ua->argk[i], _("store")) == 0 ||
-          strcasecmp(ua->argk[i], _("storage")) == 0) {
-	 store = NULL;
-	 if (ua->argv[i]) {
-	    store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
-	    if (store) {
-	       do_storage_setdebug(ua, store, level);
-	       return 1;
-	    }
-	 }
-	 store = get_storage_resource(ua, 0);
-	 if (store) {
-	    do_storage_setdebug(ua, store, level);
-	    return 1;
-	 }
+      if (strcasecmp(ua->argk[i], NT_("store")) == 0 ||
+          strcasecmp(ua->argk[i], NT_("storage")) == 0 ||
+          strcasecmp(ua->argk[i], NT_("sd")) == 0) {
+         store = NULL;
+         if (ua->argv[i]) {
+            store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
+            if (store) {
+               do_storage_setdebug(ua, store, level, trace_flag);
+               return 1;
+            }
+         }
+         store = get_storage_resource(ua, false/*no default*/);
+         if (store) {
+            do_storage_setdebug(ua, store, level, trace_flag);
+            return 1;
+         }
       }
-   } 
+   }
    /*
     * We didn't find an appropriate keyword above, so
     * prompt the user.
@@ -1159,35 +890,195 @@ static int setdebugcmd(UAContext *ua, char *cmd)
    add_prompt(ua, _("Storage"));
    add_prompt(ua, _("Client"));
    add_prompt(ua, _("All"));
-   switch(do_prompt(ua, _("Select daemon type to set debug level"), NULL, 0)) {
-      case 0:			      /* Director */
-	 debug_level = level;
-	 break;
-      case 1:
-	 store = get_storage_resource(ua, 0);
-	 if (store) {
-	    do_storage_setdebug(ua, store, level);
-	 }
-	 break;
-      case 2:
-	 client = select_client_resource(ua);
-	 if (client) {
-	    do_client_setdebug(ua, client, level);
-	 }
-	 break;
-      case 3:
-	 do_all_setdebug(ua, level);
-	 break;
-      default:
-	 break;
+   switch(do_prompt(ua, "", _("Select daemon type to set debug level"), NULL, 0)) {
+   case 0:                         /* Director */
+      debug_level = level;
+      set_trace(trace_flag);
+      break;
+   case 1:
+      store = get_storage_resource(ua, false/*no default*/);
+      if (store) {
+         do_storage_setdebug(ua, store, level, trace_flag);
+      }
+      break;
+   case 2:
+      client = select_client_resource(ua);
+      if (client) {
+         do_client_setdebug(ua, client, level, trace_flag);
+      }
+      break;
+   case 3:
+      do_all_setdebug(ua, level, trace_flag);
+      break;
+   default:
+      break;
    }
    return 1;
 }
 
+/*
+ * Turn debug tracing to file on/off
+ */
+static int trace_cmd(UAContext *ua, const char *cmd)
+{
+   char *onoff;
+
+   if (ua->argc != 2) {
+      if (!get_cmd(ua, _("Turn on or off? "))) {
+            return 1;
+      }
+      onoff = ua->cmd;
+   } else {
+      onoff = ua->argk[1];
+   }
+
+   set_trace((strcasecmp(onoff, NT_("off")) == 0) ? false : true);
+   return 1;
+
+}
+
+static int var_cmd(UAContext *ua, const char *cmd)
+{
+   POOLMEM *val = get_pool_memory(PM_FNAME);
+   char *var;
+
+   if (!open_db(ua)) {
+      return 1;
+   }
+   for (var=ua->cmd; *var != ' '; ) {    /* skip command */
+      var++;
+   }
+   while (*var == ' ') {                 /* skip spaces */
+      var++;
+   }
+   Dmsg1(100, "Var=%s:\n", var);
+   variable_expansion(ua->jcr, var, &val);
+   bsendmsg(ua, "%s\n", val);
+   free_pool_memory(val);
+   return 1;
+}
+
+static int estimate_cmd(UAContext *ua, const char *cmd)
+{
+   JOB *job = NULL;
+   CLIENT *client = NULL;
+   FILESET *fileset = NULL;
+   int listing = 0;
+   char since[MAXSTRING];
+   JCR *jcr = ua->jcr;
+
+   jcr->JobLevel = L_FULL;
+   for (int i=1; i<ua->argc; i++) {
+      if (strcasecmp(ua->argk[i], NT_("client")) == 0 ||
+          strcasecmp(ua->argk[i], NT_("fd")) == 0) {
+         if (ua->argv[i]) {
+            client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
+            continue;
+         }
+      }
+      if (strcasecmp(ua->argk[i], NT_("job")) == 0) {
+         if (ua->argv[i]) {
+            job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
+            continue;
+         }
+      }
+      if (strcasecmp(ua->argk[i], NT_("fileset")) == 0) {
+         if (ua->argv[i]) {
+            fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]);
+            continue;
+         }
+      }
+      if (strcasecmp(ua->argk[i], NT_("listing")) == 0) {
+         listing = 1;
+         continue;
+      }
+      if (strcasecmp(ua->argk[i], NT_("level")) == 0) {
+         if (!get_level_from_name(ua->jcr, ua->argv[i])) {
+            bsendmsg(ua, _("Level %s not valid.\n"), ua->argv[i]);
+         }
+         continue;
+      }
+   }
+   if (!job && !(client && fileset)) {
+      if (!(job = select_job_resource(ua))) {
+         return 1;
+      }
+   }
+   if (!job) {
+      job = (JOB *)GetResWithName(R_JOB, ua->argk[1]);
+      if (!job) {
+         bsendmsg(ua, _("No job specified.\n"));
+         return 1;
+      }
+   }
+   if (!client) {
+      client = job->client;
+   }
+   if (!fileset) {
+      fileset = job->fileset;
+   }
+   jcr->client = client;
+   jcr->fileset = fileset;
+   close_db(ua);
+   ua->catalog = client->catalog;
+
+   if (!open_db(ua)) {
+      return 1;
+   }
+
+   jcr->job = job;
+   jcr->JobType = JT_BACKUP;
+   init_jcr_job_record(jcr);
+
+   if (!get_or_create_client_record(jcr)) {
+      return 1;
+   }
+   if (!get_or_create_fileset_record(jcr)) {
+      return 1;
+   }
+
+   get_level_since_time(ua->jcr, since, sizeof(since));
+
+   bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
+      job->client->hdr.name, job->client->address, job->client->FDport);
+   if (!connect_to_file_daemon(jcr, 1, 15, 0)) {
+      bsendmsg(ua, _("Failed to connect to Client.\n"));
+      return 1;
+   }
+
+   if (!send_include_list(jcr)) {
+      bsendmsg(ua, _("Error sending include list.\n"));
+      goto bail_out;
+   }
+
+   if (!send_exclude_list(jcr)) {
+      bsendmsg(ua, _("Error sending exclude list.\n"));
+      goto bail_out;
+   }
+
+   if (!send_level_command(jcr)) {
+      goto bail_out;
+   }
+
+   bnet_fsend(jcr->file_bsock, "estimate listing=%d\n", listing);
+   while (bnet_recv(jcr->file_bsock) >= 0) {
+      bsendmsg(ua, "%s", jcr->file_bsock->msg);
+   }
+
+bail_out:
+   if (jcr->file_bsock) {
+      bnet_sig(jcr->file_bsock, BNET_TERMINATE);
+      bnet_close(jcr->file_bsock);
+      jcr->file_bsock = NULL;
+   }
+   return 1;
+}
+
+
 /*
  * print time
  */
-static int timecmd(UAContext *ua, char *cmd)
+static int time_cmd(UAContext *ua, const char *cmd)
 {
    char sdt[50];
    time_t ttime = time(NULL);
@@ -1198,159 +1089,284 @@ static int timecmd(UAContext *ua, char *cmd)
    return 1;
 }
 
+/*
+ * reload the conf file
+ */
+extern "C" void reload_config(int sig);
 
+static int reload_cmd(UAContext *ua, const char *cmd)
+{
+   reload_config(1);
+   return 1;
+}
 
 /*
  * Delete Pool records (should purge Media with it).
  *
  *  delete pool=<pool-name>
- *  delete media pool=<pool-name> volume=<name>
+ *  delete volume pool=<pool-name> volume=<name>
+ *  delete jobid=xxx
  */
-static int deletecmd(UAContext *ua, char *cmd)
+static int delete_cmd(UAContext *ua, const char *cmd)
 {
-   static char *keywords[] = {
-      N_("volume"),
-      N_("pool"),
+   static const char *keywords[] = {
+      NT_("volume"),
+      NT_("pool"),
+      NT_("jobid"),
       NULL};
 
    if (!open_db(ua)) {
       return 1;
    }
 
+   switch (find_arg_keyword(ua, keywords)) {
+   case 0:
+      delete_volume(ua);
+      return 1;
+   case 1:
+      delete_pool(ua);
+      return 1;
+   case 2:
+      int i;
+      while ((i=find_arg(ua, "jobid")) > 0) {
+         delete_job(ua);
+         *ua->argk[i] = 0;         /* zap keyword already visited */
+      }
+      return 1;
+   default:
+      break;
+   }
+
    bsendmsg(ua, _(
 "In general it is not a good idea to delete either a\n"
 "Pool or a Volume since they may contain data.\n\n"));
-     
-   switch (find_arg_keyword(ua, keywords)) {
-      case 0:
-	 delete_volume(ua);	
-	 return 1;
-      case 1:
-	 delete_pool(ua);
-	 return 1;
-      default:
-	 break;
-   }
+
    switch (do_keyword_prompt(ua, _("Choose catalog item to delete"), keywords)) {
-      case 0:
-	 delete_volume(ua);
-	 break;
-      case 1:
-	 delete_pool(ua);
-	 break;
-      default:
-         bsendmsg(ua, _("Nothing done.\n"));
-	 break;
+   case 0:
+      delete_volume(ua);
+      break;
+   case 1:
+      delete_pool(ua);
+      break;
+   case 2:
+      delete_job(ua);
+      return 1;
+   default:
+      bsendmsg(ua, _("Nothing done.\n"));
+      break;
    }
    return 1;
 }
 
+
+/*
+ * delete_job has been modified to parse JobID lists like the
+ * following:
+ * delete JobID=3,4,6,7-11,14
+ *
+ * Thanks to Phil Stracchino for the above addition.
+ */
+
+static void delete_job(UAContext *ua)
+{
+   JobId_t JobId;
+   char *s,*sep,*tok;
+
+   int i = find_arg_with_value(ua, NT_("jobid"));
+   if (i >= 0) {
+      if (strchr(ua->argv[i], ',') != NULL || strchr(ua->argv[i], '-') != NULL) {
+        s = bstrdup(ua->argv[i]);
+        tok = s;
+        /*
+         * We could use strtok() here.  But we're not going to, because:
+         * (a) strtok() is deprecated, having been replaced by strsep();
+         * (b) strtok() is broken in significant ways.
+         * we could use strsep() instead, but it's not universally available.
+         * so we grow our own using strchr().
+         */
+        sep = strchr(tok, ',');
+        while (sep != NULL) {
+           *sep = '\0';
+           if (strchr(tok, '-')) {
+               delete_job_id_range(ua, tok);
+           } else {
+              JobId = str_to_int64(tok);
+              do_job_delete(ua, JobId);
+           }
+           tok = ++sep;
+           sep = strchr(tok, ',');
+        }
+        /* pick up the last token */
+        if (strchr(tok, '-')) {
+            delete_job_id_range(ua, tok);
+        } else {
+            JobId = str_to_int64(tok);
+            do_job_delete(ua, JobId);
+        }
+
+         free(s);
+      } else {
+         JobId = str_to_int64(ua->argv[i]);
+        do_job_delete(ua, JobId);
+      }
+   } else if (!get_pint(ua, _("Enter JobId to delete: "))) {
+      return;
+   } else {
+      JobId = ua->int64_val;
+      do_job_delete(ua, JobId);
+   }
+}
+
 /*
- * Delete media records from database -- dangerous 
+ * we call delete_job_id_range to parse range tokens and iterate over ranges
+ */
+static void delete_job_id_range(UAContext *ua, char *tok)
+{
+   char *tok2;
+   JobId_t j,j1,j2;
+
+   tok2 = strchr(tok, '-');
+   *tok2 = '\0';
+   tok2++;
+   j1 = str_to_int64(tok);
+   j2 = str_to_int64(tok2);
+   for (j=j1; j<=j2; j++) {
+      do_job_delete(ua, j);
+   }
+}
+
+/*
+ * do_job_delete now performs the actual delete operation atomically
+ * we always return 1 because C++ is pissy about void functions
+ */
+
+static void do_job_delete(UAContext *ua, JobId_t JobId)
+{
+   POOLMEM *query = get_pool_memory(PM_MESSAGE);
+   char ed1[50];
+
+   Mmsg(query, "DELETE FROM Job WHERE JobId=%s", edit_int64(JobId, ed1));
+   db_sql_query(ua->db, query, NULL, (void *)NULL);
+   Mmsg(query, "DELETE FROM MAC WHERE JobId=%s", ed1);
+   db_sql_query(ua->db, query, NULL, (void *)NULL);
+   Mmsg(query, "DELETE FROM File WHERE JobId=%s", ed1);
+   db_sql_query(ua->db, query, NULL, (void *)NULL);
+   Mmsg(query, "DELETE FROM JobMedia WHERE JobId=%s", ed1);
+   db_sql_query(ua->db, query, NULL, (void *)NULL);
+   free_pool_memory(query);
+   bsendmsg(ua, _("Job %s and associated records deleted from the catalog.\n"), edit_int64(JobId, ed1));
+}
+
+/*
+ * Delete media records from database -- dangerous
  */
 static int delete_volume(UAContext *ua)
 {
-   POOL_DBR pr;
    MEDIA_DBR mr;
 
-   if (!select_pool_and_media_dbr(ua, &pr, &mr)) {
+   if (!select_media_dbr(ua, &mr)) {
       return 1;
    }
    bsendmsg(ua, _("\nThis command will delete volume %s\n"
       "and all Jobs saved on that volume from the Catalog\n"),
       mr.VolumeName);
 
-   if (!get_cmd(ua, _("Are you sure you want to delete this Volume? (yes/no): "))) {
+   if (!get_yesno(ua, _("Are you sure you want to delete this Volume? (yes/no): "))) {
       return 1;
    }
-   if (strcasecmp(ua->cmd, _("yes")) == 0) {
+   if (ua->pint32_val) {
       db_delete_media_record(ua->jcr, ua->db, &mr);
    }
    return 1;
 }
 
 /*
- * Delete a pool record from the database -- dangerous	 
+ * Delete a pool record from the database -- dangerous
  */
 static int delete_pool(UAContext *ua)
 {
    POOL_DBR  pr;
-   
+
    memset(&pr, 0, sizeof(pr));
 
    if (!get_pool_dbr(ua, &pr)) {
       return 1;
    }
-   if (!get_cmd(ua, _("Are you sure you want to delete this Pool? (yes/no): "))) {
+   if (!get_yesno(ua, _("Are you sure you want to delete this Pool? (yes/no): "))) {
       return 1;
    }
-   if (strcasecmp(ua->cmd, _("yes")) == 0) {
+   if (ua->pint32_val) {
       db_delete_pool_record(ua->jcr, ua->db, &pr);
    }
    return 1;
 }
 
 
-static void do_mount_cmd(int mount, UAContext *ua, char *cmd)
+static void do_mount_cmd(UAContext *ua, const char *command)
 {
    STORE *store;
    BSOCK *sd;
+   JCR *jcr = ua->jcr;
    char dev_name[MAX_NAME_LENGTH];
-
+   int drive;
 
    if (!open_db(ua)) {
       return;
    }
-   Dmsg1(120, "mount: %s\n", ua->UA_sock->msg);
+   Dmsg2(120, "%s: %s\n", command, ua->UA_sock->msg);
 
-   store = get_storage_resource(ua, 1);
+   store = get_storage_resource(ua, true/*arg is storage*/);
    if (!store) {
       return;
    }
+   set_storage(jcr, store);
+   drive = get_storage_drive(ua, store);
 
-   Dmsg2(120, "Found storage, MediaType=%s DevName=%s\n",
-      store->media_type, store->dev_name);
+   Dmsg3(120, "Found storage, MediaType=%s DevName=%s drive=%d\n",
+      store->media_type, store->dev_name(), drive);
 
-   ua->jcr->store = store;
-   if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
+   if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
       bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
       return;
    }
-   sd = ua->jcr->store_bsock;
-   strcpy(dev_name, store->dev_name);
+   sd = jcr->store_bsock;
+   bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
    bash_spaces(dev_name);
-   if (mount) {
-      bnet_fsend(sd, "mount %s", dev_name);
-   } else {
-      bnet_fsend(sd, "unmount %s", dev_name);
-   }
+   bnet_fsend(sd, "%s %s drive=%d", command, dev_name, drive);
    while (bnet_recv(sd) >= 0) {
       bsendmsg(ua, "%s", sd->msg);
-      if (strncmp(sd->msg, "3001 OK mount.", 14) == 0) {
-	  /***** ****FIXME**** fix JobStatus */
-      }
    }
    bnet_sig(sd, BNET_TERMINATE);
    bnet_close(sd);
-   ua->jcr->store_bsock = NULL;
+   jcr->store_bsock = NULL;
 }
 
 /*
- * mount [storage | device] <name>
+ * mount [storage=<name>] [drive=nn]
  */
-static int mountcmd(UAContext *ua, char *cmd)
+static int mount_cmd(UAContext *ua, const char *cmd)
 {
-   do_mount_cmd(1, ua, cmd);	      /* mount */
+   do_mount_cmd(ua, "mount");          /* mount */
    return 1;
 }
 
 
 /*
- * unmount [storage | device] <name>
+ * unmount [storage=<name>] [drive=nn]
  */
-static int unmountcmd(UAContext *ua, char *cmd)
+static int unmount_cmd(UAContext *ua, const char *cmd)
 {
-   do_mount_cmd(0, ua, cmd);	      /* unmount */
+   do_mount_cmd(ua, "unmount");          /* unmount */
+   return 1;
+}
+
+
+/*
+ * release [storage=<name>] [drive=nn]
+ */
+static int release_cmd(UAContext *ua, const char *cmd)
+{
+   do_mount_cmd(ua, "release");          /* release */
    return 1;
 }
 
@@ -1359,12 +1375,12 @@ static int unmountcmd(UAContext *ua, char *cmd)
  * Switch databases
  *   use catalog=<name>
  */
-static int usecmd(UAContext *ua, char *cmd)
+static int use_cmd(UAContext *ua, const char *cmd)
 {
    CAT *oldcatalog, *catalog;
 
 
-   close_db(ua);		      /* close any previously open db */
+   close_db(ua);                      /* close any previously open db */
    oldcatalog = ua->catalog;
 
    if (!(catalog = get_catalog_resource(ua))) {
@@ -1374,33 +1390,198 @@ static int usecmd(UAContext *ua, char *cmd)
    }
    if (open_db(ua)) {
       bsendmsg(ua, _("Using Catalog name=%s DB=%s\n"),
-	 ua->catalog->hdr.name, ua->catalog->db_name);
+         ua->catalog->hdr.name, ua->catalog->db_name);
    }
    return 1;
 }
 
-int quitcmd(UAContext *ua, char *cmd) 
+int quit_cmd(UAContext *ua, const char *cmd)
 {
    ua->quit = TRUE;
    return 1;
 }
 
-static int helpcmd(UAContext *ua, char *cmd)
+/* Handler to get job status */
+static int status_handler(void *ctx, int num_fields, char **row)
+{
+   char *val = (char *)ctx;
+
+   if (row[0]) {
+      *val = row[0][0];
+   } else {
+      *val = '?';               /* Unknown by default */
+   }
+
+   return 0;
+}
+
+/*
+ * Wait until no job is running
+ */
+int wait_cmd(UAContext *ua, const char *cmd)
+{
+   JCR *jcr;
+
+   /* no args
+    * Wait until no job is running
+    */
+   if (ua->argc == 1) {
+      bmicrosleep(0, 200000);            /* let job actually start */
+      for (bool running=true; running; ) {
+         running = false;
+         foreach_jcr(jcr) {
+            if (jcr->JobId != 0) {
+               running = true;
+               break;
+            }
+         }
+         endeach_jcr(jcr);
+
+         if (running) {
+            bmicrosleep(1, 0);
+         }
+      }
+      return 1;
+   }
+
+   /* we have jobid, jobname or ujobid argument */
+
+   uint32_t jobid = 0 ;
+
+   if (!open_db(ua)) {
+      bsendmsg(ua, _("ERR: Can't open db\n")) ;
+      return 1;
+   }
+
+   for (int i=1; i<ua->argc; i++) {
+      if (strcasecmp(ua->argk[i], "jobid") == 0) {
+         if (!ua->argv[i]) {
+            break;
+         }
+         jobid = str_to_int64(ua->argv[i]);
+         break;
+      } else if (strcasecmp(ua->argk[i], "jobname") == 0 ||
+                 strcasecmp(ua->argk[i], "job") == 0) {
+         if (!ua->argv[i]) {
+            break;
+         }
+         jcr=get_jcr_by_partial_name(ua->argv[i]) ;
+         if (jcr) {
+            jobid = jcr->JobId ;
+            free_jcr(jcr);
+         }
+         break;
+      } else if (strcasecmp(ua->argk[i], "ujobid") == 0) {
+         if (!ua->argv[i]) {
+            break;
+         }
+         jcr=get_jcr_by_full_name(ua->argv[i]) ;
+         if (jcr) {
+            jobid = jcr->JobId ;
+            free_jcr(jcr);
+         }
+         break;
+      }
+   }
+
+   if (jobid == 0) {
+      bsendmsg(ua, _("ERR: Job was not found\n"));
+      return 1 ;
+   }
+
+   /*
+    * We wait the end of job
+    */
+
+   bmicrosleep(0, 200000);            /* let job actually start */
+   for (bool running=true; running; ) {
+      running = false;
+
+      jcr=get_jcr_by_id(jobid) ;
+
+      if (jcr) {
+         running = true ;
+         free_jcr(jcr);
+      }
+
+      if (running) {
+         bmicrosleep(1, 0);
+      }
+   }
+
+   /*
+    * We have to get JobStatus
+    */
+
+   int status ;
+   char jobstatus = '?';        /* Unknown by default */
+   char buf[256] ;
+
+   bsnprintf(buf, sizeof(buf),
+             "SELECT JobStatus FROM Job WHERE JobId='%i'", jobid);
+
+
+   db_sql_query(ua->db, buf,
+                status_handler, (void *)&jobstatus);
+
+   switch (jobstatus) {
+   case JS_Error:
+      status = 1 ;         /* Warning */
+      break;
+
+   case JS_FatalError:
+   case JS_ErrorTerminated:
+   case JS_Canceled:
+      status = 2 ;         /* Critical */
+      break;
+
+   case JS_Terminated:
+      status = 0 ;         /* Ok */
+      break;
+
+   default:
+      status = 3 ;         /* Unknown */
+      break;
+   }
+
+   bsendmsg(ua, "JobId=%i\n", jobid) ;
+   bsendmsg(ua, "JobStatus=%s (%c)\n", 
+            job_status_to_str(jobstatus), 
+            jobstatus) ;
+
+   if (ua->gui) {
+      bsendmsg(ua, "ExitStatus=%i\n", status) ;
+   }
+
+   return 1;
+}
+
+
+static int help_cmd(UAContext *ua, const char *cmd)
 {
    unsigned int i;
 
-/* usage(); */
    bsendmsg(ua, _("  Command    Description\n  =======    ===========\n"));
    for (i=0; i<comsize; i++) {
       bsendmsg(ua, _("  %-10s %s\n"), _(commands[i].key), _(commands[i].help));
    }
-   bsendmsg(ua, "\n");
+   bsendmsg(ua, _("\nWhen at a prompt, entering a period cancels the command.\n\n"));
+   return 1;
+}
+
+int qhelp_cmd(UAContext *ua, const char *cmd)
+{
+   unsigned int i;
+
+   for (i=0; i<comsize; i++) {
+      bsendmsg(ua, "%s %s\n", commands[i].key, _(commands[i].help));
+   }
    return 1;
 }
 
-static int versioncmd(UAContext *ua, char *cmd)
+static int version_cmd(UAContext *ua, const char *cmd)
 {
-   bsendmsg(ua, "%s Version: " VERSION " (" BDATE ")\n", my_name);
+   bsendmsg(ua, _("%s Version: %s (%s)\n"), my_name, VERSION, BDATE);
    return 1;
 }
 
@@ -1409,44 +1590,56 @@ static int versioncmd(UAContext *ua, char *cmd)
  * a "use catalog xxx" command, we simply find the first
  * catalog resource and open it.
  */
-int open_db(UAContext *ua)
+bool open_db(UAContext *ua)
 {
    if (ua->db) {
-      return 1;
+      return true;
    }
    if (!ua->catalog) {
       LockRes();
       ua->catalog = (CAT *)GetNextRes(R_CATALOG, NULL);
       UnlockRes();
-      if (!ua->catalog) {    
+      if (!ua->catalog) {
          bsendmsg(ua, _("Could not find a Catalog resource\n"));
-	 return 0;
+         return false;
+      } else if (!acl_access_ok(ua, Catalog_ACL, ua->catalog->hdr.name)) {
+         bsendmsg(ua, _("You must specify a \"use <catalog-name>\" command before continuing.\n"));
+         ua->catalog = NULL;
+         return false;
       } else {
-         bsendmsg(ua, _("Using default Catalog name=%s DB=%s\n"), 
-	    ua->catalog->hdr.name, ua->catalog->db_name);
+         bsendmsg(ua, _("Using default Catalog name=%s DB=%s\n"),
+            ua->catalog->hdr.name, ua->catalog->db_name);
       }
    }
 
+   ua->jcr->catalog = ua->catalog;
+
    Dmsg0(150, "Open database\n");
    ua->db = db_init_database(ua->jcr, ua->catalog->db_name, ua->catalog->db_user,
-			     ua->catalog->db_password, ua->catalog->db_address,
-			     ua->catalog->db_port, ua->catalog->db_socket);
-   if (!db_open_database(ua->jcr, ua->db)) {
-      bsendmsg(ua, _("Could not open DB %s: ERR=%s"), 
-	 ua->catalog->db_name, db_strerror(ua->db));
+                             ua->catalog->db_password, ua->catalog->db_address,
+                             ua->catalog->db_port, ua->catalog->db_socket,
+                             ua->catalog->mult_db_connections);
+   if (!ua->db || !db_open_database(ua->jcr, ua->db)) {
+      bsendmsg(ua, _("Could not open database \"%s\".\n"),
+                 ua->catalog->db_name);
+      if (ua->db) {
+         bsendmsg(ua, "%s", db_strerror(ua->db));
+      }
       close_db(ua);
-      return 0;
+      return false;
    }
    ua->jcr->db = ua->db;
    Dmsg1(150, "DB %s opened\n", ua->catalog->db_name);
-   return 1;
+   return true;
 }
 
 void close_db(UAContext *ua)
 {
    if (ua->db) {
       db_close_database(ua->jcr, ua->db);
+      ua->db = NULL;
+      if (ua->jcr) {
+         ua->jcr->db = NULL;
+      }
    }
-   ua->db = NULL;
-   ua->jcr->db = NULL;
 }