bsock: refactored code

- move redundant lines - set failed status where appropriate
bareos · Jul 30, 2018 · 05a7c9b · 05a7c9b
1 parent 4475fa1
commit 05a7c9b
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -347,6 +347,7 @@ bool BareosSocket::TwoWayAuthenticate(JobControlRecord *jcr,
                  what, identity, MANUAL_AUTH_URL);
          } else if (jcr && JobCanceled(jcr)) {
             Dmsg0(debuglevel, "Failed, because job is canceled.\n");
+            auth_success = false;
          } else if (!DoTlsHandshake(cram_md5_handshake.RemoteTlsPolicy(),
                                    tls_configuration,
                                    initiated_by_remote,
@@ -355,10 +356,6 @@ bool BareosSocket::TwoWayAuthenticate(JobControlRecord *jcr,
                                    jcr)) {
             auth_success = false;
          }
-         if (tid) {
-            StopBsockTimer(tid);
-            tid = nullptr;
-         }
       } else {  /* console-director connection: start with tls handshake */
          uint32_t remote_tls_policy;
          auth_success = TlsPolicyHandshake(this, initiated_by_remote,
@@ -367,6 +364,7 @@ bool BareosSocket::TwoWayAuthenticate(JobControlRecord *jcr,
             Dmsg1(debuglevel, "TlsPolicyHandshake failed with %s\n", what);
          } else if (jcr && JobCanceled(jcr)) {
             Dmsg0(debuglevel, "Failed, because job is canceled.\n");
+            auth_success = false;
          } else if (!DoTlsHandshake(remote_tls_policy,
                                    tls_configuration,
                                    initiated_by_remote,
@@ -380,14 +378,13 @@ bool BareosSocket::TwoWayAuthenticate(JobControlRecord *jcr,
                   "Authorization key rejected by %s %s.\n"
                   "Please see %s for help.\n",
                   what, identity, MANUAL_AUTH_URL);
+            auth_success = false;
          } else {
             auth_success = true;
          }
-
-         if (tid) {
-            StopBsockTimer(tid);
-            tid = nullptr;
-         }
+      }
+      if (tid) {
+         StopBsockTimer(tid);
       }
    }