summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Zuna <pzuna@redhat.com>2009-04-22 11:08:15 +0200
committerRob Crittenden <rcritten@redhat.com>2009-04-22 15:18:51 -0400
commit32ad0ab01174a200d05f2fe2ddeba79f7c1781f4 (patch)
treec61d252778f5b886a0c00e0dc062021d20730fb6
parent4e48e1fbf717cb06f4145e2e345ec1dc86e253d3 (diff)
downloadfreeipa-32ad0ab01174a200d05f2fe2ddeba79f7c1781f4.tar.gz
freeipa-32ad0ab01174a200d05f2fe2ddeba79f7c1781f4.tar.xz
freeipa-32ad0ab01174a200d05f2fe2ddeba79f7c1781f4.zip
Throw AlreadyGroupMember instead of EmptyModlist when trying to re-add member to a group.
-rw-r--r--ipaserver/plugins/ldap2.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py
index 12852d34f..c31460856 100644
--- a/ipaserver/plugins/ldap2.py
+++ b/ipaserver/plugins/ldap2.py
@@ -607,9 +607,10 @@ class ldap2(CrudBackend):
group_entry_attrs[member_attr] = members
# update group entry
- # FIXME: raise something like AlreadyGroupMember on EmptyModlist
- # or add a check if dn is already in `member_attr` attribute
- self.update_entry(group_dn, group_entry_attrs)
+ try:
+ self.update_entry(group_dn, group_entry_attrs)
+ except errors2.EmptyModlist:
+ raise errors2.AlreadyGroupMember()
def remove_entry_from_group(self, dn, group_dn, member_attr='member'):
"""Remove entry from group."""