From 27abc4dc413acb060c52e405749c0db3bba179ff Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <marco.van.wieringen@bareos.com>
Date: Mon, 8 Aug 2016 20:44:37 +0200
Subject: [PATCH] Only send catalog when an explicit catalog is set for a
 director.

---
 config/autoload/global.php                         | 11 +++++------
 install/directors.ini                              |  4 ++--
 vendor/Bareos/library/Bareos/BSock/BareosBSock.php |  6 ++++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/config/autoload/global.php b/config/autoload/global.php
index f6075578..c571da21 100644
--- a/config/autoload/global.php
+++ b/config/autoload/global.php
@@ -164,37 +164,36 @@ function read_directors_ini($directors, $directors_ini)
             $arr[key($directors)]['ca_file'] = $instance['ca_file'];
          }
          else {
-            $arr[key($directors)]['ca_file'] = "";
+            $arr[key($directors)]['ca_file'] = null;
          }
 
          if(array_key_exists('cert_file', $instance) && isset($instance['cert_file'])) {
             $arr[key($directors)]['cert_file'] = $instance['cert_file'];
          }
          else {
-            $arr[key($directors)]['cert_file'] = "";
+            $arr[key($directors)]['cert_file'] = null;
          }
 
          if(array_key_exists('cert_file_passphrase', $instance) && isset($instance['cert_file_passphrase'])) {
             $arr[key($directors)]['cert_file_passphrase'] = $instance['cert_file_passphrase'];
          }
          else {
-            $arr[key($directors)]['cert_file_passphrase'] = "";
+            $arr[key($directors)]['cert_file_passphrase'] = null;
          }
 
          if(array_key_exists('allowed_cns', $instance) && isset($instance['allowed_cns'])) {
             $arr[key($directors)]['allowed_cns'] = $instance['allowed_cns'];
          }
          else {
-            $arr[key($directors)]['allowed_cns'] = "";
+            $arr[key($directors)]['allowed_cns'] = null;
          }
 
          if(array_key_exists('catalog', $instance) && isset($instance['catalog'])) {
             $arr[key($directors)]['catalog'] = $instance['catalog'];
          }
          else {
-            $arr[key($directors)]['catalog'] = "MyCatalog";
+            $arr[key($directors)]['catalog'] = null;
          }
-
       }
 
       next($directors);
diff --git a/install/directors.ini b/install/directors.ini
index 63133bbf..dda35a07 100644
--- a/install/directors.ini
+++ b/install/directors.ini
@@ -17,8 +17,8 @@ diraddress = "localhost"
 ; Default value is 9101
 dirport	= 9101
 
-; Default value is "MyCatalog"
-catalog = "MyCatalog"
+; Set catalog to explicit value if you have multiple catalogs
+;catalog = "MyCatalog"
 
 ; Note: TLS has not been tested and documented, yet.
 ;tls_verify_peer = false
diff --git a/vendor/Bareos/library/Bareos/BSock/BareosBSock.php b/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
index 06fc51b1..eb6618c5 100644
--- a/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
+++ b/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
@@ -871,8 +871,10 @@ public function send_command($cmd, $api=0, $jobid=null)
             break;
       }
 
-      if(self::send("use catalog=" . $this->config['catalog'])) {
-         $debug = self::receive_message();
+      if (isset($this->config['catalog'])) {
+         if(self::send("use catalog=" . $this->config['catalog'])) {
+            $debug = self::receive_message();
+         }
       }
 
       if($jobid != null) {