X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fmake_catalog_backup.in;h=6c20a8ebd6287848583509c69225025c6ab4e2fc;hb=f8f848fdb5aace95292d905dc60fe0de45521859;hp=b4d2fbdd2839dcde2ce88e5db1d7fca9d3833992;hpb=d63d9c8839f6520ce4abb18cca73cb6ea5fd17a5;p=bacula%2Fbacula

diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in
index b4d2fbdd28..6c20a8ebd6 100755
--- a/bacula/src/cats/make_catalog_backup.in
+++ b/bacula/src/cats/make_catalog_backup.in
@@ -7,6 +7,8 @@
 #     of the output file (default = bacula).
 #  $2 is the user name with which to access the database
 #     (default = bacula).
+#  $3 is the password with which to access the database or "" if no password
+#     (default "")
 #
 #
 cd @working_dir@
@@ -15,16 +17,29 @@ if test xsqlite = x@DB_NAME@ ; then
   echo ".dump" | @SQL_BINDIR@/sqlite $1.db >$1.sql
 else
   if test xmysql = x@DB_NAME@ ; then
-    @SQL_BINDIR@/mysqldump -u $2 -f --opt $1 >$1.sql
-  else
-    @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql
+    if test $# -gt 2; then
+      MYSQLPASSWORD=" --password=$3"
+    else
+      MYSQLPASSWORD=""
+    fi
+    @SQL_BINDIR@/mysqldump -u $2$MYSQLPASSWORD -f --opt $1 >$1.sql
+  else			      
+    if test xpostgresql = x@DB_NAME@ ; then
+      if test $# -gt 2; then
+        PGPASSWORD=$3
+		export PGPASSWORD
+      fi
+      exec @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql
+    else
+      echo ".dump" | @SQL_BINDIR@/sqlite3 $1.db >$1.sql
+    fi
   fi
 fi
 #
 #  To read back a MySQL database use: 
 #     cd @working_dir@
 #     rm -f @SQL_BINDIR@/../var/bacula/*
-#     mysql bacula <bacula.sql
+#     mysql <bacula.sql
 #
 #  To read back a SQLite database use:
 #     cd @working_dir@
@@ -34,5 +49,6 @@ fi
 #  To read back a PostgreSQL database use:
 #     cd @working_dir@
 #     dropdb bacula
+#     createdb bacula
 #     psql bacula <bacula.sql
 #