Create user in the right database for Ingres.

diff --git a/bacula/src/cats/create_ingres_database.in b/bacula/src/cats/create_ingres_database.in
index a287352f8634fdb186623a05d51ddfbec6bac986..1e4973de705a52006cbe0be5c9b17909a2dcd4c3 100755 (executable)
--- a/bacula/src/cats/create_ingres_database.in
+++ b/bacula/src/cats/create_ingres_database.in
@@ -4,6 +4,7 @@
 #
 
 bindir=@SQL_BINDIR@
+PATH="$bindir:$PATH"
 db_name=@db_name@
 
 # use SQL_ASCII to be able to put any filename into
@@ -26,4 +27,5 @@ then
 else
    echo "Creation of ${db_name} database failed."
 fi
+
 exit 0

diff --git a/bacula/src/cats/grant_ingres_privileges.in b/bacula/src/cats/grant_ingres_privileges.in
index 1aab5985d25618beb001ddda949c3f3ad28dc98e..82bab040d4af5ca67cde4732b855acd8e25a3cad 100755 (executable)
--- a/bacula/src/cats/grant_ingres_privileges.in
+++ b/bacula/src/cats/grant_ingres_privileges.in
@@ -4,6 +4,12 @@
 #
 bindir=@SQL_BINDIR@
 db_name=${db_name:-@db_name@}
+db_user=${db_user:-@db_user@}
+
+sql iidbdb $* <<END-OF-DATA
+CREATE USER ${db_user}
+\g
+END-OF-DATA
 
 if sql ${db_name} $* <<END-OF-DATA