Log account locking warnings only when locking is requested

This commit is contained in:
Jorge-Rodriguez 2020-11-17 15:30:46 +02:00
parent aaf70204cb
commit 9730eeb52c
No known key found for this signature in database
GPG key ID: 43153D1EFD8F7D90

View file

@ -559,7 +559,7 @@ def user_add(cursor, user, host, host_all, password, encrypted,
return False return False
msg, locking = validate_account_locking(cursor, account_locking) msg, locking = validate_account_locking(cursor, account_locking)
if msg: if msg and account_locking:
module.warn(msg) module.warn(msg)
module.warn("Account locking settings are being ignored.") module.warn("Account locking settings are being ignored.")
@ -797,7 +797,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
# Handle Account locking # Handle Account locking
note, locking = validate_account_locking(cursor, account_locking) note, locking = validate_account_locking(cursor, account_locking)
if note: if note and account_locking:
module.warn(note) module.warn(note)
module.warn("Account locking settings are being ignored.") module.warn("Account locking settings are being ignored.")
current_locking = get_account_locking(cursor, user, host) current_locking = get_account_locking(cursor, user, host)