From aed8620367a603ba0294f0cfb1b616244503d3dc Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 21 Feb 2024 23:54:31 +0200 Subject: [PATCH] fix order --- plugins/module_utils/user.py | 3 ++- plugins/modules/mysql_user.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py index 7131a66..4362910 100644 --- a/plugins/module_utils/user.py +++ b/plugins/module_utils/user.py @@ -152,11 +152,12 @@ def get_existing_authentication(cursor, user, host): def user_add(cursor, user, host, host_all, password, encrypted, plugin, plugin_hash_string, plugin_auth_string, new_priv, - attributes, tls_requires, module, reuse_existing_password, + attributes, tls_requires, reuse_existing_password, module, password_expire, password_expire_interval): # If attributes are set, perform a sanity check to ensure server supports user attributes before creating user if attributes and not get_attribute_support(cursor): module.fail_json(msg="user attributes were specified but the server does not support user attributes") + # we cannot create users without a proper hostname if host_all: return {'changed': False, 'password_changed': False, 'attributes': attributes} diff --git a/plugins/modules/mysql_user.py b/plugins/modules/mysql_user.py index 21aba01..4e13926 100644 --- a/plugins/modules/mysql_user.py +++ b/plugins/modules/mysql_user.py @@ -569,7 +569,7 @@ def main(): reuse_existing_password = update_password == 'on_new_username' result = user_add(cursor, user, host, host_all, password, encrypted, plugin, plugin_hash_string, plugin_auth_string, - priv, attributes, tls_requires, module, reuse_existing_password, + priv, attributes, tls_requires, reuse_existing_password, module, password_expire, password_expire_interval) changed = result['changed'] password_changed = result['password_changed']