Add %D option to edit_job_code, simplify callbacks on director side

[bacula/bacula] / bacula / src / cats / drop_ingres_database.in

diff --git a/bacula/src/cats/drop_ingres_database.in b/bacula/src/cats/drop_ingres_database.in
index 23c75fe287995334af042d1fbe5be4cd92d5aca7..3e4fb2960c7ebb7961406e7b8fc7fa925df66e88 100755 (executable)
--- a/bacula/src/cats/drop_ingres_database.in
+++ b/bacula/src/cats/drop_ingres_database.in
@@ -3,10 +3,12 @@
 # shell script to drop Bacula database(s)
 #
 
-bindir=@SQL_BINDIR@
-db_name=@db_name@
+bindir=@INGRES_BINDIR@
+PATH="$bindir:$PATH"
+db_name=${db_name:-@db_name@}
+db_user=${db_user:-@db_user@}
 
-if destroydb ${db_name}
+if destroydb -u${db_user} ${db_name}
 then
    echo "Drop of ${db_name} database succeeded."
 else