| Author |
Committer |
Branch |
Timestamp |
Parent |
|
| franku |
franku |
dev |
2018-12-05 12:04 |
bareos-18.2 a5904499 |
Pending |
|
|
Changeset |
Merge branch 'dev/franku/bareos-18.2/18.2.4-rc2' into bareos-18.2 |
| mod - core/src/console/CMakeLists.txt |
Diff File |
| mod - core/src/console/auth_pam.cc |
Diff File |
| add - core/src/console/connect_to_director.cc |
Diff File |
| mod - core/src/console/console.cc |
Diff File |
| mod - core/src/console/console_conf.cc |
Diff File |
| mod - core/src/console/console_conf.h |
Diff File |
| mod - core/src/console/console_globals.cc |
Diff File |
| mod - core/src/console/console_globals.h |
Diff File |
| mod - core/src/dird/CMakeLists.txt |
Diff File |
| mod - core/src/dird/auth_pam.cc |
Diff File |
| mod - core/src/dird/auth_pam.h |
Diff File |
| mod - core/src/dird/authenticate.cc |
Diff File |
| mod - core/src/dird/authenticate.h |
Diff File |
| add - core/src/dird/authenticate_console.cc |
Diff File |
| mod - core/src/dird/backup.cc |
Diff File |
| mod - core/src/dird/dird.cc |
Diff File |
| mod - core/src/dird/dird_conf.cc |
Diff File |
| mod - core/src/dird/dird_conf.h |
Diff File |
| mod - core/src/dird/dird_globals.cc |
Diff File |
| mod - core/src/dird/dird_globals.h |
Diff File |
| mod - core/src/dird/fd_cmds.cc |
Diff File |
| mod - core/src/dird/job.cc |
Diff File |
| mod - core/src/dird/migrate.cc |
Diff File |
| mod - core/src/dird/ndmp_dma_generic.cc |
Diff File |
| mod - core/src/dird/restore.cc |
Diff File |
| mod - core/src/dird/sd_cmds.cc |
Diff File |
| mod - core/src/dird/socket_server.cc |
Diff File |
| mod - core/src/dird/socket_server.h |
Diff File |
| mod - core/src/dird/ua_cmds.cc |
Diff File |
| mod - core/src/dird/ua_configure.cc |
Diff File |
| mod - core/src/dird/ua_server.cc |
Diff File |
| mod - core/src/dird/verify.cc |
Diff File |
| mod - core/src/filed/authenticate.cc |
Diff File |
| mod - core/src/filed/dir_cmd.cc |
Diff File |
| mod - core/src/filed/filed_conf.cc |
Diff File |
| mod - core/src/filed/socket_server.cc |
Diff File |
| mod - core/src/include/jcr.h |
Diff File |
| mod - core/src/lib/CMakeLists.txt |
Diff File |
| mod - core/src/lib/address_conf.cc |
Diff File |
| mod - core/src/lib/address_conf.h |
Diff File |
| add - core/src/lib/ascii_control_characters.h |
Diff File |
| add - core/src/lib/bareos_resource.h |
Diff File |
| mod - core/src/lib/bnet.cc |
Diff File |
| mod - core/src/lib/bnet.h |
Diff File |
| mod - core/src/lib/bnet_server_tcp.cc |
Diff File |
| mod - core/src/lib/bnet_server_tcp.h |
Diff File |
| mod - core/src/lib/bsock.cc |
Diff File |
| mod - core/src/lib/bsock.h |
Diff File |
| mod - core/src/lib/bsock_tcp.cc |
Diff File |
| mod - core/src/lib/bsock_tcp.h |
Diff File |
| add - core/src/lib/bstringlist.cc |
Diff File |
| add - core/src/lib/bstringlist.h |
Diff File |
| mod - core/src/lib/btimers.cc |
Diff File |
| add - core/src/lib/common_resource_header.h |
Diff File |
| mod - core/src/lib/cram_md5.cc |
Diff File |
| mod - core/src/lib/cram_md5.h |
Diff File |
| mod - core/src/lib/dlist.h |
Diff File |
| mod - core/src/lib/jcr.cc |
Diff File |
| mod - core/src/lib/message.cc |
Diff File |
| mod - core/src/lib/output_formatter.cc |
Diff File |
| mod - core/src/lib/parse_conf.cc |
Diff File |
| mod - core/src/lib/parse_conf.h |
Diff File |
| mod - core/src/lib/qualified_resource_name_type_converter.cc |
Diff File |
| mod - core/src/lib/qualified_resource_name_type_converter.h |
Diff File |
| mod - core/src/lib/res.cc |
Diff File |
| add - core/src/lib/s_password.h |
Diff File |
| mod - core/src/lib/signal.cc |
Diff File |
| mod - core/src/lib/tls.h |
Diff File |
| mod - core/src/lib/tls_conf.h |
Diff File |
| rm - core/src/lib/tls_conf_base.h |
Diff File |
| mod - core/src/lib/tls_conf_cert.cc |
Diff File |
| mod - core/src/lib/tls_conf_cert.h |
Diff File |
| mod - core/src/lib/tls_gnutls.cc |
Diff File |
| mod - core/src/lib/tls_gnutls.h |
Diff File |
| mod - core/src/lib/tls_openssl.cc |
Diff File |
| mod - core/src/lib/tls_openssl.h |
Diff File |
| mod - core/src/lib/tls_openssl_crl.cc |
Diff File |
| mod - core/src/lib/tls_openssl_crl.h |
Diff File |
| mod - core/src/lib/tls_openssl_private.cc |
Diff File |
| mod - core/src/lib/tls_psk_credentials.h |
Diff File |
| add - core/src/lib/try_tls_handshake_as_a_server.cc |
Diff File |
| mod - core/src/lib/util.cc |
Diff File |
| mod - core/src/lib/util.h |
Diff File |
| mod - core/src/lib/workq.cc |
Diff File |
| mod - core/src/qt-tray-monitor/authenticate.cc |
Diff File |
| mod - core/src/qt-tray-monitor/tray_conf.cc |
Diff File |
| mod - core/src/stored/authenticate.cc |
Diff File |
| mod - core/src/stored/dir_cmd.cc |
Diff File |
| mod - core/src/stored/socket_server.cc |
Diff File |
| mod - core/src/stored/stored.cc |
Diff File |
| mod - core/src/stored/stored_conf.cc |
Diff File |
| mod - core/src/tests/CMakeLists.txt |
Diff File |
| add - core/src/tests/bareos_test_sockets.cc |
Diff File |
| add - core/src/tests/bareos_test_sockets.h |
Diff File |
| rm - core/src/tests/bsock_dir_sd_connection_test.cc |
Diff File |
| mod - core/src/tests/bsock_test.cc |
Diff File |
| mod - core/src/tests/bsock_test.h |
Diff File |
| add - core/src/tests/bsock_test_connection_setup.cc |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/catalog/MyCatalog.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/client/bareos-fd.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/console/bareos-mon.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/director/bareos-dir.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/Catalog.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/LinuxAll.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/SelfTest.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/Windows All Drives.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/plugin-ldap.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/job/BackupCatalog.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/job/RestoreFiles.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/job/backup-bareos-fd.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/job/backup-ldap.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/job/restore-ldap.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/jobdefs/DefaultJob.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/messages/Daemon.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/messages/Standard.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/pool/Differential.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/pool/Full.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/pool/Incremental.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/pool/Scratch.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/profile/operator.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/schedule/WeeklyCycle.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/storage/File.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/storage/NULL.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/storage/Tape.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_disabled/bconsole.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/catalog/MyCatalog.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/client/bareos-fd.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/console/bareos-mon.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/director/bareos-dir.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/Catalog.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/LinuxAll.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/SelfTest.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/Windows All Drives.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/plugin-ldap.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/job/BackupCatalog.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/job/RestoreFiles.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/job/backup-bareos-fd.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/job/backup-ldap.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/job/restore-ldap.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/jobdefs/DefaultJob.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/messages/Daemon.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/messages/Standard.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/pool/Differential.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/pool/Full.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/pool/Incremental.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/pool/Scratch.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/profile/operator.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/schedule/WeeklyCycle.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/storage/File.conf |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/storage/NULL.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/storage/Tape.conf.example |
Diff File |
| add - core/src/tests/configs/console-director/tls_psk_default_enabled/bconsole.conf |
Diff File |
| mod - core/src/tests/create_resource.cc |
Diff File |
| add - core/src/tests/lib_tests.cc |
Diff File |
| mod - core/src/tests/qualified_resource_name_type_converter_test.cc |
Diff File |
| mod - regress/configs/bandwidth-limit-per-client-test/bareos-dir.conf.in |
Diff File |
| mod - regress/configs/bandwidth-limit-per-client-test/bareos-fd.conf.in |
Diff File |
| mod - regress/configs/bandwidth-limit-per-client-test/bareos-sd.conf.in |
Diff File |
| add - regress/configs/bandwidth-limit-per-client-test/bconsole.conf.in |
Diff File |
| mod - regress/prototype.conf |
Diff File |
| mod - regress/tests/bandwidth-limit-per-client-test |
Diff File |
| mod - webui/config/autoload/global.php |
Diff File |
| mod - webui/install/directors.ini |
Diff File |
| mod - webui/module/Auth/src/Auth/Controller/AuthController.php |
Diff File |
| mod - webui/vendor/Bareos/library/Bareos/BSock/BareosBSock.php |
Diff File |
| mod - webui/vendor/Bareos/library/Bareos/BSock/BareosBSockInterface.php |
Diff File |
| mod - webui/vendor/Bareos/library/Bareos/BSock/BareosBSockServiceFactory.php |
Diff File |
