Enable CAPS between FD/SD

diff --git a/bacula/src/filed/hello.c b/bacula/src/filed/hello.c
index 343234afd40a9e81dd9c23ff5f6e84e5fe2d24ee..5e8f44db9ae7056263ea84164c9a7d624894a0ea 100644 (file)
--- 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 10674c4dc61344d1c087e3a6f41d7942b3a697d9..f6844b776f1dc4184fd15621f3f23a135415de72 100644 (file)
--- 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()) {