Merge pull request #48561 from garethgreenaway/48507_mysql_grants_inc…

…orrect_failure [2018.3] fixes to grants in mysql module
saltstack · Jul 13, 2018 · 2d923f2 · 2d923f2
2 parents 5b5a930 + 14c59da
commit 2d923f2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/salt/modules/mysql.py b/salt/modules/mysql.py
@@ -1812,11 +1812,16 @@ def grant_exists(grant,
             if not target_tokens:  # Avoid the overhead of re-calc in loop
                 target_tokens = _grant_to_tokens(target)
             grant_tokens = _grant_to_tokens(grant)
-            grant_tokens_database = grant_tokens['database'].replace('"', '').replace('\\', '').replace('`', '')
-            target_tokens_database = target_tokens['database'].replace('"', '').replace('\\', '').replace('`', '')
-            if grant_tokens['user'] == target_tokens['user'] and \
-                    grant_tokens_database == target_tokens_database and \
-                    grant_tokens['host'] == target_tokens['host'] and \
+
+            _grant_tokens = {}
+            _target_tokens = {}
+            for item in ['user', 'database', 'host']:
+                _grant_tokens[item] = grant_tokens[item].replace('"', '').replace('\\', '').replace('`', '')
+                _target_tokens[item] = target_tokens[item].replace('"', '').replace('\\', '').replace('`', '')
+
+            if _grant_tokens['user'] == _target_tokens['user'] and \
+                    _grant_tokens['database'] == _target_tokens['database'] and \
+                    _grant_tokens['host'] == _target_tokens['host'] and \
                     set(grant_tokens['grant']) >= set(target_tokens['grant']):
                 return True
             else: