!!! I didn't run the regression tests.!!!

[bacula/bacula] / bacula / src / dird / dird_conf.c

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index 18591c256ff9aa5d494267fc65e8a99d6ef9426d..4fe3b112aca5a9629776e613a335699949daed17 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -89,8 +89,9 @@ static RES_ITEM dir_items[] = {
    {"name",        store_name,     ITEM(res_dir.hdr.name), 0, ITEM_REQUIRED, 0},
    {"description", store_str,      ITEM(res_dir.hdr.desc), 0, 0, 0},
    {"messages",    store_res,      ITEM(res_dir.messages), R_MSGS, 0, 0},
-   {"dirport",     store_pint,     ITEM(res_dir.DIRport),  0, ITEM_DEFAULT, 9101},
-   {"diraddress",  store_str,      ITEM(res_dir.DIRaddr),  0, 0, 0},
+   {"dirport",     store_addresses_port,    ITEM(res_dir.DIRaddrs),  0, ITEM_DEFAULT, 9101},
+   {"diraddress",  store_addresses_address, ITEM(res_dir.DIRaddrs),  0, ITEM_DEFAULT, 9101},
+   {"diraddresses",store_addresses,         ITEM(res_dir.DIRaddrs),  0, ITEM_DEFAULT, 9101},
    {"queryfile",   store_dir,      ITEM(res_dir.query_file), 0, ITEM_REQUIRED, 0},
    {"workingdirectory", store_dir, ITEM(res_dir.working_directory), 0, ITEM_REQUIRED, 0},
    {"piddirectory",store_dir,     ITEM(res_dir.pid_directory), 0, ITEM_REQUIRED, 0},
@@ -470,8 +471,8 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
         res->res_client.hdr.name, res->res_client.address, res->res_client.FDport,
         res->res_client.MaxConcurrentJobs);
       sendit(sock, "      JobRetention=%s FileRetention=%s AutoPrune=%d\n",
-        edit_utime(res->res_client.JobRetention, ed1), 
-        edit_utime(res->res_client.FileRetention, ed2),
+        edit_utime(res->res_client.JobRetention, ed1, sizeof(ed1)),
+        edit_utime(res->res_client.FileRetention, ed2, sizeof(ed2)),
         res->res_client.AutoPrune);
       if (res->res_client.catalog) {
          sendit(sock, "  --> ");
@@ -580,6 +581,12 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
            for (k=0; k<fo->base.size(); k++) {
                sendit(sock, "      B %s\n", fo->base.get(k));
            }
+           if (fo->reader) {
+               sendit(sock, "      D %s\n", fo->reader);
+           }
+           if (fo->writer) {
+               sendit(sock, "      T %s\n", fo->writer);
+           }
             sendit(sock, "      N\n");
         }
         for (j=0; j<incexe->name_list.size(); j++) {
@@ -696,9 +703,9 @@ next_run:
              res->res_pool.accept_any_volume, res->res_pool.catalog_files);
       sendit(sock, "      max_vols=%d auto_prune=%d VolRetention=%s\n",
              res->res_pool.max_volumes, res->res_pool.AutoPrune,
-             edit_utime(res->res_pool.VolRetention, ed1));
+             edit_utime(res->res_pool.VolRetention, ed1, sizeof(ed1)));
       sendit(sock, "      VolUse=%s recycle=%d LabelFormat=%s\n", 
-             edit_utime(res->res_pool.VolUseDuration, ed1),
+             edit_utime(res->res_pool.VolUseDuration, ed1, sizeof(ed1)),
              res->res_pool.Recycle,
              NPRT(res->res_pool.label_format));
       sendit(sock, "      CleaningPrefix=%s\n",
@@ -734,6 +741,12 @@ static void free_incexe(INCEXE *incexe)
       fopt->regex.destroy();
       fopt->wild.destroy();
       fopt->base.destroy();
+      if (fopt->reader) {
+        free(fopt->reader);
+      }
+      if (fopt->writer) {
+        free(fopt->writer);
+      }
       free(fopt);
    }
    if (incexe->opts_list) {
@@ -784,8 +797,8 @@ void free_resource(RES *sres, int type)
       if (res->res_dir.query_file) {
         free(res->res_dir.query_file);
       }
-      if (res->res_dir.DIRaddr) {
-        free(res->res_dir.DIRaddr);
+      if (res->res_dir.DIRaddrs) {
+        free_addresses(res->res_dir.DIRaddrs);
       }
       break;
    case R_COUNTER:
@@ -1194,7 +1207,7 @@ void store_acl(LEX *lc, RES_ITEM *item, int index, int pass)
       token = lex_get_token(lc, T_NAME);
       if (pass == 1) {
         if (((alist **)item->value)[item->code] == NULL) {   
-           ((alist **)item->value)[item->code] = new alist(10, owned_by_alist);
+           ((alist **)item->value)[item->code] = New(alist(10, owned_by_alist)); 
 //          Dmsg1(900, "Defined new ACL alist at %d\n", item->code);
         }
         ((alist **)item->value)[item->code]->append(bstrdup(lc->str));