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

Issue #28706: Fix state user.present behavior.

Browse Source 
- As mentionned in issue #28706, state user.present no longer remove
      user from groups if the keyword 'groups' with empty value '[]' is not
      explicitly set, salt will assume current groups are still wanted.
This commit is contained in:
alxf 2016-02-02 19:47:46 +01:00
parent d79efe8991
commit e098f7b5b6
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

@ -96,6 +96,8 @@ def _changes(name,
return False return False
change = {} change = {}
if groups is None:
groups = lusr['groups']
wanted_groups = sorted(set((groups or []) + (optional_groups or []))) wanted_groups = sorted(set((groups or []) + (optional_groups or [])))
if uid and lusr['uid'] != uid: if uid and lusr['uid'] != uid:
change['uid'] = uid change['uid'] = uid
@ -232,7 +234,8 @@ def present(name,
A list of groups to assign the user to, pass a list object. If a group A list of groups to assign the user to, pass a list object. If a group
specified here does not exist on the minion, the state will fail. specified here does not exist on the minion, the state will fail.
If set to the empty list, the user will be removed from all groups If set to the empty list, the user will be removed from all groups
except the default group. except the default group. If unset, salt will assume current groups
are still wanted (see issue #28706).
optional_groups optional_groups
A list of groups to assign the user to, pass a list object. If a group A list of groups to assign the user to, pass a list object. If a group