diff --git a/config/autoload/global.php b/config/autoload/global.php index 38a93bbdc16..68388c22d1f 100644 --- a/config/autoload/global.php +++ b/config/autoload/global.php @@ -134,6 +134,13 @@ function read_dir_config($config, $file) $arr[key($config)]['allowed_cns'] = ""; } + if(array_key_exists('catalog', $instance) && isset($instance['catalog'])) { + $arr[key($config)]['catalog'] = $instance['catalog']; + } + else { + $arr[key($config)]['catalog'] = "MyCatalog"; + } + } next($config); diff --git a/vendor/Bareos/library/Bareos/BSock/BareosBSock.php b/vendor/Bareos/library/Bareos/BSock/BareosBSock.php index ab9ff89c101..54f015e5c95 100644 --- a/vendor/Bareos/library/Bareos/BSock/BareosBSock.php +++ b/vendor/Bareos/library/Bareos/BSock/BareosBSock.php @@ -78,6 +78,7 @@ class BareosBSock implements BareosBSockInterface 'cert_file' => null, 'cert_file_passphrase' => null, 'allowed_cns' => null, + 'catalog' => null, ); private $socket = null; @@ -870,7 +871,7 @@ public function send_command($cmd, $api=0, $jobid=null) break; } - if(self::send("use")) { + if(self::send("use catalog=" . $this->config['catalog'])) { $debug = self::receive_message(); }