internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-04 12:22:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

user: fix removing the expiry time when it's 0 (#47115)

Browse Source 
* user: fix removing the expiry time when it's 0

* Improve tests and add changelog

Co-authored-by: Martin Krizek <martin.krizek@gmail.com>
This commit is contained in:
Martin Krizek
2018-11-07 22:44:34 +01:00
committed by Sam Doran
parent adce695aba
commit 41dfc5162f
3 changed files with 112 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/modules/system/user.py
View File

@@ -706,7 +706,7 @@ class User(object):
current_expires = int(self.user_password()[1])
if self.expires < time.gmtime(0):
if current_expires > 0:
if current_expires >= 0:
cmd.append('-e')
cmd.append('')
else:
@@ -714,7 +714,7 @@ class User(object):
current_expire_date = time.gmtime(current_expires * 86400)
# Current expires is negative or we compare year, month, and day only
if current_expires <= 0 or current_expire_date[:3] != self.expires[:3]:
if current_expires < 0 or current_expire_date[:3] != self.expires[:3]:
cmd.append('-e')
cmd.append(time.strftime(self.DATE_FORMAT, self.expires))
@@ -1180,7 +1180,9 @@ class FreeBsdUser(User):
current_expires = int(self.user_password()[1])
if self.expires < time.gmtime(0):
# If expiration is negative or zero and the current expiration is greater than zero, disable expiration.
# In OpenBSD, setting expiration to zero disables expiration. It does not expire the account.
if self.expires <= time.gmtime(0):
if current_expires > 0:
cmd.append('-e')
cmd.append('0')