Merge pull request #310 from bareos/dev/franku/master/stop_timer_befo…

…re_return_from_function stop timer before return from function
bareos · Oct 28, 2019 · 5cbe42e · 5cbe42e
2 parents c4c8d47 + 4c32d3c
commit 5cbe42e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -351,6 +351,7 @@ bool BareosSocket::ConsoleAuthenticateWithDirector(
     dir->StopTimer();
     return false;
   }
+  dir->StopTimer();
 
   Dmsg1(6, ">dird: %s", dir->msg);
 
@@ -396,7 +397,10 @@ bool BareosSocket::TwoWayAuthenticate(JobControlRecord* jcr,
 
     btimer_t* tid = StartBsockTimer(this, AUTH_TIMEOUT);
 
-    if (ConnectionReceivedTerminateSignal()) { return false; }
+    if (ConnectionReceivedTerminateSignal()) {
+      if (tid) { StopBsockTimer(tid); }
+      return false;
+    }
 
     auth_success = cram_md5_handshake.DoHandshake(initiated_by_remote);
     if (!auth_success) {