IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-12 09:11:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Inconsistent error message for ipa group-detach

Browse Source 
When attempting to detach a private group that doesn't exist, the
error message returned is not consistent with the error returned by
the other topic commands. This patch adds a standard message.

https://fedorahosted.org/freeipa/ticket/291
This commit is contained in:
Martin Kosek 2011-02-02 15:29:38 +01:00 committed by Rob Crittenden
parent a686f36906
commit c9ff669cdd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipalib/plugins/group.py
View File

@ -294,7 +294,10 @@ class group_detach(LDAPQuery):
group_dn = self.obj.get_dn(*keys, **options) group_dn = self.obj.get_dn(*keys, **options)
user_dn = self.api.Object['user'].get_dn(*keys) user_dn = self.api.Object['user'].get_dn(*keys)
(user_dn, user_attrs) = ldap.get_entry(user_dn) try:
(user_dn, user_attrs) = ldap.get_entry(user_dn)
except errors.NotFound:
self.obj.handle_not_found(*keys)
is_managed = self.obj.has_objectclass(user_attrs['objectclass'], 'mepmanagedentry') is_managed = self.obj.has_objectclass(user_attrs['objectclass'], 'mepmanagedentry')
if (not ldap.can_write(user_dn, "objectclass") or if (not ldap.can_write(user_dn, "objectclass") or
not (ldap.can_write(user_dn, "mepManagedEntry")) and is_managed): not (ldap.can_write(user_dn, "mepManagedEntry")) and is_managed):