X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fmake_catalog_backup.in;h=a9643a12a934022e5cc7aca756342cb0cc0ca404;hb=edfffe456de676cc799719b684f883976d467f06;hp=8bc30a582b2dc43f26537463cef8c84fe5e916e6;hpb=9b08891a1f633f194adc4cbadc512d343f6f46de;p=bacula%2Fbacula

diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in
index 8bc30a582b..a9643a12a9 100755
--- a/bacula/src/cats/make_catalog_backup.in
+++ b/bacula/src/cats/make_catalog_backup.in
@@ -8,37 +8,56 @@
 #  $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 ""). WARNING!!! Passing the password via the command line is 
+#     insecure and should not be used since any user can display the command 
+#     line arguments and the environment using ps.  Please consult your
+#     MySQL or PostgreSQL manual for secure methods of specifying the
+#     password.
+#  $4 is the host on which the database is located
 #     (default "")
 #
 #
+BINDIR=@SQL_BINDIR@
+
 cd @working_dir@
-rm -f bacula.sql
-if test xsqlite = x@DB_NAME@ ; then
-  echo ".dump" | @SQL_BINDIR@/sqlite $1.db >$1.sql
+rm -f $1.sql
+if test xsqlite = x@DB_TYPE@ ; then
+  echo ".dump" | ${BINDIR}/sqlite $1.db >$1.sql
 else
-  if test xmysql = x@DB_NAME@ ; then
+  if test xmysql = x@DB_TYPE@ ; then
     if test $# -gt 2; then
       MYSQLPASSWORD=" --password=$3"
     else
       MYSQLPASSWORD=""
     fi
-    @SQL_BINDIR@/mysqldump -u $2$MYSQLPASSWORD -f --opt $1 >$1.sql
+    if test $# -gt 3; then
+      MYSQLHOST=" --host=$4"
+    else
+      MYSQLHOST=""
+    fi
+    ${BINDIR}/mysqldump -u ${2}${MYSQLPASSWORD}${MYSQLHOST} -f --opt $1 >$1.sql
   else			      
-    if test xpostgresql = x@DB_NAME@ ; then
+    if test xpostgresql = x@DB_TYPE@ ; then
       if test $# -gt 2; then
 	PGPASSWORD=$3
-		export PGPASSWORD
+	export PGPASSWORD
+      fi
+      if test $# -gt 3; then
+	PGHOST=" --host=$4"
+      else
+	PGHOST=""
       fi
-      exec @SQL_BINDIR@/pg_dump -c -U $2 $1 >$1.sql
+      # you could also add --compress for compression.  See man pg_dump
+      exec ${BINDIR}/pg_dump -c $PGHOST -U $2 $1 >$1.sql
     else
-      echo ".dump" | @SQL_BINDIR@/sqlite3 $1.db >$1.sql
+      echo ".dump" | ${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/*
+#     rm -f ${BINDIR}/../var/bacula/*
 #     mysql <bacula.sql
 #
 #  To read back a SQLite database use:
@@ -49,6 +68,6 @@ fi
 #  To read back a PostgreSQL database use:
 #     cd @working_dir@
 #     dropdb bacula
-#     createdb bacula
+#     createdb bacula -E SQL_ASCII
 #     psql bacula <bacula.sql
 #