summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hoffend <dh@dotlan.net>2020-01-13 14:08:31 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2020-01-13 14:08:31 +0100
commit0e66fae6ac8c8f5fa7ddffa2a8a6e384fe20bc4b (patch)
tree28b392ad732a1299b0f20ab11fcb33ad45ef088f
parentacae24ce893032e95b108193dacd6b08bd91d0d8 (diff)
downloadpykolab-0e66fae6ac8c8f5fa7ddffa2a8a6e384fe20bc4b.tar.gz
encode_page_control() must have a 2nd argument T5734
Summary: As reported in T5734 kolab sync and kolabd are crashing with a trackback that encode_page_control must have 2 arguments. Adding the empty cookie attribute to the server_page_controls removed the error. Reviewers: #pykolab_developers, vanmeeuwen Reviewed By: #pykolab_developers, vanmeeuwen Differential Revision: https://git.kolab.org/D895
-rw-r--r--pykolab/auth/ldap/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index 44019aa..67e9487 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -2896,7 +2896,7 @@ class LDAP(Base):
page_size = 500
_results = []
- server_page_control = ldap.controls.libldap.SimplePagedResultsControl(size=page_size)
+ server_page_control = ldap.controls.libldap.SimplePagedResultsControl(size=page_size,cookie='')
_search = self.ldap.search_ext(
base_dn,
@@ -2937,7 +2937,7 @@ class LDAP(Base):
pctrls = [
c for c in _result_controls
- if c.controlType == LDAP_CONTROL_PAGED_RESULTS
+ if c.controlType == ldap.controls.libldap.SimplePagedResultsControl.controlType
]
if pctrls: