From: Julien Cristau <jcristau@debian.org>
Date: Fri, 11 Oct 2019 15:55:44 +0000 (+0200)
Subject: Use ldap.initialize instead of ldap.open for compatibility with python-ldap 3.2.0.
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7f7c3f842af6b715345cc2a1a8f8ed1af40e9bdb;hp=49298c2ec7ae6138e986ff74ea8b0ed86755990c;p=mirror%2Fuserdir-ldap.git

Use ldap.initialize instead of ldap.open for compatibility with python-ldap 3.2.0.
---

diff --git a/debian/changelog b/debian/changelog
index 6982cc3..916ef10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ userdir-ldap (0.3.97) UNRELEASED; urgency=medium
   * Delete ud-emailmatcher.  Looks broken and unused.
   * ud-mailgate: use subprocess.Popen instead of os.popen.
   * ud-host: use subprocess.Popen instead of os.popen.
+  * Use ldap.initialize instead of ldap.open for compatibility with python-ldap 3.2.0.
 
  -- Peter Palfrader <weasel@debian.org>  Sat, 06 Apr 2019 22:04:34 +0200
 
diff --git a/userdir_ldap.py b/userdir_ldap.py
index eb27ecb..22722e4 100644
--- a/userdir_ldap.py
+++ b/userdir_ldap.py
@@ -135,7 +135,7 @@ def connectLDAP(server=None):
    if server is None:
       global LDAPServer
       server = LDAPServer
-   lc = ldap.open(server)
+   lc = ldap.initialize('ldap://%s' % server)
    global UseSSL
    if UseSSL:
       lc.start_tls_s()