diff options
author | Stanislav Laznicka <slaznick@redhat.com> | 2016-06-07 12:11:39 +0200 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2016-06-29 10:44:30 +0200 |
commit | 30d054a573e08aedecdc211d50c9dd8ebd2777ea (patch) | |
tree | de5681236d89e2506b77636fa4f5d064db816967 | |
parent | a77e21cbca05be422fe5826857cfba7e0ba6e71f (diff) | |
download | freeipa-30d054a573e08aedecdc211d50c9dd8ebd2777ea.tar.gz freeipa-30d054a573e08aedecdc211d50c9dd8ebd2777ea.tar.xz freeipa-30d054a573e08aedecdc211d50c9dd8ebd2777ea.zip |
Revert "Removed dead code from LDAP{Remove,Add}ReverseMember"
While the code was really dead, it should serve a purpose elsewhere.
This reverts commit c56d65b064e1e0410c03cf1206816cad4d8d86cc.
https://fedorahosted.org/freeipa/ticket/5892
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
-rw-r--r-- | ipaserver/plugins/baseldap.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ipaserver/plugins/baseldap.py b/ipaserver/plugins/baseldap.py index 7367c8798..62b726da1 100644 --- a/ipaserver/plugins/baseldap.py +++ b/ipaserver/plugins/baseldap.py @@ -2131,6 +2131,14 @@ class LDAPAddReverseMember(LDAPModReverseMember): dn = callback(self, ldap, dn, *keys, **options) assert isinstance(dn, DN) + if options.get('all', False): + attrs_list = ['*'] + self.obj.default_attributes + else: + attrs_list = set(self.obj.default_attributes) + if options.get('no_members', False): + attrs_list.difference_update(self.obj.attribute_members) + attrs_list = list(attrs_list) + completed = 0 failed = {'member': {self.reverse_attr: []}} for attr in options.get(self.reverse_attr) or []: @@ -2222,6 +2230,14 @@ class LDAPRemoveReverseMember(LDAPModReverseMember): dn = callback(self, ldap, dn, *keys, **options) assert isinstance(dn, DN) + if options.get('all', False): + attrs_list = ['*'] + self.obj.default_attributes + else: + attrs_list = set(self.obj.default_attributes) + if options.get('no_members', False): + attrs_list.difference_update(self.obj.attribute_members) + attrs_list = list(attrs_list) + completed = 0 failed = {'member': {self.reverse_attr: []}} for attr in options.get(self.reverse_attr) or []: |