Fixed DB error message
authorJamie Cameron <jcameron@webmin.com>
Mon, 13 Aug 2007 21:47:48 +0000 (21:47 +0000)
committerJamie Cameron <jcameron@webmin.com>
Mon, 13 Aug 2007 21:47:48 +0000 (21:47 +0000)
bacula-backup/bacula-backup-lib.pl
bacula-backup/index.cgi

index c6efee2..bde33ee 100644 (file)
@@ -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");
index 56dceb3..e5a957d 100755 (executable)
@@ -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 ]),"<p>\n";
+               $err = $@;
+               &ui_print_header(undef, $module_info{'desc'}, "", "intro",
+                                1, 1, 0, $hsl);
+               print &ui_config_link('index_edb', [ $err, undef ]),"<p>\n";
                &ui_print_footer("/", $text{'index'});
                exit;
                }