diff --git a/bacula-backup/bacula-backup-lib.pl b/bacula-backup/bacula-backup-lib.pl index c6efee2f8..bde33eeb3 100644 --- a/bacula-backup/bacula-backup-lib.pl +++ b/bacula-backup/bacula-backup-lib.pl @@ -16,7 +16,7 @@ $sd_conf_file = "$config{'bacula_dir'}/bacula-sd.conf"; $bconsole_conf_file = "$config{'bacula_dir'}/bconsole.conf"; $console_conf_file = "$config{'bacula_dir'}/console.conf"; $console_cmd = -r "$config{'bacula_dir'}/bconsole" ? - "$config{'bacula_dir'}/bconsole" + "$config{'bacula_dir'}/bconsole" : -r "$config{'bacula_dir'}/console" ? "$config{'bacula_dir'}/console" : &has_command("bconsole"); diff --git a/bacula-backup/index.cgi b/bacula-backup/index.cgi index 56dceb390..e5a957db2 100755 --- a/bacula-backup/index.cgi +++ b/bacula-backup/index.cgi @@ -18,9 +18,10 @@ if (&has_bacula_dir()) { # Test DB connection eval { $dbh = &connect_to_database(); }; if ($@) { - &ui_print_header(undef, $module_info{'desc'}, "", "intro", 1, 1, 0, - $hsl); - print &ui_config_link('index_edb', [ $@, undef ]),"

\n"; + $err = $@; + &ui_print_header(undef, $module_info{'desc'}, "", "intro", + 1, 1, 0, $hsl); + print &ui_config_link('index_edb', [ $err, undef ]),"

\n"; &ui_print_footer("/", $text{'index'}); exit; }