Fix wrong default timeouts.

When converting the default timeouts in the config engine set them to 180 instead of the wanted 1800 seconds.
bareos · May 5, 2013 · d212086 · d212086
1 parent b6fd477
commit d212086
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/filed/filed_conf.c b/src/filed/filed_conf.c
@@ -97,7 +97,7 @@ static RES_ITEM cli_items[] = {
    { "scriptsdirectory", store_dir, ITEM(res_client.scripts_directory), 0, 0, NULL },
    { "maximumconcurrentjobs", store_pint32, ITEM(res_client.MaxConcurrentJobs), 0, ITEM_DEFAULT, "20" },
    { "messages", store_res, ITEM(res_client.messages), R_MSGS, 0, NULL },
-   { "sdconnecttimeout", store_time,ITEM(res_client.SDConnectTimeout), 0, ITEM_DEFAULT, "180" /* 60 * 30 */ },
+   { "sdconnecttimeout", store_time,ITEM(res_client.SDConnectTimeout), 0, ITEM_DEFAULT, "1800" /* 30 * 60 */ },
    { "heartbeatinterval", store_time, ITEM(res_client.heartbeat_interval), 0, ITEM_DEFAULT, "0" },
    { "maximumnetworkbuffersize", store_pint32, ITEM(res_client.max_network_buffer_size), 0, 0, NULL },
 #ifdef DATA_ENCRYPTION

diff --git a/src/stored/stored_conf.c b/src/stored/stored_conf.c
@@ -81,7 +81,7 @@ static RES_ITEM store_items[] = {
    { "scriptsdirectory", store_dir, ITEM(res_store.scripts_directory), 0, 0, NULL },
    { "maximumconcurrentjobs", store_pint32, ITEM(res_store.max_concurrent_jobs), 0, ITEM_DEFAULT, "20" },
    { "messages", store_res, ITEM(res_store.messages), R_MSGS, 0, NULL },
-   { "sdconnecttimeout", store_time,ITEM(res_store.SDConnectTimeout), 0, ITEM_DEFAULT, "180" /* 60 * 30 */ },
+   { "sdconnecttimeout", store_time,ITEM(res_store.SDConnectTimeout), 0, ITEM_DEFAULT, "1800" /* 30 * 60 */ },
    { "heartbeatinterval", store_time, ITEM(res_store.heartbeat_interval), 0, ITEM_DEFAULT, "0" },
    { "maximumnetworkbuffersize", store_pint32, ITEM(res_store.max_network_buffer_size), 0, 0, NULL },
    { "tlsauthenticate", store_bool, ITEM(res_store.tls_authenticate), 0, 0, NULL },
@@ -95,7 +95,7 @@ static RES_ITEM store_items[] = {
    { "tlskey", store_dir, ITEM(res_store.tls_keyfile), 0, 0, NULL },
    { "tlsdhfile", store_dir, ITEM(res_store.tls_dhfile), 0, 0, NULL },
    { "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 */ },
+   { "clientconnectwait", store_time, ITEM(res_store.client_wait), 0, ITEM_DEFAULT, "1800" /* 30 * 60 */ },
    { "verid", store_str, ITEM(res_store.verid), 0, 0, NULL },
    { "compatible", store_bool, ITEM(res_store.compatible), 0, ITEM_DEFAULT, "true" },
    { "maximumbandwidthperjob", store_speed, ITEM(res_store.max_bandwidth_per_job), 0, 0, NULL },