From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 10 Apr 2010 10:18:59 +0000 (+0200)
Subject: Revert "Do all Ingres operations as the user invoking the script just as for all"
X-Git-Tag: Release-5.0.2~45
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2dcc9de7145ec03a10911f480ee2caa9ecffad4b;p=bacula%2Fbacula

Revert "Do all Ingres operations as the user invoking the script just as for all"

This reverts commit bea3788b3f0d90c89d8fa912b2d574a8f6de8d38.
---

diff --git a/bacula/src/cats/grant_ingres_privileges.in b/bacula/src/cats/grant_ingres_privileges.in
index 1aab5985d2..d937334542 100755
--- a/bacula/src/cats/grant_ingres_privileges.in
+++ b/bacula/src/cats/grant_ingres_privileges.in
@@ -2,10 +2,11 @@
 #
 # 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 ${db_name} $* <<END-OF-DATA
+if sql -u${db_user} ${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 caeeaffdde..62908f34c4 100755
--- a/bacula/src/cats/make_ingres_tables.in
+++ b/bacula/src/cats/make_ingres_tables.in
@@ -3,7 +3,6 @@
 # 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