From 9c6bba1608b659d0070e950ffcb990a4b867367d Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 25 Jan 2011 09:34:23 +0100
Subject: [PATCH] Fix #1684 Use --with-db-password option in
 grant_bacula_privileges scripts

---
 bacula/src/cats/grant_mysql_privileges.in      | 8 ++++++--
 bacula/src/cats/grant_postgresql_privileges.in | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bacula/src/cats/grant_mysql_privileges.in b/bacula/src/cats/grant_mysql_privileges.in
index 6ff5969193..09a1569fa1 100644
--- a/bacula/src/cats/grant_mysql_privileges.in
+++ b/bacula/src/cats/grant_mysql_privileges.in
@@ -5,11 +5,15 @@
 db_user=${db_user:-@db_user@}
 bindir=@SQL_BINDIR@
 db_name=${db_name:-@db_name@}
+db_password=@db_password@
+if [ "$db_password" != "" ]; then
+   pass="identified by '$db_password'"
+fi
 
 if $bindir/mysql $* -u root -f <<END-OF-DATA
 use mysql
-grant all privileges on ${db_name}.* to ${db_user}@localhost;
-grant all privileges on ${db_name}.* to ${db_user}@"%";
+grant all privileges on ${db_name}.* to ${db_user}@localhost ${pass};
+grant all privileges on ${db_name}.* to ${db_user}@"%" ${pass};
 select * from user;
 flush privileges;
 END-OF-DATA
diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index fa90165a9d..d037ceee95 100644
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -5,10 +5,15 @@
 db_user=${db_user:-@db_user@}
 bindir=@SQL_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};
-- 
2.39.5