bsock: do not reset tls connection from a cloned bsock

bareos · Oct 2, 2018 · db4474b · db4474b
1 parent 8e6e279
commit db4474b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -125,15 +125,17 @@ BareosSocket::~BareosSocket() { Dmsg0(100, "Destruct BareosSocket\n"); }
 
 void BareosSocket::CloseTlsConnectionAndFreeMemory()
 {
-  LockMutex();
-  if (tls_conn && !tls_conn_init) {
-    tls_conn->TlsBsockShutdown(this);
-    tls_conn.reset();
-  } else if (tls_conn_init) {
-    tls_conn_init->TlsBsockShutdown(this);
-    tls_conn_init.reset();
+  if (!cloned_) {
+    LockMutex();
+    if (tls_conn && !tls_conn_init) {
+      tls_conn->TlsBsockShutdown(this);
+      tls_conn.reset();
+    } else if (tls_conn_init) {
+      tls_conn_init->TlsBsockShutdown(this);
+      tls_conn_init.reset();
+    }
+    UnlockMutex();
   }
-  UnlockMutex();
 }
 
 /**
@@ -169,7 +171,11 @@ bool BareosSocket::SetLocking()
 
 void BareosSocket::ClearLocking()
 {
-  if (mutex_) { mutex_.reset(); }
+  if (!cloned_) {
+    if (mutex_) {
+      mutex_.reset();
+    }
+  }
 }
 
 void BareosSocket::LockMutex()

diff --git a/core/src/lib/bsock_tcp.cc b/core/src/lib/bsock_tcp.cc
@@ -906,13 +906,9 @@ int BareosSocketTCP::WaitDataIntr(int sec, int usec)
 
 void BareosSocketTCP::close()
 {
-   if (!cloned_) {
-      ClearLocking();
-
-      if (tls_conn || tls_conn_init) {
-         CloseTlsConnectionAndFreeMemory();
-      }
-   }
+   /* if not cloned */
+   ClearLocking();
+   CloseTlsConnectionAndFreeMemory();
 
    if (fd_ >= 0) {
       if (!cloned_) {