Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
-
32eb3e7e
by Ansgar at 2020-03-29T14:56:19+02:00
2 changed files:
Changes:
| ... | ... | @@ -931,7 +931,7 @@ class Keyring(object): |
| 931 | 931 |
LDAPServer = cnf["Import-LDAP-Fingerprints::LDAPServer"]
|
| 932 | 932 |
ca_cert_file = cnf.get('Import-LDAP-Fingerprints::CACertFile')
|
| 933 | 933 |
|
| 934 |
- l = ldap.open(LDAPServer)
|
|
| 934 |
+ l = ldap.initialize(LDAPServer)
|
|
| 935 | 935 |
|
| 936 | 936 |
if ca_cert_file:
|
| 937 | 937 |
l.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_HARD)
|
| ... | ... | @@ -778,7 +778,7 @@ def get_logins_from_ldap(fingerprint='*'): |
| 778 | 778 |
|
| 779 | 779 |
LDAPDn = Cnf['Import-LDAP-Fingerprints::LDAPDn']
|
| 780 | 780 |
LDAPServer = Cnf['Import-LDAP-Fingerprints::LDAPServer']
|
| 781 |
- l = ldap.open(LDAPServer)
|
|
| 781 |
+ l = ldap.initialize(LDAPServer)
|
|
| 782 | 782 |
l.simple_bind_s('', '')
|
| 783 | 783 |
Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL,
|
| 784 | 784 |
'(keyfingerprint=%s)' % fingerprint,
|
| ... | ... | @@ -796,7 +796,7 @@ def get_users_from_ldap(): |
| 796 | 796 |
|
| 797 | 797 |
LDAPDn = Cnf['Import-LDAP-Fingerprints::LDAPDn']
|
| 798 | 798 |
LDAPServer = Cnf['Import-LDAP-Fingerprints::LDAPServer']
|
| 799 |
- l = ldap.open(LDAPServer)
|
|
| 799 |
+ l = ldap.initialize(LDAPServer)
|
|
| 800 | 800 |
l.simple_bind_s('', '')
|
| 801 | 801 |
Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL,
|
| 802 | 802 |
'(uid=*)', ['uid', 'cn', 'mn', 'sn'])
|