From c935de1fc6cdf80b900f1d3f56c8de2f0bec8ab9 Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sat, 3 Apr 2010 22:09:52 +0200
Subject: [PATCH] Create user in the right database for Ingres.

---
 bacula/src/cats/create_ingres_database.in  | 2 ++
 bacula/src/cats/grant_ingres_privileges.in | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/bacula/src/cats/create_ingres_database.in b/bacula/src/cats/create_ingres_database.in
index a287352f86..1e4973de70 100755
--- 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 1aab5985d2..82bab040d4 100755
--- 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
 
-- 
2.39.5