Fixed postgresql grant script which I seem to have updated while I thought I updated...

[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 e441ec3c646a2770ff54ec767ac4c3af1a6d0b98..77ba1981a673f2d9cbf6c4e1f9f560e6d1a082ab 100644 (file)
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -2,11 +2,11 @@
 #
 # shell script to grant privileges to the bacula database
 #
-db_user=${db_user-@db_user@}
+db_user=${db_user:-@db_user@}
 bindir=@SQL_BINDIR@
-db_name=${db_name-@db_name@}
+db_name=${db_name:-@db_name@}
 
-if $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
+$bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
 create user ${db_user};
 
@@ -32,30 +32,32 @@ grant all on status   to ${db_user};
 grant all on location    to ${db_user};
 grant all on locationlog  to ${db_user};
 grant all on log         to ${db_user};
-grant all on jobhistory          to ${db_user};
-
+grant all on jobhisto    to ${db_user};
+grant all on PathHierarchy  to ${db_user};
+grant all on PathVisibility to ${db_user};
 -- for sequences on those tables
 
 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 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 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 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 log_logid_seq              to ${db_user};
+grant select, update on jobhisto_jobid_seq        to ${db_user};
 END-OF-DATA
+if [ $? -eq 0 ]
 then
-   echo "Privileges for ${db_user} granted on ${db_name}."
+   echo "Privileges for user ${db_user} granted on database ${db_name}."
    exit 0
 else
    echo "Error creating privileges."