diff options
Diffstat (limited to 'ipa-client/ipaclient')
| -rw-r--r-- | ipa-client/ipaclient/ipadiscovery.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index e2d2043f..45d5bd35 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -177,15 +177,11 @@ class IPADiscovery: return [] except LDAPError, err: - #no good - try: - if type(err.message) == dict: - for (k, v) in err.message.iteritems(): - logging.error("LDAP Error: %s" % v ) - else: - logging.error("LDAP Error: "+err.message) - except AttributeError: - logging.error("LDAP Error: "+str(err)) + if not isinstance(err, ldap.TIMEOUT): + logging.error("LDAP Error: %s: %s" % + (err.args[0]['desc'], err.args[0].get('info', ''))) + else: + logging.error("LDAP Error: timeout") return [] |