bsock: renamed exit label in two_way_authenticate

bareos · Jun 1, 2018 · 96fccb4 · 96fccb4
1 parent df68111
commit 96fccb4
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -371,13 +371,13 @@ bool BareosSocket::two_way_authenticate(JobControlRecord *jcr,
    if (jcr && JobCanceled(jcr)) {
       Dmsg0(debuglevel, "Failed, because job is canceled.\n");
       auth_success = false; /* force quick exit */
-      goto auth_fatal;
+      goto _exit_two_way_authenticate;
    }
 
    if (password.encoding != p_encoding_md5) {
       Jmsg(jcr, M_FATAL, 0, _("Password encoding is not MD5. You are probably restoring a NDMP Backup "
                               "with a restore job not configured for NDMP protocol.\n"));
-      goto auth_fatal;
+      goto _exit_two_way_authenticate;
    }
 
    tid = StartBsockTimer(this, AUTH_TIMEOUT);
@@ -406,7 +406,7 @@ bool BareosSocket::two_way_authenticate(JobControlRecord *jcr,
             Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n"));
             Dmsg0(debuglevel, "TLS negotiation failed.\n");
             auth_success = false;
-            goto auth_fatal;
+            goto _exit_two_way_authenticate;
          }
       } else {
          std::shared_ptr<TLS_CONTEXT> tls_ctx = selected_local_tls->CreateClientContext(
@@ -421,7 +421,7 @@ bool BareosSocket::two_way_authenticate(JobControlRecord *jcr,
             Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n"));
             Dmsg0(debuglevel, "TLS negotiation failed.\n");
             auth_success = false;
-            goto auth_fatal;
+            goto _exit_two_way_authenticate;
          }
       }
 
@@ -468,16 +468,16 @@ bool BareosSocket::two_way_authenticate(JobControlRecord *jcr,
            what,
            identity,
            MANUAL_AUTH_URL);
-      goto auth_fatal;
+      goto _exit_two_way_authenticate;
    }
 
    if (jcr && JobCanceled(jcr)) {
       Dmsg0(debuglevel, "Failed, because job is canceled.\n");
       auth_success = false; /* force quick exit */
-      goto auth_fatal;
+      goto _exit_two_way_authenticate;
    }
 
-auth_fatal:
+_exit_two_way_authenticate:
    if (tid) {
       StopBsockTimer(tid);
       tid = NULL;