From 32ad0ab01174a200d05f2fe2ddeba79f7c1781f4 Mon Sep 17 00:00:00 2001
From: Pavel Zuna <pzuna@redhat.com>
Date: Wed, 22 Apr 2009 11:08:15 +0200
Subject: Throw AlreadyGroupMember instead of EmptyModlist when trying to
 re-add member to a group.

---
 ipaserver/plugins/ldap2.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'ipaserver/plugins/ldap2.py')

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."""
-- 
cgit