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 fa90165a9d0e9d2912549385c39010a017143a06..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};