valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #32614 from rallytime/merge-2015.8

Browse Source 
[2015.8] Merge forward from 2015.5 to 2015.8
This commit is contained in:
Nicole Thomas 2016-04-15 13:27:47 -06:00
commit 05a41a13cd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/states/user.py
View File

@ -523,6 +523,9 @@ def present(name,
if 'shadow.info' in __salt__: if 'shadow.info' in __salt__:
for key in spost: for key in spost:
if lshad[key] != spost[key]: if lshad[key] != spost[key]:
if key == 'passwd':
ret['changes'][key] = 'XXX-REDACTED-XXX'
else:
ret['changes'][key] = spost[key] ret['changes'][key] = spost[key]
if __grains__['kernel'] == 'OpenBSD': if __grains__['kernel'] == 'OpenBSD':
if lcpre != lcpost: if lcpre != lcpost: