saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2015.5' into '2015.8'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2016-04-15 12:11:59 -06:00
commit 046e401dd8
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/states/user.py
View file

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