Skip to content

Commit

Permalink
Specify object types for group member management (#74)
Browse files Browse the repository at this point in the history
* fix(add-group): specify object types when adding members to group

* fix(group-management): specify object types when adding/removing members from group

NethServer/dev#7286
  • Loading branch information
stephdl authored Feb 19, 2025
1 parent af65ff1 commit 9881067
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion imageroot/actions/add-group/50add_group
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ subprocess.run(addgroup_cmd, stdout=sys.stderr, check=True, text=True)
if users:
addmembers_cmd = [
'podman', 'exec', 'samba-dc', 'samba-tool',
'group', 'addmembers', group, ','.join(users),
'group', 'addmembers', group, ','.join(users), '--object-types=user'
]

subprocess.run(addmembers_cmd, stdout=sys.stderr, check=True, text=True)
4 changes: 2 additions & 2 deletions imageroot/actions/alter-group/50alter_group
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ if 'users' in request:

add_members = new_members - old_members
if add_members:
subprocess.run(sambatool_cmd + ['group', "addmembers", group, ','.join(add_members)], stdout=sys.stderr, check=True, text=True)
subprocess.run(sambatool_cmd + ['group', "addmembers", group, ','.join(add_members), '--object-types=user'], stdout=sys.stderr, check=True, text=True)

rem_members = old_members - new_members
if rem_members:
subprocess.run(sambatool_cmd + ['group', "removemembers", group, ','.join(rem_members)], stdout=sys.stderr, check=True, text=True)
subprocess.run(sambatool_cmd + ['group', "removemembers", group, ','.join(rem_members), '--object-types=user'], stdout=sys.stderr, check=True, text=True)

0 comments on commit 9881067

Please sign in to comment.