From b4655f11197475c46f0aae029e18acffee027e71 Mon Sep 17 00:00:00 2001 From: Adam Young Date: Mon, 25 Oct 2010 14:18:47 -0400 Subject: find_entries param Fixes a bug where find_entries was not passed a parameter for filter. Instead of fixing the call point, this patch adds a defaulty value for the parameter, so that they can all be passed by name. --- ipaserver/plugins/ldap2.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ipaserver/plugins/ldap2.py') diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index 12005c01f..05292ce7c 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -489,7 +489,7 @@ class ldap2(CrudBackend, Encoder): @encode_args(1, 2, 3) @decode_retval() - def find_entries(self, filter, attrs_list=None, base_dn='', + def find_entries(self, filter=None, attrs_list=None, base_dn='', scope=_ldap.SCOPE_SUBTREE, time_limit=None, size_limit=None, normalize=True): """ @@ -578,8 +578,6 @@ class ldap2(CrudBackend, Encoder): )[0][0] except errors.NotFound: config_entry = {} - except Exception, e: - raise e for a in self.config_defaults: if a not in config_entry: config_entry[a] = self.config_defaults[a] -- cgit