Fix compiler warning

[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 da85d7ae23006a9371aca0a96eae90b0a6fb4bf4..7cb924e054a7679cf0c337b3bd11ebea15730b3e 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -496,6 +496,8 @@ static RES_ITEM cat_items[] = {
    {"User",     store_str,      ITEM(res_cat.db_user),     0, 0, 0},
    {"DbName",   store_str,      ITEM(res_cat.db_name),     0, ITEM_REQUIRED, 0},
    {"dbdriver", store_str,      ITEM(res_cat.db_driver),   0, 0, 0},
+   {"DbSocket", store_str,      ITEM(res_cat.db_socket),   0, 0, 0},
+   {"dbsslmode", store_str,     ITEM(res_cat.db_ssl_mode),  0, 0, 0},
    {"dbsslkey", store_str,      ITEM(res_cat.db_ssl_key),  0, 0, 0},
    {"dbsslcert", store_str,     ITEM(res_cat.db_ssl_cert),  0, 0, 0},
    {"dbsslca", store_str,       ITEM(res_cat.db_ssl_ca),  0, 0, 0},
@@ -522,6 +524,7 @@ RES_ITEM job_items[] = {
    {"Pool",      store_res,     ITEM(res_job.pool),      R_POOL, ITEM_REQUIRED, 0},
    {"NextPool",  store_res,     ITEM(res_job.next_pool), R_POOL, 0, 0},
    {"FullBackupPool",  store_res, ITEM(res_job.full_pool),   R_POOL, 0, 0},
+   {"VirtualFullBackupPool", store_res, ITEM(res_job.vfull_pool), R_POOL, 0, 0},
    {"IncrementalBackupPool",  store_res, ITEM(res_job.inc_pool), R_POOL, 0, 0},
    {"DifferentialBackupPool", store_res, ITEM(res_job.diff_pool), R_POOL, 0, 0},
    {"Client",    store_res,     ITEM(res_job.client),   R_CLIENT, ITEM_REQUIRED, 0},
@@ -556,6 +559,7 @@ RES_ITEM job_items[] = {
    {"MaxWaitTime",  store_time, ITEM(res_job.MaxWaitTime), 0, 0, 0},
    {"MaxStartDelay",store_time, ITEM(res_job.MaxStartDelay), 0, 0, 0},
    {"MaxFullInterval",  store_time, ITEM(res_job.MaxFullInterval), 0, 0, 0},
+   {"MaxVirtualFullInterval",  store_time, ITEM(res_job.MaxVirtualFullInterval), 0, 0, 0},
    {"MaxDiffInterval",  store_time, ITEM(res_job.MaxDiffInterval), 0, 0, 0},
    {"PrefixLinks", store_bool, ITEM(res_job.PrefixLinks), 0, ITEM_DEFAULT, false},
    {"PruneJobs",   store_bool, ITEM(res_job.PruneJobs), 0, ITEM_DEFAULT, false},
@@ -1050,6 +1054,10 @@ void dump_resource(int type, RES *ares, void sendit(void *sock, const char *fmt,
          sendit(sock, _("  --> "));
          dump_resource(-R_POOL, (RES *)res->res_job.pool, sendit, sock);
       }
+      if (res->res_job.vfull_pool) {
+         sendit(sock, _("  --> VFullBackup"));
+         dump_resource(-R_POOL, (RES *)res->res_job.vfull_pool, sendit, sock);
+      }
       if (res->res_job.full_pool) {
          sendit(sock, _("  --> FullBackup"));
          dump_resource(-R_POOL, (RES *)res->res_job.full_pool, sendit, sock);
@@ -1066,9 +1074,8 @@ void dump_resource(int type, RES *ares, void sendit(void *sock, const char *fmt,
          sendit(sock, _("  --> Next")); /* Pool will be added by dump_resource */
          dump_resource(-R_POOL, (RES *)res->res_job.next_pool, sendit, sock);
       }
-      if (res->res_job.verify_job) {
-         sendit(sock, _("  --> "));
-         dump_resource(-type, (RES *)res->res_job.verify_job, sendit, sock);
+      if (res->res_job.JobType == JT_VERIFY && res->res_job.verify_job) {
+         sendit(sock, _("  --> JobToVerify %s"), (RES *)res->res_job.verify_job->name());
       }
       if (res->res_job.run_cmds) {
          char *runcmd;
@@ -1601,6 +1608,9 @@ void free_resource(RES *rres, int type)
       if (res->res_cat.db_password) {
          free(res->res_cat.db_password);
       }
+      if (res->res_cat.db_ssl_mode) {
+         free(res->res_cat.db_ssl_mode);
+      }
       if (res->res_cat.db_ssl_key) {
          free(res->res_cat.db_ssl_key);
       }
@@ -1849,6 +1859,7 @@ bool save_resource(CONFIG *config, int type, RES_ITEM *items, int pass)
          res->res_job.pool       = res_all.res_job.pool;
          res->res_job.next_pool  = res_all.res_job.next_pool;
          res->res_job.full_pool  = res_all.res_job.full_pool;
+         res->res_job.vfull_pool = res_all.res_job.vfull_pool;
          res->res_job.inc_pool   = res_all.res_job.inc_pool;
          res->res_job.diff_pool  = res_all.res_job.diff_pool;
          res->res_job.verify_job = res_all.res_job.verify_job;