*   1. The generic lexical scanner in lib/lex.c and lib/lex.h
  *
  *   2. The generic config  scanner in lib/parse_config.c and 
- *     lib/parse_config.h.
- *     These files contain the parser code, some utility
- *     routines, and the common store routines (name, int,
- *     string).
+ *      lib/parse_config.h.
+ *      These files contain the parser code, some utility
+ *      routines, and the common store routines (name, int,
+ *      string).
  *
  *   3. The daemon specific file, which contains the Resource
- *     definitions as well as any specific store routines
- *     for the resource records.
+ *      definitions as well as any specific store routines
+ *      for the resource records.
  *
  *     Kern Sibbald, January MM
  *
 /* 
  *    Director Resource
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 static struct res_items dir_items[] = {
    {"name",        store_name,     ITEM(res_dir.hdr.name), 0, ITEM_REQUIRED, 0},
 /* 
  *    Console Resource
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 static struct res_items con_items[] = {
    {"name",        store_name,     ITEM(res_con.hdr.name), 0, ITEM_REQUIRED, 0},
 /* 
  *    Client or File daemon resource
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 
 static struct res_items cli_items[] = {
 
 /* Storage daemon resource
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 static struct res_items store_items[] = {
    {"name",      store_name,     ITEM(res_store.hdr.name),   0, ITEM_REQUIRED, 0},
 /* 
  *    Catalog Resource Directives
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 static struct res_items cat_items[] = {
    {"name",     store_name,     ITEM(res_cat.hdr.name),    0, ITEM_REQUIRED, 0},
 /* 
  *    Job Resource Directives
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 static struct res_items job_items[] = {
    {"name",     store_name,    ITEM(res_job.hdr.name), 0, ITEM_REQUIRED, 0},
 
 /* FileSet resource
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 static struct res_items fs_items[] = {
    {"name",        store_name, ITEM(res_fs.hdr.name), 0, ITEM_REQUIRED, 0},
    {"finclude",    store_finc, NULL,                  0, ITEM_NO_EQUALS, 0},
    {"exclude",     store_inc,  NULL,                  1, 0, 0},
    {"fexclude",    store_finc, NULL,                  1, ITEM_NO_EQUALS, 0},
-   {NULL,         NULL,       NULL,                  0, 0, 0} 
+   {NULL,          NULL,       NULL,                  0, 0, 0} 
 };
 
 /* Schedule -- see run_conf.c */
 /* Schedule
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 static struct res_items sch_items[] = {
    {"name",     store_name,  ITEM(res_sch.hdr.name), 0, ITEM_REQUIRED, 0},
 
 /* Group resource -- not implemented
  *
- *   name         handler     value                 code flags    default_value
+ *   name          handler     value                 code flags    default_value
  */
 static struct res_items group_items[] = {
    {"name",        store_name, ITEM(res_group.hdr.name), 0, ITEM_REQUIRED, 0},
 
 /* Pool resource
  *
- *   name            handler     value                        code flags default_value
+ *   name             handler     value                        code flags default_value
  */
 static struct res_items pool_items[] = {
    {"name",            store_name,    ITEM(res_pool.hdr.name),      0, ITEM_REQUIRED, 0},
 
 /* 
  * Counter Resource
- *   name            handler     value                        code flags default_value
+ *   name             handler     value                        code flags default_value
  */
 static struct res_items counter_items[] = {
    {"name",            store_name,    ITEM(res_counter.hdr.name),        0, ITEM_REQUIRED, 0},
    {"description",     store_str,     ITEM(res_counter.hdr.desc),        0, 0,     0},
    {"minimum",         store_int,     ITEM(res_counter.MinValue),        0, ITEM_DEFAULT, 0},
    {"maximum",         store_pint,    ITEM(res_counter.MaxValue),        0, ITEM_DEFAULT, INT32_MAX},
-   {"global",          store_yesno,   ITEM(res_counter.Global),          0, ITEM_DEFAULT, 0},
-   {"wrapcounter",     store_strname, ITEM(res_counter.WrapCounter),     0, 0, 0},
+   {"wrapcounter",     store_res,     ITEM(res_counter.WrapCounter),     R_COUNTER, 0, 0},
+   {"catalog",         store_res,     ITEM(res_counter.Catalog),         R_CATALOG, 0, 0},
    {NULL, NULL, NULL, 0, 0, 0} 
 };
 
  * This is the master resource definition.  
  * It must have one item for each of the resources.
  *
- *  name            items        rcode        res_head
+ *  name             items        rcode        res_head
  */
 struct s_res resources[] = {
    {"director",      dir_items,   R_DIRECTOR,  NULL},
    {"pool",          pool_items,  R_POOL,      NULL},
    {"messages",      msgs_items,  R_MSGS,      NULL},
    {"counter",       counter_items, R_COUNTER, NULL},
-   {NULL,           NULL,        0,           NULL}
+   {NULL,            NULL,        0,           NULL}
 };
 
 
 /* Keywords (RHS) permitted in Job Level records   
  *
- *   level_name      level             job_type
+ *   level_name      level              job_type
  */
 struct s_jl joblevels[] = {
    {"Full",          L_FULL,            JT_BACKUP},
    {"Initcatalog",   L_VERIFY_INIT,     JT_VERIFY},
    {"VolumeToCatalog", L_VERIFY_VOLUME_TO_CATALOG,   JT_VERIFY},
    {"Data",          L_VERIFY_DATA,     JT_VERIFY},
-   {NULL,           0}
+   {NULL,            0}
 };
 
 /* Keywords (RHS) permitted in Job type records   
  *
- *   type_name      job_type
+ *   type_name       job_type
  */
 struct s_jt jobtypes[] = {
    {"backup",        JT_BACKUP},
    {"admin",         JT_ADMIN},
    {"verify",        JT_VERIFY},
    {"restore",       JT_RESTORE},
-   {NULL,           0}
+   {NULL,            0}
 };
 
 
    {"client",        'C'},
    {"fileset",       'F'},
    {"level",         'L'}, 
-   {NULL,           0}
+   {NULL,            0}
 };
 
 /* Keywords (RHS) permitted in Restore records */
    {"where",         'W'},            /* root of restore */
    {"replace",       'R'},            /* replacement options */
    {"bootstrap",     'B'},            /* bootstrap file */
-   {NULL,             0}
+   {NULL,              0}
 };
 
 /* Options permitted in Restore replace= */
    {"ifnewer",        REPLACE_IFNEWER},
    {"ifolder",        REPLACE_IFOLDER},
    {"never",          REPLACE_NEVER},
-   {NULL,              0}
+   {NULL,               0}
 };
 
 char *level_to_str(int level)
    sprintf(level_no, "%d", level);    /* default if not found */
    for (i=0; joblevels[i].level_name; i++) {
       if (level == joblevels[i].level) {
-        str = joblevels[i].level_name;
-        break;
+         str = joblevels[i].level_name;
+         break;
       }
    }
    return str;
       sendit(sock, "No %s resource defined\n", res_to_str(type));
       return;
    }
-   if (type < 0) {                   /* no recursion */
+   if (type < 0) {                    /* no recursion */
       type = - type;
       recurse = 0;
    }
    switch (type) {
-      case R_DIRECTOR:
-        char ed1[30], ed2[30];
-         sendit(sock, "Director: name=%s MaxJobs=%d FDtimeout=%s SDtimeout=%s\n", 
-           reshdr->name, res->res_dir.MaxConcurrentJobs, 
-           edit_uint64(res->res_dir.FDConnectTimeout, ed1),
-           edit_uint64(res->res_dir.SDConnectTimeout, ed2));
-        if (res->res_dir.query_file) {
-            sendit(sock, "   query_file=%s\n", res->res_dir.query_file);
-        }
-        if (res->res_dir.messages) {
-            sendit(sock, "  --> ");
-           dump_resource(-R_MSGS, (RES *)res->res_dir.messages, sendit, sock);
-        }
-        break;
-      case R_CONSOLE:
-         sendit(sock, "Console name=%s SSL=%d\n", 
-           res->res_con.hdr.name, res->res_con.enable_ssl);
-        break;
-      case R_CLIENT:
-         sendit(sock, "Client: name=%s address=%s FDport=%d MaxJobs=%u\n",
-           res->res_client.hdr.name, res->res_client.address, res->res_client.FDport,
-           res->res_client.MaxConcurrentJobs);
-         sendit(sock, "      JobRetention=%" lld " FileRetention=%" lld " AutoPrune=%d\n",
-           res->res_client.JobRetention, res->res_client.FileRetention,
-           res->res_client.AutoPrune);
-        if (res->res_client.catalog) {
-            sendit(sock, "  --> ");
-           dump_resource(-R_CATALOG, (RES *)res->res_client.catalog, sendit, sock);
-        }
-        break;
-      case R_STORAGE:
-         sendit(sock, "Storage: name=%s address=%s SDport=%d MaxJobs=%u\n\
-         DeviceName=%s MediaType=%s\n",
-           res->res_store.hdr.name, res->res_store.address, res->res_store.SDport,
-           res->res_store.MaxConcurrentJobs,
-           res->res_store.dev_name, res->res_store.media_type);
-        break;
-      case R_CATALOG:
-         sendit(sock, "Catalog: name=%s address=%s DBport=%d db_name=%s\n\
-         db_user=%s\n",
-           res->res_cat.hdr.name, NPRT(res->res_cat.db_address),
-           res->res_cat.db_port, res->res_cat.db_name, NPRT(res->res_cat.db_user));
-        break;
-      case R_JOB:
-         sendit(sock, "Job: name=%s JobType=%d level=%s MaxJobs=%u\n", 
-           res->res_job.hdr.name, res->res_job.JobType, 
-           level_to_str(res->res_job.level), res->res_job.MaxConcurrentJobs);
-        if (res->res_job.client) {
-            sendit(sock, "  --> ");
-           dump_resource(-R_CLIENT, (RES *)res->res_job.client, sendit, sock);
-        }
-        if (res->res_job.fileset) {
-            sendit(sock, "  --> ");
-           dump_resource(-R_FILESET, (RES *)res->res_job.fileset, sendit, sock);
-        }
-        if (res->res_job.schedule) {
-            sendit(sock, "  --> ");
-           dump_resource(-R_SCHEDULE, (RES *)res->res_job.schedule, sendit, sock);
-        }
-        if (res->res_job.RestoreWhere) {
-            sendit(sock, "  --> Where=%s\n", NPRT(res->res_job.RestoreWhere));
-        }
-        if (res->res_job.RestoreBootstrap) {
-            sendit(sock, "  --> Bootstrap=%s\n", NPRT(res->res_job.RestoreBootstrap));
-        }
-        if (res->res_job.RunBeforeJob) {
-            sendit(sock, "  --> RunBefore=%s\n", NPRT(res->res_job.RunBeforeJob));
-        }
-        if (res->res_job.RunAfterJob) {
-            sendit(sock, "  --> RunAfter=%s\n", NPRT(res->res_job.RunAfterJob));
-        }
-        if (res->res_job.WriteBootstrap) {
-            sendit(sock, "  --> WriteBootstrap=%s\n", NPRT(res->res_job.WriteBootstrap));
-        }
-        if (res->res_job.storage) {
-            sendit(sock, "  --> ");
-           dump_resource(-R_STORAGE, (RES *)res->res_job.storage, sendit, sock);
-        }
-        if (res->res_job.pool) {
-            sendit(sock, "  --> ");
-           dump_resource(-R_POOL, (RES *)res->res_job.pool, sendit, sock);
-        } else {
-            sendit(sock, "!!! No Pool resource\n");
-        }
-        if (res->res_job.messages) {
-            sendit(sock, "  --> ");
-           dump_resource(-R_MSGS, (RES *)res->res_job.messages, sendit, sock);
-        }
-        break;
-      case R_FILESET:
-         sendit(sock, "FileSet: name=%s\n", res->res_fs.hdr.name);
-        for (int i=0; i<res->res_fs.num_includes; i++) {
-           INCEXE *incexe = res->res_fs.include_items[i];
-           for (int j=0; j<incexe->num_names; j++) {
-               sendit(sock, "      Inc: %s\n", incexe->name_list[j]);
-           }
-        }
-        for (int i=0; i<res->res_fs.num_excludes; i++) {
-           INCEXE *incexe = res->res_fs.exclude_items[i];
-           for (int j=0; j<incexe->num_names; j++) {
-               sendit(sock, "      Exc: %s\n", incexe->name_list[j]);
-           }
-        }
-        break;
-      case R_SCHEDULE:
-        if (res->res_sch.run) {
-           int i;
-           RUN *run = res->res_sch.run;
-           char buf[1000], num[10];
-            sendit(sock, "Schedule: name=%s\n", res->res_sch.hdr.name);
-           if (!run) {
-              break;
-           }
+   case R_DIRECTOR:
+      char ed1[30], ed2[30];
+      sendit(sock, "Director: name=%s MaxJobs=%d FDtimeout=%s SDtimeout=%s\n", 
+         reshdr->name, res->res_dir.MaxConcurrentJobs, 
+         edit_uint64(res->res_dir.FDConnectTimeout, ed1),
+         edit_uint64(res->res_dir.SDConnectTimeout, ed2));
+      if (res->res_dir.query_file) {
+         sendit(sock, "   query_file=%s\n", res->res_dir.query_file);
+      }
+      if (res->res_dir.messages) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_MSGS, (RES *)res->res_dir.messages, sendit, sock);
+      }
+      break;
+   case R_CONSOLE:
+      sendit(sock, "Console: name=%s SSL=%d\n", 
+         res->res_con.hdr.name, res->res_con.enable_ssl);
+      break;
+   case R_COUNTER:
+      sendit(sock, "Counter: name=%s min=%d max=%d\n",
+         res->res_counter.hdr.name, res->res_counter.MinValue, 
+         res->res_counter.MaxValue);
+      if (res->res_counter.Catalog) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_CATALOG, (RES *)res->res_counter.Catalog, sendit, sock);
+      }
+      if (res->res_counter.WrapCounter) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_COUNTER, (RES *)res->res_counter.WrapCounter, sendit, sock);
+      }
+
+
+
+         break;
+   case R_CLIENT:
+      sendit(sock, "Client: name=%s address=%s FDport=%d MaxJobs=%u\n",
+         res->res_client.hdr.name, res->res_client.address, res->res_client.FDport,
+         res->res_client.MaxConcurrentJobs);
+      sendit(sock, "      JobRetention=%" lld " FileRetention=%" lld " AutoPrune=%d\n",
+         res->res_client.JobRetention, res->res_client.FileRetention,
+         res->res_client.AutoPrune);
+      if (res->res_client.catalog) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_CATALOG, (RES *)res->res_client.catalog, sendit, sock);
+      }
+      break;
+   case R_STORAGE:
+      sendit(sock, "Storage: name=%s address=%s SDport=%d MaxJobs=%u\n\
+      DeviceName=%s MediaType=%s\n",
+         res->res_store.hdr.name, res->res_store.address, res->res_store.SDport,
+         res->res_store.MaxConcurrentJobs,
+         res->res_store.dev_name, res->res_store.media_type);
+      break;
+   case R_CATALOG:
+      sendit(sock, "Catalog: name=%s address=%s DBport=%d db_name=%s\n\
+      db_user=%s\n",
+         res->res_cat.hdr.name, NPRT(res->res_cat.db_address),
+         res->res_cat.db_port, res->res_cat.db_name, NPRT(res->res_cat.db_user));
+      break;
+   case R_JOB:
+      sendit(sock, "Job: name=%s JobType=%d level=%s MaxJobs=%u\n", 
+         res->res_job.hdr.name, res->res_job.JobType, 
+         level_to_str(res->res_job.level), res->res_job.MaxConcurrentJobs);
+      if (res->res_job.client) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_CLIENT, (RES *)res->res_job.client, sendit, sock);
+      }
+      if (res->res_job.fileset) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_FILESET, (RES *)res->res_job.fileset, sendit, sock);
+      }
+      if (res->res_job.schedule) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_SCHEDULE, (RES *)res->res_job.schedule, sendit, sock);
+      }
+      if (res->res_job.RestoreWhere) {
+         sendit(sock, "  --> Where=%s\n", NPRT(res->res_job.RestoreWhere));
+      }
+      if (res->res_job.RestoreBootstrap) {
+         sendit(sock, "  --> Bootstrap=%s\n", NPRT(res->res_job.RestoreBootstrap));
+      }
+      if (res->res_job.RunBeforeJob) {
+         sendit(sock, "  --> RunBefore=%s\n", NPRT(res->res_job.RunBeforeJob));
+      }
+      if (res->res_job.RunAfterJob) {
+         sendit(sock, "  --> RunAfter=%s\n", NPRT(res->res_job.RunAfterJob));
+      }
+      if (res->res_job.WriteBootstrap) {
+         sendit(sock, "  --> WriteBootstrap=%s\n", NPRT(res->res_job.WriteBootstrap));
+      }
+      if (res->res_job.storage) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_STORAGE, (RES *)res->res_job.storage, sendit, sock);
+      }
+      if (res->res_job.pool) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_POOL, (RES *)res->res_job.pool, sendit, sock);
+      } else {
+         sendit(sock, "!!! No Pool resource\n");
+      }
+      if (res->res_job.messages) {
+         sendit(sock, "  --> ");
+         dump_resource(-R_MSGS, (RES *)res->res_job.messages, sendit, sock);
+      }
+      break;
+   case R_FILESET:
+      sendit(sock, "FileSet: name=%s\n", res->res_fs.hdr.name);
+      for (int i=0; i<res->res_fs.num_includes; i++) {
+         INCEXE *incexe = res->res_fs.include_items[i];
+         for (int j=0; j<incexe->num_names; j++) {
+            sendit(sock, "      Inc: %s\n", incexe->name_list[j]);
+         }
+      }
+      for (int i=0; i<res->res_fs.num_excludes; i++) {
+         INCEXE *incexe = res->res_fs.exclude_items[i];
+         for (int j=0; j<incexe->num_names; j++) {
+            sendit(sock, "      Exc: %s\n", incexe->name_list[j]);
+         }
+      }
+      break;
+   case R_SCHEDULE:
+      if (res->res_sch.run) {
+         int i;
+         RUN *run = res->res_sch.run;
+         char buf[1000], num[10];
+         sendit(sock, "Schedule: name=%s\n", res->res_sch.hdr.name);
+         if (!run) {
+            break;
+         }
 next_run:
-            sendit(sock, "  --> Run Level=%s\n", level_to_str(run->level));
-            strcpy(buf, "      hour=");
-           for (i=0; i<24; i++) {
-              if (bit_is_set(i, run->hour)) {
-                  sprintf(num, "%d ", i);
-                 strcat(buf, num);
-              }
-           }
-            strcat(buf, "\n");
-           sendit(sock, buf);
-            strcpy(buf, "      mday=");
-           for (i=0; i<31; i++) {
-              if (bit_is_set(i, run->mday)) {
-                  sprintf(num, "%d ", i+1);
-                 strcat(buf, num);
-              }
-           }
-            strcat(buf, "\n");
-           sendit(sock, buf);
-            strcpy(buf, "      month=");
-           for (i=0; i<12; i++) {
-              if (bit_is_set(i, run->month)) {
-                  sprintf(num, "%d ", i+1);
-                 strcat(buf, num);
-              }
-           }
-            strcat(buf, "\n");
-           sendit(sock, buf);
-            strcpy(buf, "      wday=");
-           for (i=0; i<7; i++) {
-              if (bit_is_set(i, run->wday)) {
-                  sprintf(num, "%d ", i+1);
-                 strcat(buf, num);
-              }
-           }
-            strcat(buf, "\n");
-           sendit(sock, buf);
-            strcpy(buf, "      wpos=");
-           for (i=0; i<5; i++) {
-              if (bit_is_set(i, run->wpos)) {
-                  sprintf(num, "%d ", i+1);
-                 strcat(buf, num);
-              }
-           }
-            strcat(buf, "\n");
-           sendit(sock, buf);
-            sendit(sock, "      mins=%d\n", run->minute);
-           if (run->pool) {
-               sendit(sock, "     --> ");
-              dump_resource(-R_POOL, (RES *)run->pool, sendit, sock);
-           }
-           if (run->storage) {
-               sendit(sock, "     --> ");
-              dump_resource(-R_STORAGE, (RES *)run->storage, sendit, sock);
-           }
-           if (run->msgs) {
-               sendit(sock, "     --> ");
-              dump_resource(-R_MSGS, (RES *)run->msgs, sendit, sock);
-           }
-           /* If another Run record is chained in, go print it */
-           if (run->next) {
-              run = run->next;
-              goto next_run;
-           }
-        } else {
-            sendit(sock, "Schedule: name=%s\n", res->res_sch.hdr.name);
-        }
-        break;
-      case R_GROUP:
-         sendit(sock, "Group: name=%s\n", res->res_group.hdr.name);
-        break;
-      case R_POOL:
-         sendit(sock, "Pool: name=%s PoolType=%s\n", res->res_pool.hdr.name,
-                res->res_pool.pool_type);
-         sendit(sock, "      use_cat=%d use_once=%d acpt_any=%d cat_files=%d\n",
-                res->res_pool.use_catalog, res->res_pool.use_volume_once,
-                res->res_pool.accept_any_volume, res->res_pool.catalog_files);
-         sendit(sock, "      max_vols=%d auto_prune=%d VolRetention=%" lld "\n",
-                res->res_pool.max_volumes, res->res_pool.AutoPrune,
-                res->res_pool.VolRetention);
-         sendit(sock, "      recycle=%d LabelFormat=%s\n", res->res_pool.Recycle,
-                NPRT(res->res_pool.label_format));
-         sendit(sock, "      CleaningPrefix=%s\n",
-                NPRT(res->res_pool.cleaning_prefix));
-         sendit(sock, "      recyleOldest=%d MaxVolJobs=%d MaxVolFiles=%d\n",
-                res->res_pool.recycle_oldest_volume, 
-                res->res_pool.MaxVolJobs, res->res_pool.MaxVolFiles);
-        break;
-      case R_MSGS:
-         sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
-        if (res->res_msgs.mail_cmd) 
-            sendit(sock, "      mailcmd=%s\n", res->res_msgs.mail_cmd);
-        if (res->res_msgs.operator_cmd) 
-            sendit(sock, "      opcmd=%s\n", res->res_msgs.operator_cmd);
-        break;
-      default:
-         sendit(sock, "Unknown resource type %d in dump_resource.\n", type);
-        break;
+         sendit(sock, "  --> Run Level=%s\n", level_to_str(run->level));
+         strcpy(buf, "      hour=");
+         for (i=0; i<24; i++) {
+            if (bit_is_set(i, run->hour)) {
+               sprintf(num, "%d ", i);
+               strcat(buf, num);
+            }
+         }
+         strcat(buf, "\n");
+         sendit(sock, buf);
+         strcpy(buf, "      mday=");
+         for (i=0; i<31; i++) {
+            if (bit_is_set(i, run->mday)) {
+               sprintf(num, "%d ", i+1);
+               strcat(buf, num);
+            }
+         }
+         strcat(buf, "\n");
+         sendit(sock, buf);
+         strcpy(buf, "      month=");
+         for (i=0; i<12; i++) {
+            if (bit_is_set(i, run->month)) {
+               sprintf(num, "%d ", i+1);
+               strcat(buf, num);
+            }
+         }
+         strcat(buf, "\n");
+         sendit(sock, buf);
+         strcpy(buf, "      wday=");
+         for (i=0; i<7; i++) {
+            if (bit_is_set(i, run->wday)) {
+               sprintf(num, "%d ", i+1);
+               strcat(buf, num);
+            }
+         }
+         strcat(buf, "\n");
+         sendit(sock, buf);
+         strcpy(buf, "      wpos=");
+         for (i=0; i<5; i++) {
+            if (bit_is_set(i, run->wpos)) {
+               sprintf(num, "%d ", i+1);
+               strcat(buf, num);
+            }
+         }
+         strcat(buf, "\n");
+         sendit(sock, buf);
+         sendit(sock, "      mins=%d\n", run->minute);
+         if (run->pool) {
+            sendit(sock, "     --> ");
+            dump_resource(-R_POOL, (RES *)run->pool, sendit, sock);
+         }
+         if (run->storage) {
+            sendit(sock, "     --> ");
+            dump_resource(-R_STORAGE, (RES *)run->storage, sendit, sock);
+         }
+         if (run->msgs) {
+            sendit(sock, "     --> ");
+            dump_resource(-R_MSGS, (RES *)run->msgs, sendit, sock);
+         }
+         /* If another Run record is chained in, go print it */
+         if (run->next) {
+            run = run->next;
+            goto next_run;
+         }
+      } else {
+         sendit(sock, "Schedule: name=%s\n", res->res_sch.hdr.name);
+      }
+      break;
+   case R_GROUP:
+      sendit(sock, "Group: name=%s\n", res->res_group.hdr.name);
+      break;
+   case R_POOL:
+      sendit(sock, "Pool: name=%s PoolType=%s\n", res->res_pool.hdr.name,
+              res->res_pool.pool_type);
+      sendit(sock, "      use_cat=%d use_once=%d acpt_any=%d cat_files=%d\n",
+              res->res_pool.use_catalog, res->res_pool.use_volume_once,
+              res->res_pool.accept_any_volume, res->res_pool.catalog_files);
+      sendit(sock, "      max_vols=%d auto_prune=%d VolRetention=%" lld "\n",
+              res->res_pool.max_volumes, res->res_pool.AutoPrune,
+              res->res_pool.VolRetention);
+      sendit(sock, "      recycle=%d LabelFormat=%s\n", res->res_pool.Recycle,
+              NPRT(res->res_pool.label_format));
+      sendit(sock, "      CleaningPrefix=%s\n",
+              NPRT(res->res_pool.cleaning_prefix));
+      sendit(sock, "      recyleOldest=%d MaxVolJobs=%d MaxVolFiles=%d\n",
+              res->res_pool.recycle_oldest_volume, 
+              res->res_pool.MaxVolJobs, res->res_pool.MaxVolFiles);
+      break;
+   case R_MSGS:
+      sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
+      if (res->res_msgs.mail_cmd) 
+         sendit(sock, "      mailcmd=%s\n", res->res_msgs.mail_cmd);
+      if (res->res_msgs.operator_cmd) 
+         sendit(sock, "      opcmd=%s\n", res->res_msgs.operator_cmd);
+      break;
+   default:
+      sendit(sock, "Unknown resource type %d in dump_resource.\n", type);
+      break;
    }
    if (recurse && res->res_dir.hdr.next) {
       dump_resource(type, res->res_dir.hdr.next, sendit, sock);
    for (int i=0; i<incexe->num_opts; i++) {
       FOPTS *fopt = incexe->opts_list[i];
       if (fopt->match) {
-        free(fopt->match);
+         free(fopt->match);
       }
       for (int j=0; j<fopt->num_base; j++) {
-        free(fopt->base_list[j]);
+         free(fopt->base_list[j]);
       }
       if (fopt->base_list) {
-        free(fopt->base_list);
+         free(fopt->base_list);
       }
       free(fopt);
    }
    }
 
    switch (type) {
-      case R_DIRECTOR:
-        if (res->res_dir.working_directory) {
-           free(res->res_dir.working_directory);
-        }
-        if (res->res_dir.pid_directory) {
-           free(res->res_dir.pid_directory);
-        }
-        if (res->res_dir.subsys_directory) {
-           free(res->res_dir.subsys_directory);
-        }
-        if (res->res_dir.password) {
-           free(res->res_dir.password);
-        }
-        if (res->res_dir.query_file) {
-           free(res->res_dir.query_file);
-        }
-        if (res->res_dir.DIRaddr) {
-           free(res->res_dir.DIRaddr);
-        }
-        break;
-      case R_CONSOLE:
-        if (res->res_con.password) {
-           free(res->res_con.password);
-        }
-        break;
-      case R_CLIENT:
-        if (res->res_client.address) {
-           free(res->res_client.address);
-        }
-        if (res->res_client.password) {
-           free(res->res_client.password);
-        }
-        break;
-      case R_STORAGE:
-        if (res->res_store.address) {
-           free(res->res_store.address);
-        }
-        if (res->res_store.password) {
-           free(res->res_store.password);
-        }
-        if (res->res_store.media_type) {
-           free(res->res_store.media_type);
-        }
-        if (res->res_store.dev_name) {
-           free(res->res_store.dev_name);
-        }
-        break;
-      case R_CATALOG:
-        if (res->res_cat.db_address) {
-           free(res->res_cat.db_address);
-        }
-        if (res->res_cat.db_socket) {
-           free(res->res_cat.db_socket);
-        }
-        if (res->res_cat.db_user) {
-           free(res->res_cat.db_user);
-        }
-        if (res->res_cat.db_name) {
-           free(res->res_cat.db_name);
-        }
-        if (res->res_cat.db_password) {
-           free(res->res_cat.db_password);
-        }
-        break;
-      case R_FILESET:
-        if ((num=res->res_fs.num_includes)) {
-           while (--num >= 0) {   
-              free_incexe(res->res_fs.include_items[num]);
-           }
-           free(res->res_fs.include_items);
-        }
-        res->res_fs.num_includes = 0;
-        if ((num=res->res_fs.num_excludes)) {
-           while (--num >= 0) {   
-              free_incexe(res->res_fs.exclude_items[num]);
-           }
-           free(res->res_fs.exclude_items);
-        }
-        res->res_fs.num_excludes = 0;
-        break;
-      case R_POOL:
-        if (res->res_pool.pool_type) {
-           free(res->res_pool.pool_type);
-        }
-        if (res->res_pool.label_format) {
-           free(res->res_pool.label_format);
-        }
-        if (res->res_pool.cleaning_prefix) {
-           free(res->res_pool.cleaning_prefix);
-        }
-        break;
-      case R_SCHEDULE:
-        if (res->res_sch.run) {
-           RUN *nrun, *next;
-           nrun = res->res_sch.run;
-           while (nrun) {
-              next = nrun->next;
-              free(nrun);
-              nrun = next;
-           }
-        }
-        break;
-      case R_JOB:
-        if (res->res_job.RestoreWhere) {
-           free(res->res_job.RestoreWhere);
-        }
-        if (res->res_job.RestoreBootstrap) {
-           free(res->res_job.RestoreBootstrap);
-        }
-        if (res->res_job.WriteBootstrap) {
-           free(res->res_job.WriteBootstrap);
-        }
-        if (res->res_job.RunBeforeJob) {
-           free(res->res_job.RunBeforeJob);
-        }
-        if (res->res_job.RunAfterJob) {
-           free(res->res_job.RunAfterJob);
-        }
-        break;
-      case R_MSGS:
-        if (res->res_msgs.mail_cmd)
-           free(res->res_msgs.mail_cmd);
-        if (res->res_msgs.operator_cmd)
-           free(res->res_msgs.operator_cmd);
-        free_msgs_res((MSGS *)res);  /* free message resource */
-        res = NULL;
-        break;
-      case R_GROUP:
-        break;
-      default:
-         printf("Unknown resource type %d in free_resource.\n", type);
+   case R_DIRECTOR:
+      if (res->res_dir.working_directory) {
+         free(res->res_dir.working_directory);
+      }
+      if (res->res_dir.pid_directory) {
+         free(res->res_dir.pid_directory);
+      }
+      if (res->res_dir.subsys_directory) {
+         free(res->res_dir.subsys_directory);
+      }
+      if (res->res_dir.password) {
+         free(res->res_dir.password);
+      }
+      if (res->res_dir.query_file) {
+         free(res->res_dir.query_file);
+      }
+      if (res->res_dir.DIRaddr) {
+         free(res->res_dir.DIRaddr);
+      }
+      break;
+   case R_COUNTER:
+       break;
+   case R_CONSOLE:
+      if (res->res_con.password) {
+         free(res->res_con.password);
+      }
+      break;
+   case R_CLIENT:
+      if (res->res_client.address) {
+         free(res->res_client.address);
+      }
+      if (res->res_client.password) {
+         free(res->res_client.password);
+      }
+      break;
+   case R_STORAGE:
+      if (res->res_store.address) {
+         free(res->res_store.address);
+      }
+      if (res->res_store.password) {
+         free(res->res_store.password);
+      }
+      if (res->res_store.media_type) {
+         free(res->res_store.media_type);
+      }
+      if (res->res_store.dev_name) {
+         free(res->res_store.dev_name);
+      }
+      break;
+   case R_CATALOG:
+      if (res->res_cat.db_address) {
+         free(res->res_cat.db_address);
+      }
+      if (res->res_cat.db_socket) {
+         free(res->res_cat.db_socket);
+      }
+      if (res->res_cat.db_user) {
+         free(res->res_cat.db_user);
+      }
+      if (res->res_cat.db_name) {
+         free(res->res_cat.db_name);
+      }
+      if (res->res_cat.db_password) {
+         free(res->res_cat.db_password);
+      }
+      break;
+   case R_FILESET:
+      if ((num=res->res_fs.num_includes)) {
+         while (--num >= 0) {   
+            free_incexe(res->res_fs.include_items[num]);
+         }
+         free(res->res_fs.include_items);
+      }
+      res->res_fs.num_includes = 0;
+      if ((num=res->res_fs.num_excludes)) {
+         while (--num >= 0) {   
+            free_incexe(res->res_fs.exclude_items[num]);
+         }
+         free(res->res_fs.exclude_items);
+      }
+      res->res_fs.num_excludes = 0;
+      break;
+   case R_POOL:
+      if (res->res_pool.pool_type) {
+         free(res->res_pool.pool_type);
+      }
+      if (res->res_pool.label_format) {
+         free(res->res_pool.label_format);
+      }
+      if (res->res_pool.cleaning_prefix) {
+         free(res->res_pool.cleaning_prefix);
+      }
+      break;
+   case R_SCHEDULE:
+      if (res->res_sch.run) {
+         RUN *nrun, *next;
+         nrun = res->res_sch.run;
+         while (nrun) {
+            next = nrun->next;
+            free(nrun);
+            nrun = next;
+         }
+      }
+      break;
+   case R_JOB:
+      if (res->res_job.RestoreWhere) {
+         free(res->res_job.RestoreWhere);
+      }
+      if (res->res_job.RestoreBootstrap) {
+         free(res->res_job.RestoreBootstrap);
+      }
+      if (res->res_job.WriteBootstrap) {
+         free(res->res_job.WriteBootstrap);
+      }
+      if (res->res_job.RunBeforeJob) {
+         free(res->res_job.RunBeforeJob);
+      }
+      if (res->res_job.RunAfterJob) {
+         free(res->res_job.RunAfterJob);
+      }
+      break;
+   case R_MSGS:
+      if (res->res_msgs.mail_cmd)
+         free(res->res_msgs.mail_cmd);
+      if (res->res_msgs.operator_cmd)
+         free(res->res_msgs.operator_cmd);
+      free_msgs_res((MSGS *)res);  /* free message resource */
+      res = NULL;
+      break;
+   case R_GROUP:
+      break;
+   default:
+      printf("Unknown resource type %d in free_resource.\n", type);
    }
    /* Common stuff again -- free the resource, recurse to next one */
    if (res) {
     */
    for (i=0; items[i].name; i++) {
       if (items[i].flags & ITEM_REQUIRED) {
-           if (!bit_is_set(i, res_all.res_dir.hdr.item_present)) {  
+            if (!bit_is_set(i, res_all.res_dir.hdr.item_present)) {  
                Emsg2(M_ERROR_TERM, 0, "%s item is required in %s resource, but not found.\n",
-                items[i].name, resources[rindex]);
-            }
+                 items[i].name, resources[rindex]);
+             }
       }
       /* If this triggers, take a look at lib/parse_conf.h */
       if (i >= MAX_RES_ITEMS) {
     */
    if (pass == 2) {
       switch (type) {
-        /* Resources not containing a resource */
-        case R_CONSOLE:
-        case R_CATALOG:
-        case R_STORAGE:
-        case R_GROUP:
-        case R_POOL:
-        case R_MSGS:
-        case R_FILESET:
-           break;
-
-        /* Resources containing another resource */
-        case R_DIRECTOR:
-           if ((res = (URES *)GetResWithName(R_DIRECTOR, res_all.res_dir.hdr.name)) == NULL) {
-               Emsg1(M_ERROR_TERM, 0, "Cannot find Director resource %s\n", res_all.res_dir.hdr.name);
-           }
-           res->res_dir.messages = res_all.res_dir.messages;
-           break;
-        case R_JOB:
-           if ((res = (URES *)GetResWithName(R_JOB, res_all.res_dir.hdr.name)) == NULL) {
-               Emsg1(M_ERROR_TERM, 0, "Cannot find Job resource %s\n", res_all.res_dir.hdr.name);
-           }
-           res->res_job.messages = res_all.res_job.messages;
-           res->res_job.schedule = res_all.res_job.schedule;
-           res->res_job.client   = res_all.res_job.client;
-           res->res_job.fileset  = res_all.res_job.fileset;
-           res->res_job.storage  = res_all.res_job.storage;
-           res->res_job.pool     = res_all.res_job.pool;
-           if (res->res_job.JobType == 0) {
-               Emsg1(M_ERROR_TERM, 0, "Job Type not defined for Job resource %s\n", res_all.res_dir.hdr.name);
-           }
-           if (res->res_job.level != 0) {
-              int i;
-              for (i=0; joblevels[i].level_name; i++) {
-                 if (joblevels[i].level == res->res_job.level &&
-                     joblevels[i].job_type == res->res_job.JobType) {
-                    i = 0;
-                    break;
-                 }
-              }
-              if (i != 0) {
-                  Emsg1(M_ERROR_TERM, 0, "Inappropriate level specified in Job resource %s\n", 
-                    res_all.res_dir.hdr.name);
-              }
-           }
-           break;
-        case R_CLIENT:
-           if ((res = (URES *)GetResWithName(R_CLIENT, res_all.res_client.hdr.name)) == NULL) {
-               Emsg1(M_ERROR_TERM, 0, "Cannot find Client resource %s\n", res_all.res_client.hdr.name);
-           }
-           res->res_client.catalog = res_all.res_client.catalog;
-           break;
-        case R_SCHEDULE:
-           /* Schedule is a bit different in that it contains a RUN record
-             * chain which isn't a "named" resource. This chain was linked
-            * in by run_conf.c during pass 2, so here we jam the pointer 
-            * into the Schedule resource.                         
-            */
-           if ((res = (URES *)GetResWithName(R_SCHEDULE, res_all.res_client.hdr.name)) == NULL) {
-               Emsg1(M_ERROR_TERM, 0, "Cannot find Schedule resource %s\n", res_all.res_client.hdr.name);
-           }
-           res->res_sch.run = res_all.res_sch.run;
-           break;
-        default:
-            Emsg1(M_ERROR, 0, "Unknown resource type %d in save_resource.\n", type);
-           error = 1;
-           break;
+      /* Resources not containing a resource */
+      case R_CONSOLE:
+      case R_CATALOG:
+      case R_STORAGE:
+      case R_GROUP:
+      case R_POOL:
+      case R_MSGS:
+      case R_FILESET:
+         break;
+
+      /* Resources containing another resource */
+      case R_DIRECTOR:
+         if ((res = (URES *)GetResWithName(R_DIRECTOR, res_all.res_dir.hdr.name)) == NULL) {
+            Emsg1(M_ERROR_TERM, 0, "Cannot find Director resource %s\n", res_all.res_dir.hdr.name);
+         }
+         res->res_dir.messages = res_all.res_dir.messages;
+         break;
+      case R_JOB:
+         if ((res = (URES *)GetResWithName(R_JOB, res_all.res_dir.hdr.name)) == NULL) {
+            Emsg1(M_ERROR_TERM, 0, "Cannot find Job resource %s\n", res_all.res_dir.hdr.name);
+         }
+         res->res_job.messages = res_all.res_job.messages;
+         res->res_job.schedule = res_all.res_job.schedule;
+         res->res_job.client   = res_all.res_job.client;
+         res->res_job.fileset  = res_all.res_job.fileset;
+         res->res_job.storage  = res_all.res_job.storage;
+         res->res_job.pool     = res_all.res_job.pool;
+         if (res->res_job.JobType == 0) {
+            Emsg1(M_ERROR_TERM, 0, "Job Type not defined for Job resource %s\n", res_all.res_dir.hdr.name);
+         }
+         if (res->res_job.level != 0) {
+            int i;
+            for (i=0; joblevels[i].level_name; i++) {
+               if (joblevels[i].level == res->res_job.level &&
+                   joblevels[i].job_type == res->res_job.JobType) {
+                  i = 0;
+                  break;
+               }
+            }
+            if (i != 0) {
+               Emsg1(M_ERROR_TERM, 0, "Inappropriate level specified in Job resource %s\n", 
+                  res_all.res_dir.hdr.name);
+            }
+         }
+         break;
+      case R_COUNTER:
+         if ((res = (URES *)GetResWithName(R_COUNTER, res_all.res_counter.hdr.name)) == NULL) {
+            Emsg1(M_ERROR_TERM, 0, "Cannot find Counter resource %s\n", res_all.res_counter.hdr.name);
+         }
+         res->res_counter.Catalog = res_all.res_counter.Catalog;
+         res->res_counter.WrapCounter = res_all.res_counter.WrapCounter;
+         break;
+
+      case R_CLIENT:
+         if ((res = (URES *)GetResWithName(R_CLIENT, res_all.res_client.hdr.name)) == NULL) {
+            Emsg1(M_ERROR_TERM, 0, "Cannot find Client resource %s\n", res_all.res_client.hdr.name);
+         }
+         res->res_client.catalog = res_all.res_client.catalog;
+         break;
+      case R_SCHEDULE:
+         /* Schedule is a bit different in that it contains a RUN record
+          * chain which isn't a "named" resource. This chain was linked
+          * in by run_conf.c during pass 2, so here we jam the pointer 
+          * into the Schedule resource.                         
+          */
+         if ((res = (URES *)GetResWithName(R_SCHEDULE, res_all.res_client.hdr.name)) == NULL) {
+            Emsg1(M_ERROR_TERM, 0, "Cannot find Schedule resource %s\n", res_all.res_client.hdr.name);
+         }
+         res->res_sch.run = res_all.res_sch.run;
+         break;
+      default:
+         Emsg1(M_ERROR, 0, "Unknown resource type %d in save_resource.\n", type);
+         error = 1;
+         break;
       }
       /* Note, the resource name was already saved during pass 1,
        * so here, we can just release it.
        */
       if (res_all.res_dir.hdr.name) {
-        free(res_all.res_dir.hdr.name);
-        res_all.res_dir.hdr.name = NULL;
+         free(res_all.res_dir.hdr.name);
+         res_all.res_dir.hdr.name = NULL;
       }
       if (res_all.res_dir.hdr.desc) {
-        free(res_all.res_dir.hdr.desc);
-        res_all.res_dir.hdr.desc = NULL;
+         free(res_all.res_dir.hdr.desc);
+         res_all.res_dir.hdr.desc = NULL;
       }
       return;
    }
 
    /* The following code is only executed for pass 1 */
    switch (type) {
-      case R_DIRECTOR:
-        size = sizeof(DIRRES);
-        break;
-      case R_CONSOLE:
-        size = sizeof(CONRES);
-        break;
-      case R_CLIENT:
-        size =sizeof(CLIENT);
-        break;
-      case R_STORAGE:
-        size = sizeof(STORE); 
-        break;
-      case R_CATALOG:
-        size = sizeof(CAT);
-        break;
-      case R_JOB:
-        size = sizeof(JOB);
-        break;
-      case R_FILESET:
-        size = sizeof(FILESET);
-        break;
-      case R_SCHEDULE:
-        size = sizeof(SCHED);
-        break;
-      case R_GROUP:
-        size = sizeof(GROUP);
-        break;
-      case R_POOL:
-        size = sizeof(POOL);
-        break;
-      case R_MSGS:
-        size = sizeof(MSGS);
-        break;
-      case R_COUNTER:
-        size = sizeof(COUNTER);
-        break;
-      default:
-         printf("Unknown resource type %d in save_resrouce.\n", type);
-        error = 1;
-        size = 1;
-        break;
+   case R_DIRECTOR:
+      size = sizeof(DIRRES);
+      break;
+   case R_CONSOLE:
+      size = sizeof(CONRES);
+      break;
+   case R_CLIENT:
+      size =sizeof(CLIENT);
+      break;
+   case R_STORAGE:
+      size = sizeof(STORE); 
+      break;
+   case R_CATALOG:
+      size = sizeof(CAT);
+      break;
+   case R_JOB:
+      size = sizeof(JOB);
+      break;
+   case R_FILESET:
+      size = sizeof(FILESET);
+      break;
+   case R_SCHEDULE:
+      size = sizeof(SCHED);
+      break;
+   case R_GROUP:
+      size = sizeof(GROUP);
+      break;
+   case R_POOL:
+      size = sizeof(POOL);
+      break;
+   case R_MSGS:
+      size = sizeof(MSGS);
+      break;
+   case R_COUNTER:
+      size = sizeof(COUNTER);
+      break;
+   default:
+      printf("Unknown resource type %d in save_resrouce.\n", type);
+      error = 1;
+      size = 1;
+      break;
    }
    /* Common */
    if (!error) {
       res = (URES *)malloc(size);
       memcpy(res, &res_all, size);
       if (!resources[rindex].res_head) {
-        resources[rindex].res_head = (RES *)res; /* store first entry */
+         resources[rindex].res_head = (RES *)res; /* store first entry */
          Dmsg3(200, "Inserting first %s res: %s index=%d\n", res_to_str(type),
-              res->res_dir.hdr.name, rindex);
+               res->res_dir.hdr.name, rindex);
       } else {
-        RES *next;
-        /* Add new res to end of chain */
-        for (next=resources[rindex].res_head; next->next; next=next->next)
-           { }
-        next->next = (RES *)res;
+         RES *next;
+         /* Add new res to end of chain */
+         for (next=resources[rindex].res_head; next->next; next=next->next)
+            { }
+         next->next = (RES *)res;
          Dmsg3(200, "Inserting %s res: %s index=%d\n", res_to_str(type),
-              res->res_dir.hdr.name, rindex);
+               res->res_dir.hdr.name, rindex);
       }
    }
 }
    /* Store the type both pass 1 and pass 2 */
    for (i=0; jobtypes[i].type_name; i++) {
       if (strcasecmp(lc->str, jobtypes[i].type_name) == 0) {
-        ((JOB *)(item->value))->JobType = jobtypes[i].job_type;
-        i = 0;
-        break;
+         ((JOB *)(item->value))->JobType = jobtypes[i].job_type;
+         i = 0;
+         break;
       }
    }
    if (i != 0) {
    /* Store the level pass 2 so that type is defined */
    for (i=0; joblevels[i].level_name; i++) {
       if (strcasecmp(lc->str, joblevels[i].level_name) == 0) {
-        ((JOB *)(item->value))->level = joblevels[i].level;
-        i = 0;
-        break;
+         ((JOB *)(item->value))->level = joblevels[i].level;
+         i = 0;
+         break;
       }
    }
    if (i != 0) {
    /* Scan Replacement options */
    for (i=0; ReplaceOptions[i].name; i++) {
       if (strcasecmp(lc->str, ReplaceOptions[i].name) == 0) {
-        *(int *)(item->value) = ReplaceOptions[i].token;
-        i = 0;
-        break;
+         *(int *)(item->value) = ReplaceOptions[i].token;
+         i = 0;
+         break;
       }
    }
    if (i != 0) {
       Dmsg1(190, "Got keyword: %s\n", lc->str);
       found = FALSE;
       for (i=0; BakVerFields[i].name; i++) {
-        if (strcasecmp(lc->str, BakVerFields[i].name) == 0) {
-           found = TRUE;
-           if (lex_get_token(lc, T_ALL) != T_EQUALS) {
+         if (strcasecmp(lc->str, BakVerFields[i].name) == 0) {
+            found = TRUE;
+            if (lex_get_token(lc, T_ALL) != T_EQUALS) {
                scan_err1(lc, "Expected an equals, got: %s", lc->str);
-           }
-           token = lex_get_token(lc, T_NAME);
+            }
+            token = lex_get_token(lc, T_NAME);
             Dmsg1(190, "Got value: %s\n", lc->str);
-           switch (BakVerFields[i].token) {
+            switch (BakVerFields[i].token) {
                case 'C':
-                 /* Find Client Resource */
-                 if (pass == 2) {
-                    res = GetResWithName(R_CLIENT, lc->str);
-                    if (res == NULL) {
+                  /* Find Client Resource */
+                  if (pass == 2) {
+                     res = GetResWithName(R_CLIENT, lc->str);
+                     if (res == NULL) {
                         scan_err1(lc, "Could not find specified Client Resource: %s",
-                                  lc->str);
-                    }
-                    res_all.res_job.client = (CLIENT *)res;
-                 }
-                 break;
+                                   lc->str);
+                     }
+                     res_all.res_job.client = (CLIENT *)res;
+                  }
+                  break;
                case 'F':
-                 /* Find FileSet Resource */
-                 if (pass == 2) {
-                    res = GetResWithName(R_FILESET, lc->str);
-                    if (res == NULL) {
+                  /* Find FileSet Resource */
+                  if (pass == 2) {
+                     res = GetResWithName(R_FILESET, lc->str);
+                     if (res == NULL) {
                         scan_err1(lc, "Could not find specified FileSet Resource: %s\n",
-                                   lc->str);
-                    }
-                    res_all.res_job.fileset = (FILESET *)res;
-                 }
-                 break;
+                                    lc->str);
+                     }
+                     res_all.res_job.fileset = (FILESET *)res;
+                  }
+                  break;
                case 'L':
-                 /* Get level */
-                 for (i=0; joblevels[i].level_name; i++) {
-                    if (joblevels[i].job_type == item->code && 
-                         strcasecmp(lc->str, joblevels[i].level_name) == 0) {
-                       ((JOB *)(item->value))->level = joblevels[i].level;
-                       i = 0;
-                       break;
-                    }
-                 }
-                 if (i != 0) {
+                  /* Get level */
+                  for (i=0; joblevels[i].level_name; i++) {
+                     if (joblevels[i].job_type == item->code && 
+                          strcasecmp(lc->str, joblevels[i].level_name) == 0) {
+                        ((JOB *)(item->value))->level = joblevels[i].level;
+                        i = 0;
+                        break;
+                     }
+                  }
+                  if (i != 0) {
                      scan_err1(lc, "Expected a Job Level keyword, got: %s", lc->str);
-                 }
-                 break;
-           } /* end switch */
-           break;
-        } /* end if strcmp() */
+                  }
+                  break;
+            } /* end switch */
+            break;
+         } /* end if strcmp() */
       } /* end for */
       if (!found) {
          scan_err1(lc, "%s not a valid Backup/verify keyword", lc->str);
       }
    } /* end while */
-   lc->options = options;            /* reset original options */
+   lc->options = options;             /* reset original options */
    set_bit(index, res_all.hdr.item_present);
 }
 
       found = FALSE;
       for (i=0; RestoreFields[i].name; i++) {
          Dmsg1(190, "Restore kw=%s\n", lc->str);
-        if (strcasecmp(lc->str, RestoreFields[i].name) == 0) {
-           found = TRUE;
-           if (lex_get_token(lc, T_ALL) != T_EQUALS) {
+         if (strcasecmp(lc->str, RestoreFields[i].name) == 0) {
+            found = TRUE;
+            if (lex_get_token(lc, T_ALL) != T_EQUALS) {
                scan_err1(lc, "Expected an equals, got: %s", lc->str);
-           }
-           token = lex_get_token(lc, T_ALL);
+            }
+            token = lex_get_token(lc, T_ALL);
             Dmsg1(190, "Restore value=%s\n", lc->str);
-           switch (RestoreFields[i].token) {
+            switch (RestoreFields[i].token) {
                case 'B':
-                 /* Bootstrap */
-                 if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
+                  /* Bootstrap */
+                  if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
                      scan_err1(lc, "Expected a Restore bootstrap file, got: %s", lc->str);
-                 }
-                 if (pass == 1) {
-                    res_all.res_job.RestoreBootstrap = bstrdup(lc->str);
-                 }
-                 break;
+                  }
+                  if (pass == 1) {
+                     res_all.res_job.RestoreBootstrap = bstrdup(lc->str);
+                  }
+                  break;
                case 'C':
-                 /* Find Client Resource */
-                 if (pass == 2) {
-                    res = GetResWithName(R_CLIENT, lc->str);
-                    if (res == NULL) {
+                  /* Find Client Resource */
+                  if (pass == 2) {
+                     res = GetResWithName(R_CLIENT, lc->str);
+                     if (res == NULL) {
                         scan_err1(lc, "Could not find specified Client Resource: %s",
-                                  lc->str);
-                    }
-                    res_all.res_job.client = (CLIENT *)res;
-                 }
-                 break;
+                                   lc->str);
+                     }
+                     res_all.res_job.client = (CLIENT *)res;
+                  }
+                  break;
                case 'F':
-                 /* Find FileSet Resource */
-                 if (pass == 2) {
-                    res = GetResWithName(R_FILESET, lc->str);
-                    if (res == NULL) {
+                  /* Find FileSet Resource */
+                  if (pass == 2) {
+                     res = GetResWithName(R_FILESET, lc->str);
+                     if (res == NULL) {
                         scan_err1(lc, "Could not find specified FileSet Resource: %s\n",
-                                   lc->str);
-                    }
-                    res_all.res_job.fileset = (FILESET *)res;
-                 }
-                 break;
+                                    lc->str);
+                     }
+                     res_all.res_job.fileset = (FILESET *)res;
+                  }
+                  break;
                case 'J':
-                 /* JobId */
-                 if (token != T_NUMBER) {
+                  /* JobId */
+                  if (token != T_NUMBER) {
                      scan_err1(lc, "expected an integer number, got: %s", lc->str);
-                 }
-                 errno = 0;
-                 res_all.res_job.RestoreJobId = strtol(lc->str, NULL, 0);
+                  }
+                  errno = 0;
+                  res_all.res_job.RestoreJobId = strtol(lc->str, NULL, 0);
                   Dmsg1(190, "RestorJobId=%d\n", res_all.res_job.RestoreJobId);
-                 if (errno != 0) {
+                  if (errno != 0) {
                      scan_err1(lc, "expected an integer number, got: %s", lc->str);
-                 }
-                 break;
+                  }
+                  break;
                case 'W':
-                 /* Where */
-                 if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
+                  /* Where */
+                  if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
                      scan_err1(lc, "Expected a Restore root directory, got: %s", lc->str);
-                 }
-                 if (pass == 1) {
-                    res_all.res_job.RestoreWhere = bstrdup(lc->str);
-                 }
-                 break;
+                  }
+                  if (pass == 1) {
+                     res_all.res_job.RestoreWhere = bstrdup(lc->str);
+                  }
+                  break;
                case 'R':
-                 /* Replacement options */
-                 if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
+                  /* Replacement options */
+                  if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
                      scan_err1(lc, "Expected a keyword name, got: %s", lc->str);
-                 }
-                 /* Fix to scan Replacement options */
-                 for (i=0; ReplaceOptions[i].name; i++) {
-                    if (strcasecmp(lc->str, ReplaceOptions[i].name) == 0) {
-                        ((JOB *)(item->value))->replace = ReplaceOptions[i].token;
-                       i = 0;
-                       break;
-                    }
-                 }
-                 if (i != 0) {
+                  }
+                  /* Fix to scan Replacement options */
+                  for (i=0; ReplaceOptions[i].name; i++) {
+                     if (strcasecmp(lc->str, ReplaceOptions[i].name) == 0) {
+                         ((JOB *)(item->value))->replace = ReplaceOptions[i].token;
+                        i = 0;
+                        break;
+                     }
+                  }
+                  if (i != 0) {
                      scan_err1(lc, "Expected a Restore replacement option, got: %s", lc->str);
-                 }
-                 break;
-           } /* end switch */
-           break;
-        } /* end if strcmp() */
+                  }
+                  break;
+            } /* end switch */
+            break;
+         } /* end if strcmp() */
       } /* end for */
       if (!found) {
          scan_err1(lc, "%s not a valid Restore keyword", lc->str);
       }
    } /* end while */
-   lc->options = options;            /* reset original options */
+   lc->options = options;             /* reset original options */
    set_bit(index, res_all.hdr.item_present);
 }
 
 #include "bacula.h"
 #include "dird.h"
 
+/* Forward referenced functions */
+static int create_simple_name(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr);
+static int perform_full_name_substitution(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr);
+
+
 /*
  * Really crude automatic Volume name creation using
  *  LabelFormat. We assume that if this routine is being
 int newVolume(JCR *jcr, MEDIA_DBR *mr)
 {
    POOL_DBR pr;
-   char name[MAXSTRING];
-   char num[20];
 
    memset(&pr, 0, sizeof(pr));
 
    if (db_get_pool_record(jcr, jcr->db, &pr) && pr.LabelFormat[0] &&
        pr.LabelFormat[0] != '*') {
       if (pr.MaxVols == 0 || pr.NumVols < pr.MaxVols) {
-        memset(mr, 0, sizeof(mr));
+        memset(mr, 0, sizeof(MEDIA_DBR));
         set_pool_dbr_defaults_in_media_dbr(mr, &pr);
         mr->LabelDate = time(NULL);
         bstrncpy(mr->MediaType, jcr->store->media_type, sizeof(mr->MediaType));
-        bstrncpy(name, pr.LabelFormat, sizeof(name));
-        if (!is_volume_name_legal(NULL, name)) {
-            Jmsg(jcr, M_ERROR, 0, _("Illegal character in Label Format\n"));
-           goto bail_out;
-        }
-        /* See if volume already exists */
-        mr->VolumeName[0] = 0;
-        for (int i=pr.NumVols+1; i<(int)pr.NumVols+11; i++) {
-           MEDIA_DBR tmr;
-           memset(&tmr, 0, sizeof(tmr));
-            sprintf(num, "%04d", i);
-           bstrncpy(tmr.VolumeName, name, sizeof(tmr.VolumeName));
-           bstrncat(tmr.VolumeName, num, sizeof(tmr.VolumeName));
-           if (db_get_media_record(jcr, jcr->db, &tmr)) {
-              Jmsg(jcr, M_WARNING, 0, 
-_("Wanted to create Volume \"%s\", but it already exists. Trying again.\n"), 
-                   tmr.VolumeName);
-              continue;
+        /* Check for special characters */
+        if (is_volume_name_legal(NULL, pr.LabelFormat)) {
+           /* No special characters, so apply simple algorithm */
+           if (!create_simple_name(jcr, mr, &pr)) {
+              goto bail_out;
+           }
+        } else {  /* try full substitution */
+           /* Found special characters, so try substitution */
+           if (!perform_full_name_substitution(jcr, mr, &pr)) { 
+              goto bail_out;
+           }
+           if (!is_volume_name_legal(NULL, mr->VolumeName)) {
+               Jmsg(jcr, M_ERROR, 0, _("Illegal character in Volume name \"%s\"\n"),
+                 mr->VolumeName);
+              goto bail_out;
            }
-           bstrncpy(mr->VolumeName, name, sizeof(mr->VolumeName));
-           bstrncat(mr->VolumeName, num, sizeof(mr->VolumeName));
-           break;                    /* Got good name */
-        }
-        if (mr->VolumeName[0] == 0) {
-            Jmsg(jcr, M_ERROR, 0, _("Too many failures. Giving up creating Volume.\n"));
-           goto bail_out;
         }
         pr.NumVols++;
         if (db_create_media_record(jcr, jcr->db, mr) &&
    db_unlock(jcr->db);
    return 0;   
 }
+
+static int create_simple_name(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr)
+{
+   char name[MAXSTRING];
+   char num[20];
+
+   /* See if volume already exists */
+   mr->VolumeName[0] = 0;
+   bstrncpy(name, pr->LabelFormat, sizeof(name));
+   for (int i=pr->NumVols+1; i<(int)pr->NumVols+11; i++) {
+      MEDIA_DBR tmr;
+      memset(&tmr, 0, sizeof(tmr));
+      sprintf(num, "%04d", i);
+      bstrncpy(tmr.VolumeName, name, sizeof(tmr.VolumeName));
+      bstrncat(tmr.VolumeName, num, sizeof(tmr.VolumeName));
+      if (db_get_media_record(jcr, jcr->db, &tmr)) {
+        Jmsg(jcr, M_WARNING, 0, 
+             _("Wanted to create Volume \"%s\", but it already exists. Trying again.\n"), 
+            tmr.VolumeName);
+        continue;
+      }
+      bstrncpy(mr->VolumeName, name, sizeof(mr->VolumeName));
+      bstrncat(mr->VolumeName, num, sizeof(mr->VolumeName));
+      break;                   /* Got good name */
+   }
+   if (mr->VolumeName[0] == 0) {
+      Jmsg(jcr, M_ERROR, 0, _("Too many failures. Giving up creating Volume name.\n"));
+      return 0;
+   }
+   return 1;
+}
+
+static int date_item(JCR *jcr, int code, 
+             const char **val_ptr, int *val_len, int *val_size)
+{
+   struct tm tm;
+   time_t now = time(NULL);
+   localtime_r(&now, &tm);
+   int val = 0;
+   char buf[10];
+
+   switch (code) {
+   case 1:                           /* year */
+      val = tm.tm_year + 1900;
+      break;
+   case 2:                           /* month */
+      val = tm.tm_mon + 1;
+      break;
+   case 3:                           /* day */
+      val = tm.tm_mday;
+      break;
+   case 4:                           /* hour */
+      val = tm.tm_hour;
+      break;
+   case 5:                           /* minute */
+      val = tm.tm_min;
+      break;
+   case 6:                           /* second */
+      val = tm.tm_sec;
+      break;
+   case 7:                           /* Week day */
+      val = tm.tm_wday;
+      break;
+   }
+   bsnprintf(buf, sizeof(buf), "%d", val);
+   *val_ptr = bstrdup(buf);
+   *val_len = strlen(buf);
+   *val_size = *val_len;
+   return 1;
+}
+
+static int job_item(JCR *jcr, int code, 
+             const char **val_ptr, int *val_len, int *val_size)
+{
+   char *str = " ";
+   char buf[20];
+
+   switch (code) {
+   case 1:                           /* Job */
+      str = jcr->Job;
+      break;
+   case 2:                            /* Director's name */
+      str = my_name;
+      break;
+   case 3:                           /* level */
+      str = job_level_to_str(jcr->JobLevel);
+      break;
+   case 4:                           /* type */
+      str = job_type_to_str(jcr->JobType);
+      break;
+   case 5:                           /* JobId */
+      bsnprintf(buf, sizeof(buf), "%d", jcr->JobId);
+      str = buf;
+      break;
+   case 6:                           /* Client */
+      str = jcr->client_name;
+      if (!str) {
+         str = " ";
+      }
+      break;
+   case 7:                           /* NumVols */
+      bsnprintf(buf, sizeof(buf), "%d", jcr->NumVols);
+      str = buf;
+      break;
+   case 8:                           /* Pool */
+      str = jcr->client->hdr.name;   
+      break;
+   }
+   *val_ptr = bstrdup(str);
+   *val_len = strlen(str);
+   *val_size = *val_len;
+   return 1;
+}
+
+
+struct s_built_in_vars {char *var_name; int code; int (*func)(JCR *jcr, int code,
+                        const char **val_ptr, int *val_len, int *val_size);};
+
+static struct s_built_in_vars built_in_vars[] = {
+   { N_("Year"),    1, date_item},
+   { N_("Month"),   2, date_item},
+   { N_("Day"),     3, date_item},
+   { N_("Hour"),    4, date_item},
+   { N_("Minute"),  5, date_item},
+   { N_("Second"),  6, date_item},
+   { N_("WeekDay"), 7, date_item},
+
+   { N_("Job"),     1, job_item},
+   { N_("Dir"),     2, job_item},
+   { N_("Level"),   3, job_item},
+   { N_("Type"),    4, job_item},
+   { N_("JobId"),   5, job_item},
+   { N_("Client"),  6, job_item},
+   { N_("NumVols"), 7, job_item},
+   { N_("Pool"),    8, job_item},
+
+   { NULL, 0, NULL}
+};
+
+
+static var_rc_t lookup_built_in_var(var_t *ctx, void *my_ctx, 
+         const char *var_ptr, int var_len, int var_index, 
+         const char **val_ptr, int *val_len, int *val_size)
+{
+   JCR *jcr = (JCR *)my_ctx;
+   int stat;
+
+   for (int i=0; _(built_in_vars[i].var_name); i++) {
+      if (strncmp(_(built_in_vars[i].var_name), var_ptr, var_len) == 0) {
+        stat = (*built_in_vars[i].func)(jcr, built_in_vars[i].code,
+           val_ptr, val_len, val_size);
+        if (stat) {
+           return VAR_OK;
+        }
+        break;
+      }
+   }
+   return VAR_ERR_UNDEFINED_VARIABLE;
+}
+
+
+/*
+ * Search counter variables 
+ */
+static var_rc_t lookup_counter_var(var_t *ctx, void *my_ctx, 
+         const char *var_ptr, int var_len, int var_inc, int var_index, 
+         const char **val_ptr, int *val_len, int *val_size)
+{
+   char buf[MAXSTRING];
+   var_rc_t stat = VAR_ERR_UNDEFINED_VARIABLE;
+
+   if (var_len > (int)sizeof(buf) - 1) {
+       return VAR_ERR_OUT_OF_MEMORY;
+   }
+   memcpy(buf, var_ptr, var_len);
+   buf[var_len] = 0;
+   LockRes();
+   for (COUNTER *counter=NULL; (counter = (COUNTER *)GetNextRes(R_COUNTER, (RES *)counter)); ) {
+      if (strcmp(counter->hdr.name, buf) == 0) {
+         bsnprintf(buf, sizeof(buf), "%d", counter->CurrentValue);
+        *val_ptr = bstrdup(buf);
+        *val_len = strlen(buf);
+        *val_size = *val_len;
+        if (var_inc) {
+           COUNTER_DBR cr;
+           JCR *jcr = (JCR *)my_ctx;
+           memset(&cr, 0, sizeof(cr));
+           bstrncpy(cr.Counter, counter->hdr.name, sizeof(cr.Counter));
+           cr.MinValue = counter->MinValue;
+           cr.MaxValue = counter->MaxValue;
+           cr.CurrentValue = ++counter->CurrentValue;
+           bstrncpy(cr.WrapCounter, counter->WrapCounter->hdr.name, sizeof(cr.WrapCounter));
+           if (!db_update_counter_record(jcr, jcr->db, &cr)) {
+               Jmsg(jcr, M_ERROR, 0, _("Count not update counter %s: ERR=%s\n"),
+                 counter->hdr.name, db_strerror(jcr->db));
+           }
+        }  
+        stat = VAR_OK;
+        break;
+      }
+   }
+   UnlockRes();
+   return stat;
+}
+
+
+/*
+ * Called here to look up a variable   
+ */
+static var_rc_t lookup_var(var_t *ctx, void *my_ctx, 
+         const char *var_ptr, int var_len, int var_inc, int var_index, 
+         const char **val_ptr, int *val_len, int *val_size)
+{
+   char buf[MAXSTRING];
+   var_rc_t stat;
+
+   if ((stat = lookup_built_in_var(ctx, my_ctx, var_ptr, var_len, var_index,
+       val_ptr, val_len, val_size)) == VAR_OK) {
+      return VAR_OK;
+   }
+
+   if ((stat = lookup_counter_var(ctx, my_ctx, var_ptr, var_len, var_inc, var_index,
+       val_ptr, val_len, val_size)) == VAR_OK) {
+      return VAR_OK;
+   }
+
+   /* Look in environment */
+   if (var_index != 0) {
+       return VAR_ERR_ARRAY_LOOKUPS_ARE_UNSUPPORTED;
+   }
+   if (var_len > (int)sizeof(buf) - 1) {
+       return VAR_ERR_OUT_OF_MEMORY;
+   }
+   memcpy(buf, var_ptr, var_len+1);
+   buf[var_len+1] = 0;
+   Dmsg1(000, "Var=%s\n", buf);
+
+   if ((*val_ptr = getenv(buf)) == NULL) {
+       return VAR_ERR_UNDEFINED_VARIABLE;
+   }
+   *val_len = strlen(*val_ptr);
+   *val_size = 0;
+   return VAR_OK;
+}
+
+/*
+ * Called here to do a special operation on a variable
+ *   op_ptr  points to the special operation code (not EOS terminated)
+ *   arg_ptr points to argument to special op code
+ *   val_ptr points to the value string
+ *   out_ptr points to string to be returned
+ */
+static var_rc_t operate_var(var_t *var, void *my_ctx, 
+         const char *op_ptr, int op_len, 
+         const char *arg_ptr, int arg_len,
+         const char *val_ptr, int val_len, 
+         char **out_ptr, int *out_len, int *out_size)
+{
+   var_rc_t stat = VAR_ERR_UNDEFINED_OPERATION;
+   Dmsg0(000, "Enter operate_var\n");
+   if (!val_ptr) {
+      *out_size = 0;
+      return stat;
+   }
+   if (op_len == 3 && strncmp(op_ptr, "inc", 3) == 0) {
+      char buf[MAXSTRING];
+      if (val_len > (int)sizeof(buf) - 1) {
+         return VAR_ERR_OUT_OF_MEMORY;
+      }
+      memcpy(buf, arg_ptr, arg_len);
+      buf[arg_len] = 0;
+      Dmsg1(000, "Arg=%s\n", buf);
+      memcpy(buf, val_ptr, val_len);
+      buf[val_len] = 0;   
+      Dmsg1(000, "Val=%s\n", buf);
+      LockRes();
+      for (COUNTER *counter=NULL; (counter = (COUNTER *)GetNextRes(R_COUNTER, (RES *)counter)); ) {
+        if (strcmp(counter->hdr.name, buf) == 0) {
+            Dmsg2(000, "counter=%s val=%s\n", counter->hdr.name, buf);
+           break;
+        }
+      }
+      UnlockRes();
+      return stat;
+   }
+   *out_size = 0;
+   return stat;
+}
+
+/*
+ * Perform full substitution on Label
+ */
+static int perform_full_name_substitution(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr)
+{
+   var_t *var_ctx;
+   var_rc_t stat;
+   char *inp, *outp;
+   int in_len, out_len;
+   int rtn_stat = 0;
+
+   inp = pr->LabelFormat;
+   in_len = strlen(inp);
+
+   outp = NULL;
+   out_len = 0;
+
+   jcr->NumVols = pr->NumVols;
+   /* create context */
+   if ((stat = var_create(&var_ctx)) != VAR_OK) {
+       Jmsg(jcr, M_ERROR, 0, _("Cannot create var context: ERR=%s\n"), var_strerror(var_ctx, stat));
+       goto bail_out;
+   }
+   /* define callback */
+   if ((stat = var_config(var_ctx, VAR_CONFIG_CB_VALUE, lookup_var, (void *)jcr)) != VAR_OK) {
+       Jmsg(jcr, M_ERROR, 0, _("Cannot set var callback: ERR=%s\n"), var_strerror(var_ctx, stat));
+       goto bail_out;
+   }
+
+
+   /* define special operations */
+   if ((stat = var_config(var_ctx, VAR_CONFIG_CB_OPERATION, operate_var, (void *)jcr)) != VAR_OK) {
+       Jmsg(jcr, M_ERROR, 0, _("Cannot set var operate: ERR=%s\n"), var_strerror(var_ctx, stat));
+       goto bail_out;
+   }
+
+   /* unescape in place */
+   if ((stat = var_unescape(var_ctx, inp, in_len, inp, in_len+1, 0)) != VAR_OK) {
+       Jmsg(jcr, M_ERROR, 0, _("Cannot unescape string: ERR=%s\n"), var_strerror(var_ctx, stat));
+       goto bail_out;
+   }
+
+   in_len = strlen(inp);
+
+   /* expand variables */
+   if ((stat = var_expand(var_ctx, inp, in_len, &outp, &out_len, 1)) != VAR_OK) {
+       Jmsg(jcr, M_ERROR, 0, _("Cannot expand LabelFormat \"%s\": ERR=%s\n"), 
+         inp, var_strerror(var_ctx, stat));
+       goto bail_out;
+   }
+
+   /* unescape once more in place */
+   if ((stat = var_unescape(var_ctx, outp, out_len, outp, out_len+1, 1)) != VAR_OK) {
+       Jmsg(jcr, M_ERROR, 0, _("Cannot unescape string: ERR=%s\n"), var_strerror(var_ctx, stat));
+       goto bail_out;
+   }
+
+   bstrncpy(mr->VolumeName, outp, sizeof(mr->VolumeName));
+
+   rtn_stat = 1;  
+
+bail_out:
+   /* destroy expansion context */
+   if ((stat = var_destroy(var_ctx)) != VAR_OK) {
+       Jmsg(jcr, M_ERROR, 0, _("Cannot destroy var context: ERR=%s\n"), var_strerror(var_ctx, stat));
+   }
+   if (outp) {
+      free(outp);
+   }
+   return rtn_stat;
+}