From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 26 Sep 2007 11:11:37 +0000 (+0000)
Subject: More connect debug code
X-Git-Tag: Release-7.0.0~5606
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=38006c06e0cb1911122219a4dd7b30b3635ce564;p=bacula%2Fbacula

More connect debug code

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5652 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/stored/authenticate.c b/bacula/src/stored/authenticate.c
index d323084c2b..2d46b399d9 100644
--- a/bacula/src/stored/authenticate.c
+++ b/bacula/src/stored/authenticate.c
@@ -38,6 +38,8 @@
 #include "bacula.h"
 #include "stored.h"
 
+const int dbglvl = 3;
+
 static char Dir_sorry[] = "3999 No go\n";
 static char OK_hello[]  = "3000 OK Hello\n";
 
@@ -57,12 +59,12 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
    alist *verify_list = NULL;
 
    if (rcode != R_DIRECTOR) {
-      Dmsg1(50, "I only authenticate Directors, not %d\n", rcode);
+      Dmsg1(dbglvl, "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 > 500) {
-      Dmsg2(50, "Bad Hello command from Director at %s. Len=%d.\n",
+      Dmsg2(dbglvl, "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);
@@ -73,7 +75,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
 
    if (sscanf(bs->msg, "Hello Director %127s calling", dirname) != 1) {
       bs->msg[100] = 0;
-      Dmsg2(50, "Bad Hello command from Director at %s: %s\n",
+      Dmsg2(dbglvl, "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);
@@ -86,7 +88,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
          break;
    }
    if (!director) {
-      Dmsg2(50, "Connection from unknown Director %s at %s rejected.\n",
+      Dmsg2(dbglvl, "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/rel-manual/faq.html#AuthorizationErrors for help.\n"),
@@ -114,10 +116,10 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
    if (auth_success) {
       auth_success = cram_md5_respond(bs, director->password, &tls_remote_need, &compatible);
       if (!auth_success) {
-         Dmsg1(50, "cram_get_auth failed with %s\n", bs->who());
+         Dmsg1(dbglvl, "cram_get_auth failed with %s\n", bs->who());
       }
    } else {
-      Dmsg1(50, "cram_auth failed with %s\n", bs->who());
+      Dmsg1(dbglvl, "cram_auth failed with %s\n", bs->who());
    }
 
    if (!auth_success) {
@@ -176,7 +178,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(dbglvl, "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;
@@ -217,10 +219,10 @@ int authenticate_filed(JCR *jcr)
        /* Respond to his challenge */
        auth_success = cram_md5_respond(fd, jcr->sd_auth_key, &tls_remote_need, &compatible);
        if (!auth_success) {
-          Dmsg1(50, "cram-get-auth failed with %s\n", fd->who());
+          Dmsg1(dbglvl, "cram-get-auth failed with %s\n", fd->who());
        }
    } else {
-      Dmsg1(50, "cram-auth failed with %s\n", fd->who());
+      Dmsg1(dbglvl, "cram-auth failed with %s\n", fd->who());
    }
 
    if (!auth_success) {
diff --git a/bacula/src/stored/job.c b/bacula/src/stored/job.c
index 1002c04f40..9da68019e9 100644
--- a/bacula/src/stored/job.c
+++ b/bacula/src/stored/job.c
@@ -236,6 +236,9 @@ void handle_filed_connection(BSOCK *fd, char *job_name)
    if (jcr->authenticated || !authenticate_filed(jcr)) {
       Dmsg1(100, "Authentication failed Job %s\n", jcr->Job);
       Jmsg(jcr, M_FATAL, 0, _("Unable to authenticate File daemon\n"));
+      if (debug_level == 3) {
+         Dmsg1(000, "Authentication failed Job %s\n", jcr->Job);
+      }
    } else {
       jcr->authenticated = true;
       Dmsg2(110, "OK Authentication jid=%u Job %s\n", (uint32_t)jcr->JobId, jcr->Job);