From e6dde5843acd6e02a6ee5e99c5f4a60b804e91fa Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Tue, 11 Mar 2025 15:18:53 +0200 Subject: [PATCH] Handle DictCursor Signed-off-by: E.S. Rosenberg a.k.a. Keeper of the Keys --- plugins/module_utils/user.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py index f4ba123..2214087 100644 --- a/plugins/module_utils/user.py +++ b/plugins/module_utils/user.py @@ -58,12 +58,15 @@ def user_is_locked(cursor, user, host): # Per discussions on irc:libera.chat:#maria the query may return up to 2 rows but "ACCOUNT LOCK" should always be in the first row. result = cursor.fetchone() - from pprint import pprint - pprint(result) - # ACCOUNT LOCK does not have to be the last option in the CREATE USER query. - if result[0] and result[0].find('ACCOUNT LOCK') > 0: - return True + # Need to handle both DictCursor and non-DictCursor + if type(result) == type([]): + if result[0] and result[0].find('ACCOUNT LOCK') > 0: + return True + elif type(result) == type({}): + for res in result.values(): + if res.find('ACCOUNT LOCK') > 0: + return True return False