From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 1 Mar 2021 11:01:17 +0000 (+0100)
Subject: Enable CAPS between FD/SD
X-Git-Tag: Release-11.3.2~687
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=702779380e0851dd340f3ef16c7da06ed0af1a40;p=thirdparty%2Fbacula.git

Enable CAPS between FD/SD
---

diff --git a/bacula/src/filed/hello.c b/bacula/src/filed/hello.c
index 343234afd..5e8f44db9 100644
--- a/bacula/src/filed/hello.c
+++ b/bacula/src/filed/hello.c
@@ -144,10 +144,6 @@ bool send_hello_sd(JCR *jcr, char *Job, int tlspsk)
 
 /* ======================== */
 
-#ifdef COMMUNITY
-bool send_fdcaps(JCR *jcr, BSOCK *sd) { return false; }
-bool recv_sdcaps(JCR *jcr) { return false; }
-#else
 /*
  */
 bool send_fdcaps(JCR *jcr, BSOCK *sd)
@@ -206,7 +202,6 @@ bool recv_sdcaps(JCR *jcr)
    jcr->max_dedup_block_size = max_block_size;
    return true;
 }
-#endif
 
 /* Commands sent to Director */
 static char hello[]    = "Hello %s calling %d tlspsk=%d\n";
diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 10674c4dc..f6844b776 100644
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -2779,10 +2779,8 @@ static int storage_cmd(JCR *jcr)
       }
 
       /* Receive and send capabilities */
-      if (beef) {
-         if (!recv_sdcaps(jcr) || !send_fdcaps(jcr, jcr->store_bsock)) {
-            return false;
-         }
+      if (!recv_sdcaps(jcr) || !send_fdcaps(jcr, jcr->store_bsock)) {
+         return false;
       }
 
       if (!auth.authenticate_storagedaemon()) {