valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix shadow.set_date/shadow.set_expire on F28

Browse Source 
When there are problems with SSSD, warnings are written to stderr but
as long as chage succeeds, the command will exit with a zero exit code.

These two functions were returning True only when there is no CLI
output, instead of checking the retcode as it should have.

This commit fixes this, allowing F28 (and any other distros which use
SSSD) to properly report success/failure when there are SSSD warnings in
the output from chage.
This commit is contained in:
Erik Johnson 2019-01-07 09:54:00 -06:00
parent aeeb047f18
commit ccd5c151dc
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/shadow.py
View File

@ -349,8 +349,8 @@ def set_date(name, date):
salt '*' shadow.set_date username 0
'''
cmd = 'chage -d {0} {1}'.format(date, name)
return not __salt__['cmd.run'](cmd, python_shell=False)
cmd = ['chage', '-d', date, name]
return __salt__['cmd.retcode'](cmd, python_shell=False) == 0
def set_expire(name, expire):
@ -367,8 +367,8 @@ def set_expire(name, expire):
salt '*' shadow.set_expire username -1
'''
cmd = 'chage -E {0} {1}'.format(expire, name)
return not __salt__['cmd.run'](cmd, python_shell=False)
cmd = ['chage', '-E', expire, name]
return __salt__['cmd.retcode'](cmd, python_shell=False) == 0
def list_users():