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

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 87484b165b3e5afac060ec7b864265e3c878f65a..32a41224e34a3c6b6aace011bd5894703b815250 100644 (file)
--- 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 305d2e1e2e125d38fa6afe30b4a0ae1cc7d6251b..f08f9526f11558d60023cdfaad5bdcbb652d2b3b 100644 (file)
--- 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 08074775abf31823217955d0deb1114404a2e394..0f5274d593d973566dcd7e6147d7389f1cf4f88c 100644 (file)
--- 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 1342f2fabf1fff493124db390f0c96984ab295ba..ac30486c7585251cceba590e3844db6d94a855bf 100644 (file)
--- 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},