!!! 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 36a31ae4d7e544ef608ac7a96b5ebafb51bd0826..4fe3b112aca5a9629776e613a335699949daed17 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -581,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++) {
@@ -735,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) {
@@ -1195,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));