From 29d63aa08fc648c3dfbc9ae4cc74991eba2fb7a0 Mon Sep 17 00:00:00 2001 From: Martin Babinsky Date: Thu, 23 Jul 2015 10:44:08 +0200 Subject: [PATCH] fix broken search for users by their manager The patch fixes incorrect construction of search filter when using `ipa user-find` with '--manager' option. https://fedorahosted.org/freeipa/ticket/5146 Reviewed-By: Tomas Babej --- ipalib/plugins/baseuser.py | 8 ++++++++ ipalib/plugins/stageuser.py | 7 ------- ipalib/plugins/user.py | 4 ---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ipalib/plugins/baseuser.py b/ipalib/plugins/baseuser.py index 9068ef0fd266a4460697ee45f29c80b74662fab2..bd66cf5a3e3a4e6c18d1a54408f969668c834fab 100644 --- a/ipalib/plugins/baseuser.py +++ b/ipalib/plugins/baseuser.py @@ -561,6 +561,14 @@ class baseuser_find(LDAPSearch): """ Prototype command plugin to be implemented by real plugin """ + def args_options_2_entry(self, *args, **options): + newoptions = {} + self.common_enhance_options(newoptions, **options) + options.update(newoptions) + + return super(baseuser_find, self).args_options_2_entry( + *args, **options) + def common_enhance_options(self, newoptions, **options): # assure the manager attr is a dn, not just a bare uid manager = options.get('manager') diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py index 6cbc8f4ab07f2c1172f2b2c45bfe8f30a74938b3..49a762a922b21bd6d0824787d9305417f5e47ee6 100644 --- a/ipalib/plugins/stageuser.py +++ b/ipalib/plugins/stageuser.py @@ -449,13 +449,6 @@ class stageuser_find(baseuser_find): member_attributes = ['memberof'] has_output_params = baseuser_find.has_output_params + stageuser_output_params - def execute(self, *args, **options): - newoptions = {} - self.common_enhance_options(newoptions, **options) - options.update(newoptions) - - return super(stageuser_find, self).execute(self, *args, **options) - def pre_callback(self, ldap, filter, attrs_list, base_dn, scope, *keys, **options): assert isinstance(base_dn, DN) diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 9bd7bf7e5242234ead4c39a6346e57865b2e2124..206b380efb6472fb040dde33ac80e3f66c00c138 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -730,10 +730,6 @@ class user_find(baseuser_find): return ("(&(objectclass=posixaccount)(krbprincipalname=%s))"%\ getattr(context, 'principal'), base_dn, scope) - newoptions = {} - self.common_enhance_options(newoptions, **options) - options.update(newoptions) - preserved = options.get('preserved', False) if preserved is None: base_dn = self.api.env.basedn -- 2.4.3