Skip to content

Commit

Permalink
Merge pull request #49902 from lomeroe/issue48661_2018.3
Browse files Browse the repository at this point in the history
lgpo better comments on user right assignments
  • Loading branch information
Nicole Thomas committed Oct 5, 2018
2 parents 4eb43af + 760d8f4 commit d3a909f
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions salt/states/win_lgpo.py
Expand Up @@ -289,10 +289,13 @@ def set_(name,
) == {}

if not policies_are_equal:
additional_policy_comments = []
if policy_data['policy_lookup'][policy_name]['rights_assignment'] and cumulative_rights_assignments:
for user in policy_data['requested_policy'][policy_name]:
if user not in current_policy[policy_data['output_section']][pol_id]:
changes = True
else:
additional_policy_comments.append('"{0}" is already granted the right'.format(user))
else:
changes = True
if changes:
Expand All @@ -303,6 +306,11 @@ def set_(name,
requested_policy_json, current_policy_json
)
policy_changes.append(policy_name)
else:
if additional_policy_comments:
ret['comment'] = '"{0}" is already set ({1}).\n'.format(policy_name, ', '.join(additional_policy_comments))
else:
ret['comment'] = '"{0}" is already set.\n'.format(policy_name) + ret['comment']
else:
log.debug('%s current setting matches '
'the requested setting', policy_name)
Expand Down

0 comments on commit d3a909f

Please sign in to comment.