From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sat, 3 Apr 2010 19:16:50 +0000 (+0200)
Subject: Do all Ingres operations as the user invoking the script just as for all
X-Git-Tag: Release-5.0.2~118
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bea3788b3f0d90c89d8fa912b2d574a8f6de8d38;p=bacula%2Fbacula

Do all Ingres operations as the user invoking the script just as for all
the other databases. The grant script will make sure the db_user will have
the proper access rights to the database tables and sequences.
---

diff --git a/bacula/src/cats/grant_ingres_privileges.in b/bacula/src/cats/grant_ingres_privileges.in
index d937334542..1aab5985d2 100755
--- a/bacula/src/cats/grant_ingres_privileges.in
+++ b/bacula/src/cats/grant_ingres_privileges.in
@@ -2,11 +2,10 @@
 #
 # shell script TO GRANT privileges to the bacula database
 #
-db_user=${db_user:-@db_user@}
 bindir=@SQL_BINDIR@
 db_name=${db_name:-@db_name@}
 
-if sql -u${db_user} ${db_name} $* <<END-OF-DATA
+if sql ${db_name} $* <<END-OF-DATA
 
 -- for tables
 GRANT ALL ON TABLE filename TO ${db_user};
diff --git a/bacula/src/cats/make_ingres_tables.in b/bacula/src/cats/make_ingres_tables.in
index 62908f34c4..caeeaffdde 100755
--- a/bacula/src/cats/make_ingres_tables.in
+++ b/bacula/src/cats/make_ingres_tables.in
@@ -3,6 +3,7 @@
 # shell script to create Bacula PostgreSQL tables
 #
 bindir=@SQL_BINDIR@
+PATH="$bindir:$PATH"
 db_name=${db_name:-@db_name@}
 
 sql $* ${db_name} <<END-OF-DATA