BEE Backport bacula/src/qt-console/tray-monitor/tray_conf.cpp

This commit is the result of the squash of the following main commits:

Author: Henrique <henrique.faria@baculasystems.com>
Date:   Mon Oct 14 21:10:25 2019 -0300

    android: added automatic File Daemon startup when the App tries to connect with it

Author: Alain Spineux <alain@baculasystems.com>
Date:   Tue Apr 9 11:13:50 2019 +0200

    PSK: Add PSK to QT's applications

    - add "TLS PSK Enable" to resources
    - update hello messages
    - rename authenticatebase.c to .cc and add the file to the QT tools
      because of a RTTI compilation problem.
      I use .cc because it works best with both bacula's CORE and QT
      to be compiled as C++ and not C
    - call init_crypto() and init_signals() in tray-monitor

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Feb 29 13:38:03 2016 +0100

    Add new tray monitor

diff --git a/bacula/src/qt-console/tray-monitor/tray_conf.cpp b/bacula/src/qt-console/tray-monitor/tray_conf.cpp
index 295990049be8b500c6c786cedf6b8d8b90069a15..86d2b9239cdc1012d197462066486d3de724e32c 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray_conf.cpp
+++ b/bacula/src/qt-console/tray-monitor/tray_conf.cpp
@@ -93,6 +93,7 @@ static RES_ITEM dir_items[] = {
    {"ConnectTimeout", store_time,ITEM(res_main.connect_timeout),   0, ITEM_DEFAULT, 10},
    {"UseSetIp", store_bool,      ITEM(res_main.use_setip),  0, 0, 0},
    {"TlsEnable",      store_bool,    ITEM(res_main.tls_enable), 0, 0, 0},
+   {"TlsPskEnable",   store_bool,    ITEM(res_main.tls_psk_enable), 0, ITEM_DEFAULT, tls_psk_default},
    {"TlsCaCertificateFile", store_dir, ITEM(res_main.tls_ca_certfile), 0, 0, 0},
    {"TlsCaCertificateDir", store_dir,  ITEM(res_main.tls_ca_certdir), 0, 0, 0},
    {"TlsCertificate", store_dir,       ITEM(res_main.tls_certfile), 0, 0, 0},
@@ -116,7 +117,9 @@ static RES_ITEM cli_items[] = {
    {"ConnectTimeout", store_time,ITEM(res_main.connect_timeout),   0, ITEM_DEFAULT, 10},
    {"Remote",   store_bool,       ITEM(res_main.use_remote), 0, ITEM_DEFAULT, 0},
    {"Monitor",  store_bool,       ITEM(res_main.use_monitor), 0, ITEM_DEFAULT, 0},
+   {"Managed",  store_bool,       ITEM(res_main.managed), 0, ITEM_DEFAULT, 0},
    {"TlsEnable",      store_bool,    ITEM(res_main.tls_enable), 0, 0, 0},
+   {"TlsPskEnable",   store_bool,    ITEM(res_main.tls_psk_enable), 0, ITEM_DEFAULT, tls_psk_default},
    {"TlsCaCertificateFile", store_dir, ITEM(res_main.tls_ca_certfile), 0, 0, 0},
    {"TlsCaCertificateDir", store_dir,  ITEM(res_main.tls_ca_certdir), 0, 0, 0},
    {"TlsCertificate", store_dir,       ITEM(res_main.tls_certfile), 0, 0, 0},
@@ -137,6 +140,7 @@ static RES_ITEM store_items[] = {
    {"ConnectTimeout", store_time,ITEM(res_main.connect_timeout),   0, ITEM_DEFAULT, 10},
    {"Monitor",  store_bool,       ITEM(res_main.use_monitor), 0, ITEM_DEFAULT, 0},
    {"TlsEnable",      store_bool,    ITEM(res_main.tls_enable), 0, 0, 0},
+   {"TlsPskEnable",   store_bool,    ITEM(res_main.tls_psk_enable), 0, ITEM_DEFAULT, tls_psk_default},
    {"TlsCaCertificateFile", store_dir, ITEM(res_main.tls_ca_certfile), 0, 0, 0},
    {"TlsCaCertificateDir", store_dir,  ITEM(res_main.tls_ca_certdir), 0, 0, 0},
    {"TlsCertificate", store_dir,       ITEM(res_main.tls_certfile), 0, 0, 0},