| Author | 
Committer | 
Branch | 
Timestamp | 
Parent | 
 | 
| pstorz | 
pstorz | 
master | 
2018-02-14 15:27 | 
master bc10efa2 | 
Pending | 
| 
	Changeset | 
Merge branch 'tls-psk' | 
| mod - src/console/console.cc | 
Diff File | 
| mod - src/console/console_conf.cc | 
Diff File | 
| mod - src/console/console_conf.h | 
Diff File | 
| mod - src/dird/authenticate.cc | 
Diff File | 
| mod - src/dird/backup.cc | 
Diff File | 
| mod - src/dird/dird.cc | 
Diff File | 
| mod - src/dird/dird_conf.cc | 
Diff File | 
| mod - src/dird/dird_conf.h | 
Diff File | 
| mod - src/dird/migrate.cc | 
Diff File | 
| mod - src/dird/restore.cc | 
Diff File | 
| mod - src/dird/verify.cc | 
Diff File | 
| mod - src/filed/authenticate.cc | 
Diff File | 
| mod - src/filed/filed.cc | 
Diff File | 
| mod - src/filed/filed_conf.cc | 
Diff File | 
| mod - src/filed/filed_conf.h | 
Diff File | 
| mod - src/filed/heartbeat.cc | 
Diff File | 
| mod - src/include/bareos.h | 
Diff File | 
| mod - src/include/jcr.h | 
Diff File | 
| mod - src/lib/CMakeLists.txt | 
Diff File | 
| mod - src/lib/bnet.cc | 
Diff File | 
| mod - src/lib/bsock.cc | 
Diff File | 
| mod - src/lib/bsock.h | 
Diff File | 
| mod - src/lib/bsock_tcp.cc | 
Diff File | 
| mod - src/lib/cram-md5.cc | 
Diff File | 
| mod - src/lib/crypto.h | 
Diff File | 
| mod - src/lib/crypto_cache.cc | 
Diff File | 
| mod - src/lib/crypto_openssl.cc | 
Diff File | 
| mod - src/lib/jcr.cc | 
Diff File | 
| mod - src/lib/lib.h | 
Diff File | 
| mod - src/lib/parse_conf.cc | 
Diff File | 
| mod - src/lib/parse_conf.h | 
Diff File | 
| mod - src/lib/protos.h | 
Diff File | 
| mod - src/lib/res.cc | 
Diff File | 
| add - src/lib/tls_conf.cc | 
Diff File | 
| add - src/lib/tls_conf.h | 
Diff File | 
| mod - src/lib/tls_gnutls.cc | 
Diff File | 
| mod - src/lib/tls_none.cc | 
Diff File | 
| mod - src/lib/tls_nss.cc | 
Diff File | 
| mod - src/lib/tls_openssl.cc | 
Diff File | 
| mod - src/qt-tray-monitor/authenticate.cc | 
Diff File | 
| mod - src/qt-tray-monitor/authenticate.h | 
Diff File | 
| mod - src/qt-tray-monitor/mainwindow.cc | 
Diff File | 
| mod - src/qt-tray-monitor/monitoritem.cc | 
Diff File | 
| mod - src/qt-tray-monitor/tray_conf.cc | 
Diff File | 
| mod - src/qt-tray-monitor/tray_conf.h | 
Diff File | 
| mod - src/stored/authenticate.cc | 
Diff File | 
| mod - src/stored/backends/unix_file_device.cc | 
Diff File | 
| mod - src/stored/scan.cc | 
Diff File | 
| mod - src/stored/stored.cc | 
Diff File | 
| mod - src/stored/stored_conf.cc | 
Diff File | 
| mod - src/stored/stored_conf.h | 
Diff File |