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 fde40d5b8b692e0be28a00c3b3d0c74add0be8b7..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
+
 
 $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};
@@ -35,25 +40,26 @@ 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_seq    to ${db_user};
-grant select, update on path_seq       to ${db_user};
-grant select, update on fileset_seq    to ${db_user};
-grant select, update on pool_seq       to ${db_user};
-grant select, update on client_seq     to ${db_user};
-grant select, update on media_seq      to ${db_user};
-grant select, update on job_seq                to ${db_user};
-grant select, update on jobhisto_jobid_seq  to ${db_user};
-grant select, update on file_seq       to ${db_user};
-grant select, update on jobmedia_seq    to ${db_user};
-grant select, update on basefiles_seq  to ${db_user};
-grant select, update on storage_seq    to ${db_user};
-grant select, update on mediatype_seq   to ${db_user};
-grant select, update on device_seq     to ${db_user};
-grant select, update on location_seq    to ${db_user};
-grant select, update on locationlog_seq to ${db_user};
-grant select, update on log_seq                to ${db_user};
+grant select, update on filename_filenameid_seq    to ${db_user};
+grant select, update on path_pathid_seq           to ${db_user};
+grant select, update on fileset_filesetid_seq     to ${db_user};
+grant select, update on pool_poolid_seq           to ${db_user};
+grant select, update on client_clientid_seq       to ${db_user};
+grant select, update on media_mediaid_seq         to ${db_user};
+grant select, update on job_jobid_seq             to ${db_user};
+grant select, update on file_fileid_seq           to ${db_user};
+grant select, update on jobmedia_jobmediaid_seq    to ${db_user};
+grant select, update on basefiles_baseid_seq      to ${db_user};
+grant select, update on storage_storageid_seq     to ${db_user};
+grant select, update on mediatype_mediatypeid_seq  to ${db_user};
+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