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 1aab5985d25618beb001ddda949c3f3ad28dc98e..d937334542ead645a46c59ce4508ce780214745c 100755 (executable)
--- 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 caeeaffddee883137ae5d5d29f44ed07e574e032..62908f34c471edb98a83244b5952ebf30865e02c 100755 (executable)
--- 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