From 35b473accde9302e56dc6cca25be49ebd71cc2c0 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 28 Aug 2005 19:46:39 +0000 Subject: [PATCH] Apply Landon's patch for TLS default values. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2365 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kes-1.37 | 1 + bacula/src/dird/dird_conf.c | 4 ++-- bacula/src/filed/filed_conf.c | 2 +- bacula/src/stored/stored_conf.c | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bacula/kes-1.37 b/bacula/kes-1.37 index 87484b165b..32a41224e3 100644 --- a/bacula/kes-1.37 +++ b/bacula/kes-1.37 @@ -5,6 +5,7 @@ General: Changes to 1.37.37: 28Aug05 +- Apply Landon's patch for TLS default values. - Correct LOCALEDIR problem in build of Win32 - Correct ssize_t problem in build of Win32 - Add code to llprint pools and volumes to debug next item. diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c index 305d2e1e2e..f08f9526f1 100644 --- a/bacula/src/dird/dird_conf.c +++ b/bacula/src/dird/dird_conf.c @@ -99,7 +99,7 @@ static RES_ITEM dir_items[] = { {"sdconnecttimeout", store_time,ITEM(res_dir.SDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30}, {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 0, 0, 0}, {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 0, 0, 0}, - {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 0, ITEM_DEFAULT, 1}, + {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 1, ITEM_DEFAULT, 1}, {"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0}, {"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0}, {"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0}, @@ -129,7 +129,7 @@ static RES_ITEM con_items[] = { {"catalogacl", store_acl, ITEM(res_con.ACL_lists), Catalog_ACL, 0, 0}, {"tlsenable", store_yesno, ITEM(res_con.tls_enable), 0, 0, 0}, {"tlsrequire", store_yesno, ITEM(res_con.tls_require), 0, 0, 0}, - {"tlsverifypeer", store_yesno, ITEM(res_con.tls_verify_peer), 0, ITEM_DEFAULT, 1}, + {"tlsverifypeer", store_yesno, ITEM(res_con.tls_verify_peer), 1, ITEM_DEFAULT, 1}, {"tlscacertificatefile", store_dir, ITEM(res_con.tls_ca_certfile), 0, 0, 0}, {"tlscacertificatedir", store_dir, ITEM(res_con.tls_ca_certdir), 0, 0, 0}, {"tlscertificate", store_dir, ITEM(res_con.tls_certfile), 0, 0, 0}, diff --git a/bacula/src/filed/filed_conf.c b/bacula/src/filed/filed_conf.c index 08074775ab..0f5274d593 100644 --- a/bacula/src/filed/filed_conf.c +++ b/bacula/src/filed/filed_conf.c @@ -107,7 +107,7 @@ static RES_ITEM dir_items[] = { {"monitor", store_yesno, ITEM(res_dir.monitor), 1, ITEM_DEFAULT, 0}, {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 0, 0, 0}, {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 0, 0, 0}, - {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 0, ITEM_DEFAULT, 1}, + {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 1, ITEM_DEFAULT, 1}, {"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0}, {"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0}, {"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0}, diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c index 1342f2fabf..ac30486c75 100644 --- a/bacula/src/stored/stored_conf.c +++ b/bacula/src/stored/stored_conf.c @@ -61,7 +61,7 @@ static RES_ITEM store_items[] = { {"heartbeatinterval", store_time, ITEM(res_store.heartbeat_interval), 0, ITEM_DEFAULT, 0}, {"tlsenable", store_yesno, ITEM(res_store.tls_enable), 0, 0, 0}, {"tlsrequire", store_yesno, ITEM(res_store.tls_require), 0, 0, 0}, - {"tlsverifypeer", store_yesno, ITEM(res_store.tls_verify_peer), 0, ITEM_DEFAULT, 1}, + {"tlsverifypeer", store_yesno, ITEM(res_store.tls_verify_peer), 1, ITEM_DEFAULT, 1}, {"tlscacertificatefile", store_dir, ITEM(res_store.tls_ca_certfile), 0, 0, 0}, {"tlscacertificatedir", store_dir, ITEM(res_store.tls_ca_certdir), 0, 0, 0}, {"tlscertificate", store_dir, ITEM(res_store.tls_certfile), 0, 0, 0}, @@ -80,7 +80,7 @@ static RES_ITEM dir_items[] = { {"monitor", store_yesno, ITEM(res_dir.monitor), 1, ITEM_DEFAULT, 0}, {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 0, 0, 0}, {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 0, 0, 0}, - {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 0, ITEM_DEFAULT, 1}, + {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 1, ITEM_DEFAULT, 1}, {"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0}, {"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0}, {"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0}, -- 2.39.5