diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2009-02-27 23:17:18 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2009-02-27 23:18:35 -0500 |
| commit | bd9f7cd72099fd4a93986be23ebdb702a7c3023b (patch) | |
| tree | d41b29efc9de07ac9a98733934d4b864981a79bb /ipalib | |
| parent | be0cac932af73fa1bcc5a64af9f2edde0c71cdc7 (diff) | |
| download | freeipa-bd9f7cd72099fd4a93986be23ebdb702a7c3023b.tar.gz freeipa-bd9f7cd72099fd4a93986be23ebdb702a7c3023b.tar.xz freeipa-bd9f7cd72099fd4a93986be23ebdb702a7c3023b.zip | |
Fix some netgroup issues related to not all groups being posixGroups
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/plugins/f_netgroup.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipalib/plugins/f_netgroup.py b/ipalib/plugins/f_netgroup.py index 126908559..d6c710709 100644 --- a/ipalib/plugins/f_netgroup.py +++ b/ipalib/plugins/f_netgroup.py @@ -28,7 +28,7 @@ from ipalib import uuid netgroup_base = "cn=ng, cn=alt" netgroup_filter = "ipaNISNetgroup" -hostgroup_filter = "groupofnames)(!(objectclass=posixGroup)" +hostgroup_filter = "groupofnames)(!(objectclass=ipaUserGroup)" def get_members(members): """ @@ -364,7 +364,7 @@ class netgroup_add_member(Command): # Groups members = get_members(kw.get('groups', '')) - (to_add, add_failed) = find_members(ldap, add_failed, members, "cn", "posixGroup") + (to_add, add_failed) = find_members(ldap, add_failed, members, "cn", "ipaUserGroup") (completed, failed) = add_members(ldap, completed, to_add, dn, 'memberuser') add_failed+=failed @@ -457,13 +457,13 @@ class netgroup_remove_member(Command): # Groups members = get_members(kw.get('groups', '')) - (to_remove, remove_failed) = find_members(ldap, remove_failed, members, "cn", "posixGroup") + (to_remove, remove_failed) = find_members(ldap, remove_failed, members, "cn", "ipaUserGroup") (completed, failed) = remove_members(ldap, completed, to_remove, dn, 'memberuser') remove_failed+=failed # Netgroups members = get_members(kw.get('netgroups', '')) - (to_add, remove_failed) = find_members(ldap, remove_failed, members, "cn", netgroup_filter, netgroup_base) + (to_remove, remove_failed) = find_members(ldap, remove_failed, members, "cn", netgroup_filter, netgroup_base) (completed, failed) = remove_members(ldap, completed, to_remove, dn, 'member') remove_failed+=failed |