From 735a717d58d1067f556135b81429c96c917cbc04 Mon Sep 17 00:00:00 2001 From: Frank Ueberschar Date: Mon, 13 Aug 2018 13:05:26 +0200 Subject: [PATCH] bsock: tls connection as shared pointer - changed declaration - copy constructor makes a copy of the pointer --- core/src/lib/bsock.cc | 1 + core/src/lib/bsock.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc index 2c7092094f7..5b98737ba85 100644 --- a/core/src/lib/bsock.cc +++ b/core/src/lib/bsock.cc @@ -105,6 +105,7 @@ BareosSocket::BareosSocket(const BareosSocket &other) peer_addr = other.peer_addr; local_daemon_type_ = other.local_daemon_type_; remote_daemon_type_ = other.remote_daemon_type_; + tls_conn = other.tls_conn; /* protected: */ jcr_ = other.jcr_; diff --git a/core/src/lib/bsock.h b/core/src/lib/bsock.h index babb5bfb6d2..cf264ac88d0 100644 --- a/core/src/lib/bsock.h +++ b/core/src/lib/bsock.h @@ -81,7 +81,7 @@ class DLL_IMP_EXP BareosSocket : public SmartAlloc { } BareosDaemonType local_daemon_type_; BareosDaemonType remote_daemon_type_; - std::unique_ptr tls_conn; /* Associated tls connection */ + std::shared_ptr tls_conn; /* Associated tls connection */ protected: JobControlRecord *jcr_; /* JobControlRecord or NULL for error msgs */