07Sep05

- Add ability to have passwords on backup of catalog as
  alternate 3rd argument. Submitted by a user.
- Turn off TapeAlert by default if user enables a Device
  and add a note to install mtx.

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 6e98a95a62716cf43ee316ad2d20549647b083a0..829d12a977016999c0113bfbb9596dc37582130e 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -35,8 +35,10 @@ Document:
 - Pruning with Admin job.
 - Restore of all files for a Job or set of jobs even if the file
   records have been removed from the catalog.
+- Does WildFile match against full name?  Doc.
 
 For 1.39:
+- New directive "Delete purged Volumes"
 - new pool XXX with ScratchPoolId = MyScratchPool's PoolId and
   let it fill itself, and RecyclePoolId = XXX's PoolId so I can
   see if it become stable and I just have to supervise

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 333f269dc959b566c930a7d0892cc3264f78450f..4f424cf6653fe7868d32af147b0197a6314322fa 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,11 @@
 General:
 
 Changes to 1.37.38:
+07Sep05
+- Add ability to have passwords on backup of catalog as
+  alternate 3rd argument. Submitted by a user.
+- Turn off TapeAlert by default if user enables a Device
+  and add a note to install mtx.
 04Sep05
 - Fix out of order volumes during restore.
 

diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in
index dcb05b7165cbe08eb5104aa229b100d77294e4a4..cdc11255b88c0eefb9596ae0d5cce1eab841712b 100755 (executable)
--- 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,10 +17,18 @@ 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
+    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
-      @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql
+      if test $# -gt 2; then
+        export PGPASSWORD=$3
+      fi
+      exec @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql
     else
       echo ".dump" | @SQL_BINDIR@/sqlite3 $1.db >$1.sql
     fi

diff --git a/bacula/src/stored/bacula-sd.conf.in b/bacula/src/stored/bacula-sd.conf.in
index c0de3fa006c35b3d9f5f72de9705f62cd9751294..ce1609126b1bc17cd176eb4adf86dfaa5d4baf6f 100644 (file)
--- a/bacula/src/stored/bacula-sd.conf.in
+++ b/bacula/src/stored/bacula-sd.conf.in
@@ -74,6 +74,7 @@ Device {
 #  RemovableMedia = yes;
 #  RandomAccess = no;
 #  AutoChanger = yes
+#  # Enable the Alert command only if you have the mtx package loaded
 #  Alert Command = "sh -c 'tapeinfo -f %c |grep TapeAlert|cat'"
 #}
 
@@ -87,6 +88,7 @@ Device {
 #  RemovableMedia = yes;
 #  RandomAccess = no;
 #  AutoChanger = yes
+#  # Enable the Alert command only if you have the mtx package loaded
 #  Alert Command = "sh -c 'tapeinfo -f %c |grep TapeAlert|cat'"
 #}
 
@@ -104,6 +106,7 @@ Device {
 ## Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
 ## Changer Device = /dev/sg0
 ## AutoChanger = yes
+#  # Enable the Alert command only if you have the mtx package loaded
 ## Alert Command = "sh -c 'tapeinfo -f %c |grep TapeAlert|cat'"
 #}
 

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 13dab19d9045c9469eda3967366f7ee86c422688..ed37245d0287b8b6748d4fb34562cc3743486126 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.37.38"
-#define BDATE   "04 September 2005"
-#define LSMDATE "04Sep05"
+#define BDATE   "07 September 2005"
+#define LSMDATE "07Sep05"
 
 /* Debug flags */
 #undef  DEBUG