See http://bugs.bacula.org/bug_view_advanced_page.php?bug_id=0000103

Alter src/cats/make_catalog_backup.in so it does need incoming parameters to
do its job correctly.   Different options are needed for different database
tools.  e.g. '-u bacula' for MySQL, versus '-U bacula' for PostgreSQL.

At the same time, remove the parameters passed to this script in
src/dird/bacula-dir.conf.in

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1600 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in
index 61cb4b6d1da95baa1c09896a4308d7ec46f7d62a..dbc4d5943571f41a4e90a869512e348f31ae0a48 100755 (executable)
--- a/bacula/src/cats/make_catalog_backup.in
+++ b/bacula/src/cats/make_catalog_backup.in
@@ -6,12 +6,12 @@
 cd @working_dir@
 rm -f bacula.sql
 if test xsqlite = x@DB_NAME@ ; then
-  echo ".dump" | @SQL_BINDIR@/sqlite $* bacula.db >bacula.sql
+  echo ".dump" | @SQL_BINDIR@/sqlite bacula.db >bacula.sql
 else
   if test xmysql = x@DB_NAME@ ; then
-    @SQL_BINDIR@/mysqldump $* -f --opt bacula >bacula.sql
+    @SQL_BINDIR@/mysqldump -u bacula -f --opt bacula >bacula.sql
   else
-    @SQL_BINDIR@/pg_dump $* bacula >bacula.sql
+    @SQL_BINDIR@/pg_dump -U bacula bacula >bacula.sql
   fi
 fi
 #

diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in
index cc7058323dadc4e3766d0105e1d162315b7a502f..bc0647923109843f9327bc623b0aff5d87eed1f3 100644 (file)
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -54,7 +54,7 @@ Job {
   FileSet="Catalog"
   Schedule = "WeeklyCycleAfterBackup"
   # This creates an ASCII copy of the catalog
-  RunBeforeJob = "@scriptdir@/make_catalog_backup -u bacula"
+  RunBeforeJob = "@scriptdir@/make_catalog_backup"
   # This deletes the copy of the catalog
   RunAfterJob  = "@scriptdir@/delete_catalog_backup"
   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"