Re: [Freeipa-devel] [PATCH 0049] fix broken search for users by their manager

2015-07-23 Thread Tomas Babej 


On 07/23/2015 11:31 AM, Martin Babinsky wrote:
 On 07/23/2015 11:18 AM, Tomas Babej wrote:


 On 07/23/2015 10:55 AM, Martin Babinsky wrote:
 Fixes https://fedorahosted.org/freeipa/ticket/5146




 The patch fixes the mentioned issue.

 However, there is some code made redundant in stageuser_find.execute,
 which does the same thing, can you please remove it?

 Tomas

 
 Sorry I didn't notice that. Actually, now the whole
 stageuser_find.execute is made obsolete so I removed the whole method.
 
 Attaching updated patch.
 

ACK.

Pushed to master: 7ceaa8e26c3073f3ff3f253025177d49259072f0
Pushed to ipa-4-2: dae3d0ecab7c1b9f4e8cde618d1593edff579a9f

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH 0049] fix broken search for users by their manager

2015-07-23 Thread Tomas Babej 


On 07/23/2015 10:55 AM, Martin Babinsky wrote:
 Fixes https://fedorahosted.org/freeipa/ticket/5146
 
 
 

The patch fixes the mentioned issue.

However, there is some code made redundant in stageuser_find.execute,
which does the same thing, can you please remove it?

Tomas

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH 0049] fix broken search for users by their manager

2015-07-23 Thread Martin Babinsky 

On 07/23/2015 11:18 AM, Tomas Babej wrote:



On 07/23/2015 10:55 AM, Martin Babinsky wrote:

Fixes https://fedorahosted.org/freeipa/ticket/5146





The patch fixes the mentioned issue.

However, there is some code made redundant in stageuser_find.execute,
which does the same thing, can you please remove it?

Tomas



Sorry I didn't notice that. Actually, now the whole 
stageuser_find.execute is made obsolete so I removed the whole method.


Attaching updated patch.

--
Martin^3 Babinsky
From c2e1d86a2b774a7a61bcf49d472efc47821f40ff Mon Sep 17 00:00:00 2001
From: Martin Babinsky mbabi...@redhat.com
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
---
 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 415dc6a3b2e79fa95dfa9cac94a59315b8edf770..c0c4c87d7c1ed83e1651fc558a2e13bb1421072a 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

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] [PATCH 0049] fix broken search for users by their manager

2015-07-23 Thread Martin Babinsky 

Fixes https://fedorahosted.org/freeipa/ticket/5146

--
Martin^3 Babinsky
From 0f1cf3cc9b98a8ba1c3f3a1df990c0f717426806 Mon Sep 17 00:00:00 2001
From: Martin Babinsky mbabi...@redhat.com
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
---
 ipalib/plugins/baseuser.py | 8 
 ipalib/plugins/user.py | 4 
 2 files changed, 8 insertions(+), 4 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/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

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code