From 92ec54c9b36c6289dc311867958f418bcd77f449 Mon Sep 17 00:00:00 2001 From: Jonathan Mainguy Date: Tue, 5 Jan 2016 15:53:21 -0500 Subject: [PATCH] Fix bad merge --- database/mysql/mysql_user.py | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/database/mysql/mysql_user.py b/database/mysql/mysql_user.py index 51f6e9ea1d4..3ca952ca08e 100644 --- a/database/mysql/mysql_user.py +++ b/database/mysql/mysql_user.py @@ -267,29 +267,6 @@ def user_mod(cursor, user, host, host_all, password, encrypted, new_priv, append cursor.execute("ALTER USER %s@%s IDENTIFIED BY %s", (user, host, password)) changed = True - - # Handle privileges - if new_priv is not None: - curr_priv = privileges_get(cursor, user,host) - - # If the user has privileges on a db.table that doesn't appear at all in - # the new specification, then revoke all privileges on it. - for db_table, priv in curr_priv.iteritems(): - # If the user has the GRANT OPTION on a db.table, revoke it first. - if "GRANT" in priv: - grant_option = True - if db_table not in new_priv: - if user != "root" and "PROXY" not in priv and not append_privs: - privileges_revoke(cursor, user,host,db_table,priv,grant_option) - changed = True - - # If the user doesn't currently have any privileges on a db.table, then - # we can perform a straight grant operation. - for db_table, priv in new_priv.iteritems(): - if db_table not in curr_priv: - privileges_grant(cursor, user,host,db_table,priv) - changed = True - # Handle privileges if new_priv is not None: curr_priv = privileges_get(cursor, user,host)