From 5060fdfade63f299bf3ad15c16a1aff06135b80f Mon Sep 17 00:00:00 2001 From: Pavel Zuna Date: Tue, 23 Nov 2010 09:02:54 -0500 Subject: Change signature of LDAPSearch.pre_callback. Add the opportunity to change base DN and scope in the callback. --- ipalib/plugins/service.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ipalib/plugins/service.py') diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index c65a7a4a..6cdba9b3 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -377,7 +377,7 @@ class service_find(LDAPSearch): member_attributes = ['managedby'] takes_options = LDAPSearch.takes_options has_output_params = LDAPSearch.has_output_params + output_params - def pre_callback(self, ldap, filter, attrs_list, base_dn, *args, **options): + def pre_callback(self, ldap, filter, attrs_list, base_dn, scope, *args, **options): # lisp style! custom_filter = '(&(objectclass=ipaService)' \ '(!(objectClass=posixAccount))' \ @@ -386,8 +386,9 @@ class service_find(LDAPSearch): '(krbprincipalname=krbtgt/*))' \ ')' \ ')' - return ldap.combine_filters( - (custom_filter, filter), rules=ldap.MATCH_ALL + return ( + ldap.combine_filters((custom_filter, filter), rules=ldap.MATCH_ALL), + base_dn, scope ) def post_callback(self, ldap, entries, truncated, *args, **options): -- cgit