X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fauthenticate.c;h=d93f1359969ae0d574ecea82314c7c7f37529658;hb=65f843b332c5fd751863c6dbbc2028ca46bdf2d6;hp=7b3eb759016baa112a5b1e173d7d73087d73e4de;hpb=9eb269c404b167039d0d2350052f700cf68a2975;p=bacula%2Fbacula diff --git a/bacula/src/stored/authenticate.c b/bacula/src/stored/authenticate.c index 7b3eb75901..d93f135996 100644 --- a/bacula/src/stored/authenticate.c +++ b/bacula/src/stored/authenticate.c @@ -49,15 +49,15 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr) #endif if (rcode != R_DIRECTOR) { - Dmsg1(50, _("I only authenticate Directors, not %d\n"), rcode); + Dmsg1(50, "I only authenticate Directors, not %d\n", rcode); Emsg1(M_FATAL, 0, _("I only authenticate Directors, not %d\n"), rcode); return 0; } if (bs->msglen < 25 || bs->msglen > 200) { - Dmsg2(50, _("Bad Hello command from Director at %s. Len=%d.\n"), - bs->who, bs->msglen); + Dmsg2(50, "Bad Hello command from Director at %s. Len=%d.\n", + bs->who, bs->msglen); Emsg2(M_FATAL, 0, _("Bad Hello command from Director at %s. Len=%d.\n"), - bs->who, bs->msglen); + bs->who, bs->msglen); return 0; } dirname = get_pool_memory(PM_MESSAGE); @@ -65,26 +65,26 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr) if (sscanf(bs->msg, "Hello Director %127s calling\n", dirname) != 1) { bs->msg[100] = 0; - Dmsg2(50, _("Bad Hello command from Director at %s: %s\n"), - bs->who, bs->msg); + Dmsg2(50, "Bad Hello command from Director at %s: %s\n", + bs->who, bs->msg); Emsg2(M_FATAL, 0, _("Bad Hello command from Director at %s: %s\n"), - bs->who, bs->msg); + bs->who, bs->msg); return 0; } director = NULL; unbash_spaces(dirname); - LockRes(); +// LockRes(); foreach_res(director, rcode) { if (strcmp(director->hdr.name, dirname) == 0) - break; + break; } - UnlockRes(); +// UnlockRes(); if (!director) { - Dmsg2(50, _("Connection from unknown Director %s at %s rejected.\n"), - dirname, bs->who); + Dmsg2(50, "Connection from unknown Director %s at %s rejected.\n", + dirname, bs->who); Emsg2(M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n" - "Please see http://www.bacula.org/html-manual/faq.html#AuthorizationErrors for help.\n"), - dirname, bs->who); + "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"), + dirname, bs->who); free_pool_memory(dirname); return 0; } @@ -95,7 +95,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr) if (director->tls_require) { tls_local_need = BNET_TLS_REQUIRED; } else { - tls_local_need = BNET_TLS_OK; + tls_local_need = BNET_TLS_OK; } } @@ -110,7 +110,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr) if (auth_success) { auth_success = cram_md5_get_auth(bs, director->password, &tls_remote_need); if (!auth_success) { - Dmsg1(50, "cram_get_auth failed with %s\n", bs->who); + Dmsg1(50, "cram_get_auth failed with %s\n", bs->who); } } else { Dmsg1(50, "cram_auth failed with %s\n", bs->who); @@ -118,7 +118,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr) if (!auth_success) { Emsg0(M_FATAL, 0, _("Incorrect password given by Director.\n" - "Please see http://www.bacula.org/html-manual/faq.html#AuthorizationErrors for help.\n")); + "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n")); auth_success = false; goto auth_fatal; } @@ -126,7 +126,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr) /* Verify that the remote host is willing to meet our TLS requirements */ if (tls_remote_need < tls_local_need && tls_local_need != BNET_TLS_OK && tls_remote_need != BNET_TLS_OK) { Emsg0(M_FATAL, 0, _("Authorization problem: Remote server did not" - " advertise required TLS support.\n")); + " advertise required TLS support.\n")); auth_success = false; goto auth_fatal; } @@ -142,9 +142,9 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr) if (tls_local_need >= BNET_TLS_OK && tls_remote_need >= BNET_TLS_OK) { /* Engage TLS! Full Speed Ahead! */ if (!bnet_tls_server(director->tls_ctx, bs, verify_list)) { - Emsg0(M_FATAL, 0, "TLS negotiation failed.\n"); - auth_success = false; - goto auth_fatal; + Emsg0(M_FATAL, 0, _("TLS negotiation failed.\n")); + auth_success = false; + goto auth_fatal; } } #endif /* HAVE_TLS */ @@ -162,7 +162,7 @@ auth_fatal: * * Basic tasks done here: * Assume the Hello message is already in the input - * buffer. We then authenticate him. + * buffer. We then authenticate him. * Get device, media, and pool information from Director * * This is the channel across which we will send error @@ -174,7 +174,7 @@ int authenticate_director(JCR *jcr) if (!authenticate(R_DIRECTOR, dir, jcr)) { bnet_fsend(dir, "%s", Dir_sorry); - Dmsg1(50, _("Unable to authenticate Director at %s.\n"), dir->who); + Dmsg1(50, "Unable to authenticate Director at %s.\n", dir->who); Emsg1(M_ERROR, 0, _("Unable to authenticate Director at %s.\n"), dir->who); bmicrosleep(5, 0); return 0; @@ -198,7 +198,7 @@ int authenticate_filed(JCR *jcr) if (me->tls_require) { tls_local_need = BNET_TLS_REQUIRED; } else { - tls_local_need = BNET_TLS_OK; + tls_local_need = BNET_TLS_OK; } } @@ -213,7 +213,7 @@ int authenticate_filed(JCR *jcr) if (auth_success) { auth_success = cram_md5_get_auth(fd, jcr->sd_auth_key, &tls_remote_need); if (!auth_success) { - Dmsg1(50, "cram-get-auth failed with %s\n", fd->who); + Dmsg1(50, "cram-get-auth failed with %s\n", fd->who); } } else { Dmsg1(50, "cram-auth failed with %s\n", fd->who); @@ -221,8 +221,8 @@ int authenticate_filed(JCR *jcr) if (!auth_success) { Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n" - "Please see http://www.bacula.org/html-manual/faq.html#AuthorizationErrors for help.\n"), - fd->who); + "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"), + fd->who); auth_success = false; goto auth_fatal; } @@ -230,7 +230,7 @@ int authenticate_filed(JCR *jcr) /* Verify that the remote host is willing to meet our TLS requirements */ if (tls_remote_need < tls_local_need && tls_local_need != BNET_TLS_OK && tls_remote_need != BNET_TLS_OK) { Jmsg(jcr, M_FATAL, 0, _("Authorization problem: Remote server did not" - " advertise required TLS support.\n")); + " advertise required TLS support.\n")); auth_success = false; goto auth_fatal; } @@ -246,9 +246,9 @@ int authenticate_filed(JCR *jcr) if (tls_local_need >= BNET_TLS_OK && tls_remote_need >= BNET_TLS_OK) { /* Engage TLS! Full Speed Ahead! */ if (!bnet_tls_server(me->tls_ctx, fd, verify_list)) { - Jmsg(jcr, M_FATAL, 0, "TLS negotiation failed.\n"); - auth_success = false; - goto auth_fatal; + Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n")); + auth_success = false; + goto auth_fatal; } } #endif /* HAVE_TLS */ @@ -257,8 +257,8 @@ auth_fatal: stop_bsock_timer(tid); if (!auth_success) { Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n" - "Please see http://www.bacula.org/html-manual/faq.html#AuthorizationErrors for help.\n"), - fd->who); + "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"), + fd->who); } jcr->authenticated = auth_success; return auth_success;