diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-02-04 11:48:58 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:47 +0100 |
| commit | 5b2e0e2ba5808d6300de1cac743c96db0607121c (patch) | |
| tree | 3165cccfbd01e5d76e74ae4df612cf64675fc046 /ipalib/plugins/automember.py | |
| parent | a09c50671ecc53af63765afca13edd27ee598081 (diff) | |
| download | freeipa-5b2e0e2ba5808d6300de1cac743c96db0607121c.tar.gz freeipa-5b2e0e2ba5808d6300de1cac743c96db0607121c.tar.xz freeipa-5b2e0e2ba5808d6300de1cac743c96db0607121c.zip | |
Remove DN normalization from the baseldap plugin.
Diffstat (limited to 'ipalib/plugins/automember.py')
| -rw-r--r-- | ipalib/plugins/automember.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/ipalib/plugins/automember.py b/ipalib/plugins/automember.py index 8bd5edc00..4f563f119 100644 --- a/ipalib/plugins/automember.py +++ b/ipalib/plugins/automember.py @@ -303,8 +303,7 @@ class automember_add_condition(LDAPUpdate): entry_attrs[attr] = [key + condition for condition in options[attr]] completed += len(entry_attrs[attr]) try: - (dn, old_entry) = ldap.get_entry( - dn, [attr], normalize=self.obj.normalize_dn) + (dn, old_entry) = ldap.get_entry(dn, [attr]) for regex in old_entry.keys(): if not isinstance(entry_attrs[regex], (list, tuple)): entry_attrs[regex] = [entry_attrs[regex]] @@ -325,9 +324,7 @@ class automember_add_condition(LDAPUpdate): # Make sure to returned the failed results if there is nothing to remove if completed == 0: - (dn, entry_attrs) = ldap.get_entry( - dn, attrs_list, normalize=self.obj.normalize_dn - ) + (dn, entry_attrs) = ldap.get_entry(dn, attrs_list) raise errors.EmptyModlist return dn @@ -390,16 +387,13 @@ class automember_remove_condition(LDAPUpdate): failed = {'failed': {}} # Check to see if there are existing exclusive conditions present. - (dn, exclude_present) = ldap.get_entry( - dn, [EXCLUDE_RE], normalize=self.obj.normalize_dn) + (dn, exclude_present) = ldap.get_entry(dn, [EXCLUDE_RE]) for attr in (INCLUDE_RE, EXCLUDE_RE): failed['failed'][attr] = [] if attr in options and options[attr]: entry_attrs[attr] = [key + condition for condition in options[attr]] - (dn, entry_attrs_) = ldap.get_entry( - dn, [attr], normalize=self.obj.normalize_dn - ) + (dn, entry_attrs_) = ldap.get_entry(dn, [attr]) old_entry = entry_attrs_.get(attr, []) for regex in entry_attrs[attr]: if regex in old_entry: @@ -418,9 +412,7 @@ class automember_remove_condition(LDAPUpdate): # Make sure to returned the failed results if there is nothing to remove if completed == 0: - (dn, entry_attrs) = ldap.get_entry( - dn, attrs_list, normalize=self.obj.normalize_dn - ) + (dn, entry_attrs) = ldap.get_entry(dn, attrs_list) raise errors.EmptyModlist return dn @@ -550,9 +542,7 @@ class automember_default_group_remove(LDAPUpdate): api.env.basedn) attr = 'automemberdefaultgroup' - (dn, entry_attrs_) = ldap.get_entry( - dn, [attr], normalize=self.obj.normalize_dn - ) + (dn, entry_attrs_) = ldap.get_entry(dn, [attr]) if attr not in entry_attrs_: raise errors.NotFound(reason=_(u'No default (fallback) group set')) |