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

Fixed _get_account_policy function

Browse Source
This commit is contained in:
twangboy 2016-01-12 13:56:27 -07:00
parent 928de5d51a
commit ac008bf22d
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
salt/modules/mac_shadow.py
View File

@ -98,16 +98,19 @@ def _get_account_policy(name):
'''
cmd = 'pwpolicy -u {0} -getpolicy'.format(name)
ret = __salt__['cmd.run'](cmd)
if ret:
policy_list = ret.split('\n')[1].split(' ')
policy_dict = {}
for policy in policy_list:
if '=' in policy:
key, value = policy.split('=')
policy_dict[key] = value
return policy_dict
if ret and 'Error:' not in ret:
try:
policy_list = ret.split('\n')[1].split(' ')
policy_dict = {}
for policy in policy_list:
if '=' in policy:
key, value = policy.split('=')
policy_dict[key] = value
return policy_dict
except IndexError:
return 'Value not found'
else:
return False
return 'Value not found'
def _convert_to_datetime(unix_timestamp):