IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use ipaldap exceptions rather than ldap error codes in LDAP updater

Browse Source 
The code in ipaldap got changed with df4ed77 but ldapupdate was never updated.

Closes: https://pagure.io/freeipa/issue/7610
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Peter Keresztes Schmidt 2020-06-05 15:00:15 +02:00 committed by Alexander Bokovoy
parent 9dda004f27
commit e660364814
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipaserver/install/ldapupdate.py
View File

@ -32,7 +32,6 @@ import os
import pwd import pwd
import fnmatch import fnmatch
import ldap
import six import six
from ipaserver.install import installutils from ipaserver.install import installutils
@ -75,13 +74,12 @@ def connect(ldapi=False, realm=None, fqdn=None, dm_password=None):
conn.gssapi_bind() conn.gssapi_bind()
else: else:
conn.gssapi_bind() conn.gssapi_bind()
except (ldap.CONNECT_ERROR, ldap.SERVER_DOWN): except (errors.DatabaseError, errors.NetworkError) as e:
raise RuntimeError("Unable to connect to LDAP server %s" % fqdn) raise RuntimeError("Unable to connect to LDAP server: %s" % e)
except ldap.INVALID_CREDENTIALS: except errors.ACIError as e:
raise RuntimeError( raise RuntimeError(
"The password provided is incorrect for LDAP server %s" % fqdn) "The password provided is incorrect for LDAP server %s: %s" %
except ldap.LOCAL_ERROR as e: (fqdn, e))
raise RuntimeError('%s' % e.args[0].get('info', '').strip())
return conn return conn
@ -647,7 +645,7 @@ class LDAPUpdate:
assert isinstance(dn, DN) assert isinstance(dn, DN)
searchfilter="objectclass=*" searchfilter="objectclass=*"
sattrs = ["*", "aci", "attributeTypes", "objectClasses"] sattrs = ["*", "aci", "attributeTypes", "objectClasses"]
scope = ldap.SCOPE_BASE scope = self.conn.SCOPE_BASE
return self.conn.get_entries(dn, scope, searchfilter, sattrs) return self.conn.get_entries(dn, scope, searchfilter, sattrs)