summaryrefslogtreecommitdiffstats
path: root/ipaserver/plugins/ldap2.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2012-04-29 17:36:25 -0400
committerRob Crittenden <rcritten@redhat.com>2012-04-29 17:39:42 -0400
commit4416c185de3534ed4ed55f90f8d1b1d215f918e2 (patch)
treef2cc5ca127cf9b680f0ac0f3c6954acb14c10a80 /ipaserver/plugins/ldap2.py
parente1f69625454fe1c023c0f4571bbb0a15efc15ccf (diff)
downloadfreeipa-4416c185de3534ed4ed55f90f8d1b1d215f918e2.tar.gz
freeipa-4416c185de3534ed4ed55f90f8d1b1d215f918e2.tar.xz
freeipa-4416c185de3534ed4ed55f90f8d1b1d215f918e2.zip
Revert "Search allowed attributes in superior objectclasses"
This reverts commit a58cbb985ec007c0ef83010b32408efb2f4784d2. We are going to take another approach to this. Instead of erroring out on attributes that don't seem to be allowed we are going to eventually return a warning.
Diffstat (limited to 'ipaserver/plugins/ldap2.py')
-rw-r--r--ipaserver/plugins/ldap2.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py
index b65e011dd..ddef8dffc 100644
--- a/ipaserver/plugins/ldap2.py
+++ b/ipaserver/plugins/ldap2.py
@@ -413,9 +413,6 @@ class ldap2(CrudBackend, Encoder):
obj = self.schema.get_obj(_ldap.schema.ObjectClass, oc)
if obj is not None:
allowed_attributes += obj.must + obj.may
- # look for allowed attributes in the superior objectclasses
- if obj.sup:
- allowed_attributes += self.get_allowed_attributes(obj.sup,raise_on_unknown)
elif raise_on_unknown:
raise errors.NotFound(reason=_('objectclass %s not found') % oc)
return [unicode(a).lower() for a in list(set(allowed_attributes))]