summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins/baseldap.py
diff options
context:
space:
mode:
authorAna Krivokapic <akrivoka@redhat.com>2013-02-21 10:56:03 -0500
committerRob Crittenden <rcritten@redhat.com>2013-03-14 11:44:24 -0400
commit66356f0daf2a55c7e64dc648e0f8c765e9a56151 (patch)
tree8816618e93bd1d681af4a52e11042ba9842b097a /ipalib/plugins/baseldap.py
parentc4ab8dae35e952ae74e49c5ad0fbfbc0718f60f8 (diff)
downloadfreeipa-66356f0daf2a55c7e64dc648e0f8c765e9a56151.tar.gz
freeipa-66356f0daf2a55c7e64dc648e0f8c765e9a56151.tar.xz
freeipa-66356f0daf2a55c7e64dc648e0f8c765e9a56151.zip
Improve error messages for external group members
When adding a duplicate member to a group, an error message is issued, informing the user that the entry is already a member of the group. Similarly, when trying to delete an entry which is not a member, an error message is issued, informing the user that the entry is not a member of the group. These error messages were missing in case of external members. This patch also adds support for using the AD\name or name@ad.domain.com format in ipa group-remove-member command. This format was supported in group-add-member, but not in group-remove-member. Unit test file covering these cases was also added. https://fedorahosted.org/freeipa/ticket/3254
Diffstat (limited to 'ipalib/plugins/baseldap.py')
-rw-r--r--ipalib/plugins/baseldap.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 3d013ced9..bb0de989c 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -391,6 +391,10 @@ def remove_external_post_callback(memberattr, membertype, externalattr, ldap, co
external_entries.remove(entry[0])
completed_external += 1
else:
+ msg = unicode(errors.NotGroupMember().message)
+ newerror = (entry[0], msg)
+ ind = failed[memberattr][membertype].index(entry)
+ failed[memberattr][membertype][ind] = newerror
failed_entries.append(membername)
if completed_external: