summaryrefslogtreecommitdiffstats
path: root/pykolab/auth/ldap/__init__.py
diff options
context:
space:
mode:
authorPaul Boddie <paul@boddie.org.uk>2014-03-19 00:04:32 +0100
committerPaul Boddie <paul@boddie.org.uk>2014-03-19 00:04:32 +0100
commit43500498bb0026a1df32c40f3fa3a0d945880dfa (patch)
tree24e0341de7421131010e31d8a537673bd8aa93f2 /pykolab/auth/ldap/__init__.py
parent195864ce212314e2a09637512597f05d540858e8 (diff)
parent99262c3f1198c1dcd14cec7f2ed416150b0f50a7 (diff)
downloadpykolab-43500498bb0026a1df32c40f3fa3a0d945880dfa.tar.gz
Merge branch 'paul-fix' into dev/boddie
Diffstat (limited to 'pykolab/auth/ldap/__init__.py')
-rw-r--r--pykolab/auth/ldap/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index f889e88..79262df 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -475,7 +475,7 @@ class LDAP(pykolab.base.Base):
return recipient_address_attrs, result_attributes
- def get_filter_for_addresses(self, attrs, prefix, suffix):
+ def get_filter_for_addresses(self, address, attrs, prefix, suffix):
"""
Return the filter string for addresses provided by the given
attributes, using the specified prefix and suffix.
@@ -564,7 +564,7 @@ class LDAP(pykolab.base.Base):
recipient_address_attrs, result_attributes = self.get_search_attributes()
- _filter = self.get_filter_for_addresses(recipient_address_attrs, __filter_prefix, __filter_suffix)
+ _filter = self.get_filter_for_addresses(address, recipient_address_attrs, __filter_prefix, __filter_suffix)
log.debug(_("Finding recipient with filter %r") % (_filter), level=8)
@@ -589,7 +589,7 @@ class LDAP(pykolab.base.Base):
recipient_address_attrs, result_attributes = self.get_search_attributes()
- _filter = self.get_filter_for_addresses(recipient_address_attrs, __filter_prefix, __filter_suffix)
+ _filter = self.get_filter_for_addresses(address, recipient_address_attrs, __filter_prefix, __filter_suffix)
log.debug(_("Finding resource with filter %r") % (_filter), level=8)