dhb left console.cpp uncompileable. Modified a comment in mainwin.cpp

[bacula/bacula] / bacula / src / filed / authenticate.c

diff --git a/bacula/src/filed/authenticate.c b/bacula/src/filed/authenticate.c
index 8122061e6703fed1042c94084c24ba495d2b72f1..e7994c49eb7a5caf13daf75ccafbcaa33f148dda 100644 (file)
--- a/bacula/src/filed/authenticate.c
+++ b/bacula/src/filed/authenticate.c
@@ -62,9 +62,9 @@ static bool authenticate(int rcode, BSOCK *bs, JCR* jcr)
    }
    if (bs->msglen < 25 || bs->msglen > 500) {
       Dmsg2(50, "Bad Hello command from Director at %s. Len=%d.\n",
-            bs->who, bs->msglen);
+            bs->who(), bs->msglen);
       char addr[64];
-      char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who : addr;
+      char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who() : addr;
       Emsg2(M_FATAL, 0, _("Bad Hello command from Director at %s. Len=%d.\n"),
              who, bs->msglen);
       goto auth_fatal;
@@ -73,10 +73,10 @@ static bool authenticate(int rcode, BSOCK *bs, JCR* jcr)
 
    if (sscanf(bs->msg, "Hello Director %s calling", dirname) != 1) {
       char addr[64];
-      char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who : addr;
+      char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who() : addr;
       bs->msg[100] = 0;
       Dmsg2(50, "Bad Hello command from Director at %s: %s\n",
-            bs->who, bs->msg);
+            bs->who(), bs->msg);
       Emsg2(M_FATAL, 0, _("Bad Hello command from Director at %s: %s\n"),
             who, bs->msg);
       goto auth_fatal;
@@ -88,7 +88,7 @@ static bool authenticate(int rcode, BSOCK *bs, JCR* jcr)
    }
    if (!director) {
        char addr[64];
-       char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who : addr;
+       char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who() : addr;
       Emsg2(M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"), 
             dirname, who);
       goto auth_fatal;
@@ -112,21 +112,25 @@ static bool authenticate(int rcode, BSOCK *bs, JCR* jcr)
    tid = start_bsock_timer(bs, AUTH_TIMEOUT);
    /* Challenge the director */
    auth_success = cram_md5_challenge(bs, director->password, tls_local_need, compatible);  
+   if (job_canceled(jcr)) {
+      auth_success = false;
+      goto auth_fatal;                   /* quick exit */
+   }
    if (auth_success) {
       auth_success = cram_md5_respond(bs, director->password, &tls_remote_need, &compatible);
       if (!auth_success) {
           char addr[64];
-          char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who : addr;
+          char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who() : addr;
           Dmsg1(50, "cram_get_auth failed for %s\n", who);
       }
    } else {
        char addr[64];
-       char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who : addr;
+       char *who = bnet_get_peer(bs, addr, sizeof(addr)) ? bs->who() : addr;
        Dmsg1(50, "cram_auth failed for %s\n", who);
    }
    if (!auth_success) {
        Emsg1(M_FATAL, 0, _("Incorrect password given by Director at %s.\n"),
-             bs->who);
+             bs->who());
        goto auth_fatal;
    }
 
@@ -215,21 +219,27 @@ int authenticate_storagedaemon(JCR *jcr)
       }
    }
 
+   if (job_canceled(jcr)) {
+      auth_success = false;     /* force quick exit */
+      goto auth_fatal;
+   }
+
    /* Respond to SD challenge */
    auth_success = cram_md5_respond(sd, jcr->sd_auth_key, &tls_remote_need, &compatible);
+   if (job_canceled(jcr)) {
+      auth_success = false;     /* force quick exit */
+      goto auth_fatal;
+   }
    if (!auth_success) {
-      Dmsg1(50, "cram_respond failed for %s\n", sd->who);
+      Dmsg1(50, "cram_respond failed for %s\n", sd->who());
    } else {
       /* Now challenge him */
       auth_success = cram_md5_challenge(sd, jcr->sd_auth_key, tls_local_need, compatible);
       if (!auth_success) {
-         Dmsg1(50, "cram_challenge failed for %s\n", sd->who);
+         Dmsg1(50, "cram_challenge failed for %s\n", sd->who());
       }
    }
 
-   /* Destroy session key */
-   memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
-
    if (!auth_success) {
       Jmsg(jcr, M_FATAL, 0, _("Authorization key rejected by Storage daemon.\n"
        "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"));
@@ -253,7 +263,7 @@ int authenticate_storagedaemon(JCR *jcr)
 
    if (have_tls && tls_local_need >= BNET_TLS_OK && tls_remote_need >= BNET_TLS_OK) {
       /* Engage TLS! Full Speed Ahead! */
-      if (!bnet_tls_client(me->tls_ctx, sd)) {
+      if (!bnet_tls_client(me->tls_ctx, sd, NULL)) {
          Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n"));
          auth_success = false;
          goto auth_fatal;
@@ -261,6 +271,8 @@ int authenticate_storagedaemon(JCR *jcr)
    }
 
 auth_fatal:
+   /* Destroy session key */
+   memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
    stop_bsock_timer(tid);
    /* Single thread all failures to avoid DOS */
    if (!auth_success) {