[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-652-gf8c7c21

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  f8c7c215de92536de1ef8a8633870b434b8ec318 (commit)
       via  2e0b871698d03ddbc0dd24dd7dedd390b7b0f07e (commit)
      from  6b388d3a1e5a6d3bf87f85d5dadc08759d589ba1 (commit)

Summary of changes:
 etc/acl.mysql |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 2e0b871698d03ddbc0dd24dd7dedd390b7b0f07e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Aug 31 17:29:55 2010 -0400

    For MySQL, stop dropping privileges when we grant our own ACLs
    
    This also means that the DBA user no longer needs to have connect
    rights to the 'mysql' database.

diff --git a/etc/acl.mysql b/etc/acl.mysql
index 0982ca2..8d1d07e 100755
--- a/etc/acl.mysql
+++ b/etc/acl.mysql
@@ -14,9 +14,6 @@ sub acl {
     }
     print "Granting access to $db_user\@'$db_rthost' on $db_name.\n";
     return (
-        "USE mysql;",
-        "DELETE FROM user WHERE user = '$db_user';",
-        "DELETE FROM db where db = '$db_name';",
         "GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE
                ON $db_name.*
                TO '$db_user'\@'$db_rthost'

commit f8c7c215de92536de1ef8a8633870b434b8ec318
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Aug 31 17:47:09 2010 -0400

    Escape database names passed to mysql's GRANT, for databases containing _ or %

diff --git a/etc/acl.mysql b/etc/acl.mysql
index 8d1d07e..1688237 100755
--- a/etc/acl.mysql
+++ b/etc/acl.mysql
@@ -13,9 +13,10 @@ sub acl {
         return;
     }
     print "Granting access to $db_user\@'$db_rthost' on $db_name.\n";
+    $db_name =~ s/([_%])/\\$1/g;
     return (
         "GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE
-               ON $db_name.*
+               ON `$db_name`.*
                TO '$db_user'\@'$db_rthost'
                IDENTIFIED BY '$db_pass';",
     );

-----------------------------------------------------------------------