Split messages line by line before sending it to syslog() fix #3325

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

diff --git a/bacula/src/cats/grant_mysql_privileges.in b/bacula/src/cats/grant_mysql_privileges.in
index bb53b46a94e8baa90c6ed996cf8442e6d78bb9bf..3f315d2380ff73f2a9ec2d945877956d17c1137f 100644 (file)
--- a/bacula/src/cats/grant_mysql_privileges.in
+++ b/bacula/src/cats/grant_mysql_privileges.in
@@ -2,19 +2,23 @@
 #
 # shell script to grant privileges to the bacula database
 #
-db_user=${db_user-@db_user@}
-bindir=@SQL_BINDIR@
-db_name=${db_name-@db_name@}
+db_user=${db_user:-@db_user@}
+bindir=@MYSQL_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
 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."