From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 21 Jan 2003 22:24:46 +0000 (+0000)
Subject: Don't zap dummy SD password
X-Git-Tag: Release-1.29~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5d081a071f556f875809edf16ba6ec3de2cc606d;p=bacula%2Fbacula

Don't zap dummy SD password


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

diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index 42df24fcde..fdeecd0cef 100644
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -85,12 +85,15 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time,
     */
    bnet_fsend(fd, jobcmd, jcr->JobId, jcr->Job, jcr->VolSessionId, 
       jcr->VolSessionTime, jcr->sd_auth_key);
-   memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
-   Dmsg1(110, ">filed: %s", fd->msg);
+   if (strcmp(jcr->sd_auth_key, "dummy") != 0) {
+      memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
+   }
+   Dmsg1(100, ">filed: %s", fd->msg);
    if (bnet_recv(fd) > 0) {
        Dmsg1(110, "<filed: %s", fd->msg);
        if (strncmp(fd->msg, OKjob, strlen(OKjob)) != 0) {
-          Jmsg(jcr, M_FATAL, 0, _("File daemon rejected Job command: %s\n"), fd->msg);
+          Jmsg(jcr, M_FATAL, 0, _("File daemon \"%s\" rejected Job command: %s\n"), 
+	     jcr->client->hdr.name, fd->msg);
 	  set_jcr_job_status(jcr, JS_ErrorTerminated);
 	  return 0;
        } else {