bsock: tls connection as shared pointer

- changed declaration - copy constructor makes a copy of the pointer
bareos · Aug 13, 2018 · 735a717 · 735a717
1 parent cf6cdeb
commit 735a717
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -81,7 +81,7 @@ class DLL_IMP_EXP BareosSocket : public SmartAlloc {
    }
    BareosDaemonType local_daemon_type_;
    BareosDaemonType remote_daemon_type_;
-   std::unique_ptr<Tls> tls_conn;    /* Associated tls connection */
+   std::shared_ptr<Tls> tls_conn;    /* Associated tls connection */
 
 protected:
    JobControlRecord *jcr_;           /* JobControlRecord or NULL for error msgs */