`ldap.open` is now `ldap.initialize`

32eb3e7e · Ansgar · 5de1e620 · 32eb3e7e · 32eb3e7e
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

daklib/dbconn.py daklib/dbconn.py +1 -1

daklib/utils.py daklib/utils.py +2 -2

未找到文件。
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -931,7 +931,7 @@ class Keyring(object):
        LDAPServer = cnf["Import-LDAP-Fingerprints::LDAPServer"]
        ca_cert_file = cnf.get('Import-LDAP-Fingerprints::CACertFile')

-        l = ldap.open(LDAPServer)
+        l = ldap.initialize(LDAPServer)

        if ca_cert_file:
            l.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_HARD)

--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -778,7 +778,7 @@ def get_logins_from_ldap(fingerprint='*'):

    LDAPDn = Cnf['Import-LDAP-Fingerprints::LDAPDn']
    LDAPServer = Cnf['Import-LDAP-Fingerprints::LDAPServer']
-    l = ldap.open(LDAPServer)
+    l = ldap.initialize(LDAPServer)
    l.simple_bind_s('', '')
    Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL,
                       '(keyfingerprint=%s)' % fingerprint,
@@ -796,7 +796,7 @@ def get_users_from_ldap():

    LDAPDn = Cnf['Import-LDAP-Fingerprints::LDAPDn']
    LDAPServer = Cnf['Import-LDAP-Fingerprints::LDAPServer']
-    l = ldap.open(LDAPServer)
+    l = ldap.initialize(LDAPServer)
    l.simple_bind_s('', '')
    Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL,
                       '(uid=*)', ['uid', 'cn', 'mn', 'sn'])