Fix get_basename() -- rewrite

[bacula/bacula] / bacula / src / cats / make_catalog_backup.pl.in

diff --git a/bacula/src/cats/make_catalog_backup.pl.in b/bacula/src/cats/make_catalog_backup.pl.in
index f955d93c2c78b8f9af0a411e94b2565682049fe9..efb91fd2616e0b6caa97e897e917aa6244a35411 100644 (file)
--- a/bacula/src/cats/make_catalog_backup.pl.in
+++ b/bacula/src/cats/make_catalog_backup.pl.in
@@ -69,10 +69,13 @@ sub dump_pgsql
     if ($args{db_port}) {
         $ENV{PGPORT}=$args{db_port};
     }
-
+    if ($args{db_user}) {
+        $ENV{PGUSER}=$args{db_user};
+    }
+    if ($args{db_password}) {
+        $ENV{PGPASSWORD}=$args{db_password};
+    }
     $ENV{PGDATABASE}=$args{db_name};
-    $ENV{PGUSER}=$args{db_user};
-    $ENV{PGPASSWORD}=$args{db_password};
     exec("HOME='$wd' pg_dump -c > '$wd/$args{db_name}.sql'");
     print "Error while executing postgres dump $!\n";
     return 1;               # in case of error