Fix using default but not setting ITEM_DEFAULT flag.

bareos · Feb 17, 2015 · 4bebcfe · 4bebcfe
1 parent 2fd297d
commit 4bebcfe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/dird/dird_conf.c b/src/dird/dird_conf.c
@@ -367,7 +367,7 @@ RES_ITEM job_items[] = {
    { "maximumconcurrentjobs", store_pint32, ITEM(res_job.MaxConcurrentJobs), 0, ITEM_DEFAULT, "1" },
    { "rescheduleonerror", store_bool, ITEM(res_job.RescheduleOnError), 0, ITEM_DEFAULT, "false" },
    { "rescheduleinterval", store_time, ITEM(res_job.RescheduleInterval), 0, ITEM_DEFAULT, "180" /* 60 * 30 */ },
-   { "rescheduletimes", store_pint32, ITEM(res_job.RescheduleTimes), 0, 0, "5" },
+   { "rescheduletimes", store_pint32, ITEM(res_job.RescheduleTimes), 0, ITEM_DEFAULT, "5" },
    { "priority", store_pint32, ITEM(res_job.Priority), 0, ITEM_DEFAULT, "10" },
    { "allowmixedpriority", store_bool, ITEM(res_job.allow_mixed_priority), 0, ITEM_DEFAULT, "false" },
    { "writepartafterjob", store_bool, ITEM(res_job.write_part_after_job), 0, ITEM_DEPRECATED, NULL },

diff --git a/src/filed/filed_conf.c b/src/filed/filed_conf.c
@@ -106,7 +106,7 @@ static RES_ITEM cli_items[] = {
    { "pkikeypair", store_dir, ITEM(res_client.pki_keypair_file), 0, 0, NULL },
    { "pkisigner", store_alist_str, ITEM(res_client.pki_signing_key_files), 0, 0, NULL },
    { "pkimasterkey", store_alist_str, ITEM(res_client.pki_master_key_files), 0, 0, NULL },
-   { "pkicipher", store_cipher, ITEM(res_client.pki_cipher), 0, 0, "aes128" },
+   { "pkicipher", store_cipher, ITEM(res_client.pki_cipher), 0, ITEM_DEFAULT, "aes128" },
 #endif
    { "tlsauthenticate", store_bool, ITEM(res_client.tls_authenticate), 0, 0, NULL },
    { "tlsenable", store_bool, ITEM(res_client.tls_enable), 0, 0, NULL },
@@ -117,9 +117,9 @@ static RES_ITEM cli_items[] = {
    { "tlscertificate", store_dir, ITEM(res_client.tls_certfile), 0, 0, NULL },
    { "tlskey", store_dir, ITEM(res_client.tls_keyfile), 0, 0, NULL },
    { "verid", store_str, ITEM(res_client.verid), 0, 0, NULL },
-   { "compatible", store_bool, ITEM(res_client.compatible), 0, 0, "true" },
+   { "compatible", store_bool, ITEM(res_client.compatible), 0, ITEM_DEFAULT, "true" },
    { "maximumbandwidthperjob", store_speed, ITEM(res_client.max_bandwidth_per_job), 0, 0, NULL },
-   { "allowbandwidthbursting", store_bool, ITEM(res_client.allow_bw_bursting), 0, 0, "false" },
+   { "allowbandwidthbursting", store_bool, ITEM(res_client.allow_bw_bursting), 0, ITEM_DEFAULT, "false" },
    { "allowedscriptdir", store_alist_str, ITEM(res_client.allowed_script_dirs), 0, 0, NULL },
    { "allowedjobcommand", store_alist_str, ITEM(res_client.allowed_job_cmds), 0, 0, NULL },
    { NULL, NULL, { 0 }, 0, 0, NULL }

diff --git a/src/stored/stored_conf.c b/src/stored/stored_conf.c
@@ -97,9 +97,9 @@ static RES_ITEM store_items[] = {
    { "tlsallowedcn", store_alist_str, ITEM(res_store.tls_allowed_cns), 0, 0, NULL },
    { "clientconnectwait", store_time, ITEM(res_store.client_wait), 0, ITEM_DEFAULT, "180" /* 30 * 60 */ },
    { "verid", store_str, ITEM(res_store.verid), 0, 0, NULL },
-   { "compatible", store_bool, ITEM(res_store.compatible), 0, 0, "true" },
+   { "compatible", store_bool, ITEM(res_store.compatible), 0, ITEM_DEFAULT, "true" },
    { "maximumbandwidthperjob", store_speed, ITEM(res_store.max_bandwidth_per_job), 0, 0, NULL },
-   { "allowbandwidthbursting", store_bool, ITEM(res_store.allow_bw_bursting), 0, 0, "false" },
+   { "allowbandwidthbursting", store_bool, ITEM(res_store.allow_bw_bursting), 0, ITEM_DEFAULT, "false" },
    { "ndmpenable", store_bool, ITEM(res_store.ndmp_enable), 0, 0, NULL },
    { "ndmpsnooping", store_bool, ITEM(res_store.ndmp_snooping), 0, 0, NULL },
    { "ndmploglevel", store_pint32, ITEM(res_store.ndmploglevel), 0, ITEM_DEFAULT, "4" },