From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 15 Oct 2008 10:07:10 +0000 (+0000)
Subject: Apply tray-monitor patch from Bastian Friedrich to make it
X-Git-Tag: Release-3.0.0~789
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f34a5ba1846b84a3d2023c3d8b94c40ffac3c186;p=bacula%2Fbacula

Apply tray-monitor patch from Bastian Friedrich to make it
     work with the new FD.

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

diff --git a/bacula/src/tray-monitor/authenticate.c b/bacula/src/tray-monitor/authenticate.c
index 427c45682d..2735111a31 100644
--- a/bacula/src/tray-monitor/authenticate.c
+++ b/bacula/src/tray-monitor/authenticate.c
@@ -194,7 +194,7 @@ int authenticate_file_daemon(JCR *jcr, MONITOR *monitor, CLIENT* client)
    }
    Dmsg1(110, "<stored: %s", fd->msg);
    stop_bsock_timer(tid);
-   if (strncmp(fd->msg, FDOKhello, sizeof(FDOKhello)) != 0) {
+   if (strncmp(fd->msg, FDOKhello, sizeof(FDOKhello)-1) != 0) {
       Jmsg(jcr, M_FATAL, 0, _("File daemon rejected Hello command\n"));
       return 0;
    }
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 57c9ad0c85..96bdcde97b 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -17,6 +17,9 @@ dbdriver
 remove reader/writer in FOPTS????
 
 General:
+15Oct08
+kes  Apply tray-monitor patch from Bastian Friedrich to make it
+     work with the new FD.
 14Oct08
 kes  Apply cleanup patch from Marco
 kes  Apply patch from  Marco van Wieringen <mvw@planets.elm.net>