- Add index file to JobId field of File records for PostgreSQL.

[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 cf45f51fbc2761ae98e69ae9b4ad40f36d576c48..1b3064ba3123ab4a85d4f48fdb311bd7135a9d1e 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -142,7 +142,7 @@ static RES_ITEM cli_items[] = {
    {"fdport",   store_pint,       ITEM(res_client.FDport),   0, ITEM_DEFAULT, 9102},
    {"password", store_password,   ITEM(res_client.password), 0, ITEM_REQUIRED, 0},
    {"fdpassword", store_password,   ITEM(res_client.password), 0, 0, 0},
-   {"catalog",  store_res,        ITEM(res_client.catalog),  R_CATALOG, 0, 0},
+   {"catalog",  store_res,        ITEM(res_client.catalog),  R_CATALOG, ITEM_REQUIRED, 0},
    {"fileretention", store_time,  ITEM(res_client.FileRetention), 0, ITEM_DEFAULT, 60*60*24*60},
    {"jobretention",  store_time,  ITEM(res_client.JobRetention),  0, ITEM_DEFAULT, 60*60*24*180},
    {"autoprune", store_yesno,     ITEM(res_client.AutoPrune), 1, ITEM_DEFAULT, 1},
@@ -250,6 +250,7 @@ static RES_ITEM fs_items[] = {
    {"description", store_str,  ITEM(res_fs.hdr.desc), 0, 0, 0},
    {"include",     store_inc,  NULL,                  0, ITEM_NO_EQUALS, 0},
    {"exclude",     store_inc,  NULL,                  1, ITEM_NO_EQUALS, 0},
+   {"ignorefilesetchanges", store_yesno, ITEM(res_fs.ignore_fs_changes), 1, ITEM_DEFAULT, 0},
    {NULL,         NULL,       NULL,                  0, 0, 0} 
 };
 
@@ -1207,7 +1208,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));