From d2b46f176e5dbc40b67ebd90e6953498c5d6249a Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 23 Oct 2008 14:36:24 -0400 Subject: Use common display function for user-show and user-find. Add --all option to user-find Fix command-line help to make sense on searches as well --- ipa_server/plugins/b_ldap.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ipa_server/plugins') diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index 2e9c9e9f..a7a3c8b3 100644 --- a/ipa_server/plugins/b_ldap.py +++ b/ipa_server/plugins/b_ldap.py @@ -213,6 +213,11 @@ class ldap(CrudBackend): def search(self, **kw): objectclass = kw.get('objectclass') sfilter = kw.get('filter') + attributes = kw.get('attributes') + if attributes: + del kw['attributes'] + else: + attributes = ['*'] if objectclass: del kw['objectclass'] if sfilter: @@ -228,13 +233,13 @@ class ldap(CrudBackend): search_base = "%s, %s" % (self.api.env.container_accounts, self.api.env.basedn) try: exact_results = servercore.search(search_base, - exact_match_filter, ["*"]) + exact_match_filter, attributes) except errors.NotFound: exact_results = [0] try: partial_results = servercore.search(search_base, - partial_match_filter, ["*"]) + partial_match_filter, attributes) except errors.NotFound: partial_results = [0] -- cgit