ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-06 10:40:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

small fixes

Browse source
This commit is contained in:
Jorge-Rodriguez 2020-09-12 15:47:14 +03:00
parent 7411ad42bd
commit 42538ca38d
No known key found for this signature in database
GPG key ID: 43153D1EFD8F7D90
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/modules/mysql_user.py
View file

@ -519,6 +519,9 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
msg = "User unchanged" msg = "User unchanged"
grant_option = False grant_option = False
# Determine what user management method server uses
old_user_mgmt = use_old_user_mgmt(cursor)
if host_all: if host_all:
hostnames = user_get_hostnames(cursor, [user]) hostnames = user_get_hostnames(cursor, [user])
else: else:
@ -527,8 +530,6 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
for host in hostnames: for host in hostnames:
# Handle clear text and hashed passwords. # Handle clear text and hashed passwords.
if bool(password): if bool(password):
# Determine what user management method server uses
old_user_mgmt = use_old_user_mgmt(cursor)
# Get a list of valid columns in mysql.user table to check if Password and/or authentication_string exist # Get a list of valid columns in mysql.user table to check if Password and/or authentication_string exist
cursor.execute(""" cursor.execute("""
@ -680,7 +681,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
query = " ".join((pre_query, "%s@%s")) query = " ".join((pre_query, "%s@%s"))
cursor.execute(*mogrify_requires(query, (user, host), tls_requires)) cursor.execute(*mogrify_requires(query, (user, host), tls_requires))
else: else:
query = " ".join(pre_query, "%s@%s REQUIRE NONE") query = " ".join((pre_query, "%s@%s REQUIRE NONE"))
cursor.execute(query, (user, host)) cursor.execute(query, (user, host))
changed = True changed = True