Use db_escape_string() in all db_xxx functions

[bacula/bacula] / bacula / src / cats / grant_postgresql_privileges.in

diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index 499381e9d35fd8c68a05edf6fba5f7be7d618276..f39725ddc0959da160aacff1c43f973eca9b106b 100644 (file)
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -3,12 +3,17 @@
 # shell script to grant privileges to the bacula database
 #
 db_user=${db_user:-@db_user@}
-bindir=@SQL_BINDIR@
+bindir=@POSTGRESQL_BINDIR@
 db_name=${db_name:-@db_name@}
+db_password=@db_password@
+if [ "$db_password" != "" ]; then
+   pass="password '$db_password'"
+fi
+
 
-if $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
+$bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
-create user ${db_user};
+create user ${db_user} ${pass};
 
 -- for tables
 grant all on unsavedfiles to ${db_user};
@@ -33,7 +38,9 @@ grant all on location   to ${db_user};
 grant all on locationlog  to ${db_user};
 grant all on log         to ${db_user};
 grant all on jobhisto    to ${db_user};
-
+grant all on PathHierarchy  to ${db_user};
+grant all on PathVisibility to ${db_user};
+grant all on RestoreObject to ${db_user};
 -- for sequences on those tables
 
 grant select, update on filename_filenameid_seq    to ${db_user};
@@ -52,8 +59,9 @@ grant select, update on device_deviceid_seq      to ${db_user};
 grant select, update on location_locationid_seq    to ${db_user};
 grant select, update on locationlog_loclogid_seq   to ${db_user};
 grant select, update on log_logid_seq             to ${db_user};
-
+grant select, update on restoreobject_restoreobjectid_seq to ${db_user};
 END-OF-DATA
+if [ $? -eq 0 ]
 then
    echo "Privileges for user ${db_user} granted on database ${db_name}."
    exit 0