X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fetc%2Facl.mysql;h=26e27fbfbcf20109752dc53fbf1f7833d13ee404;hb=7903b3fb9ae73fc5fb46f98575141fbe9713f880;hp=5bd88347224b1c0088417e5f07c5152c3c6a306d;hpb=c582e92888b4a5553e1b4e5214cf35217e4a0cf0;p=freeside.git

diff --git a/rt/etc/acl.mysql b/rt/etc/acl.mysql
index 5bd883472..26e27fbfb 100755
--- a/rt/etc/acl.mysql
+++ b/rt/etc/acl.mysql
@@ -1,8 +1,24 @@
+
 sub acl {
-return  (
-"USE mysql;",
-"DELETE FROM user WHERE user = '${RT::DatabaseUser}';",
-"DELETE FROM db where db = '${RT::DatabaseName}';",
-"GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE ON ${RT::DatabaseName}.* TO ${RT::DatabaseUser}\@'${RT::DatabaseRTHost}' IDENTIFIED BY '${RT::DatabasePassword}';");
+    my $db_name = RT->Config->Get('DatabaseName');
+    my $db_rthost = RT->Config->Get('DatabaseRTHost');
+    my $db_user = RT->Config->Get('DatabaseUser');
+    my $db_pass = RT->Config->Get('DatabasePassword');
+    unless ( $db_user ) {
+        RT->Logger->warn("DatabaseUser option is not defined or empty. Skipping...");
+        return;
+    }
+    if ( $db_user eq 'root' ) {
+        RT->Logger->warn("DatabaseUser is root. Skipping...");
+        return;
+    }
+    $db_name =~ s/([_%\\])/\\$1/g;
+    return (
+        "GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE
+               ON `$db_name`.*
+               TO '$db_user'\@'$db_rthost'
+               IDENTIFIED BY '$db_pass';",
+    );
 }
+
 1;