diff options
author | Rob Crittenden <rcritten@redhat.com> | 2008-03-05 16:33:12 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2008-03-05 16:33:12 -0500 |
commit | 7fd656477a84b2677925ef5b379fa2e4793d4d48 (patch) | |
tree | 8f0fdfdfe86ef00052333cd277bd5e91c6110b67 /ipa-client/ipaclient | |
parent | d7e30fa7eed10c5576841b4868df0a9ec8c85328 (diff) | |
download | freeipa-7fd656477a84b2677925ef5b379fa2e4793d4d48.tar.gz freeipa-7fd656477a84b2677925ef5b379fa2e4793d4d48.tar.xz freeipa-7fd656477a84b2677925ef5b379fa2e4793d4d48.zip |
Prevent server and domain from being undefined or blank when we need them
Improve LDAP error reporting
Don't return the str() of discovery values because it can return "None"
436130
Diffstat (limited to 'ipa-client/ipaclient')
-rw-r--r-- | ipa-client/ipaclient/ipadiscovery.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index 67f947604..b7b691360 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -32,16 +32,16 @@ class IPADiscovery: self.basedn = None def getServerName(self): - return str(self.server) + return self.server def getDomainName(self): - return str(self.domain) + return self.domain def getRealmName(self): - return str(self.realm) + return self.realm def getBaseDN(self): - return str(self.basedn) + return self.basedn def search(self, domain = "", server = ""): hostname = "" @@ -100,8 +100,8 @@ class IPADiscovery: logging.debug("[ipacheckldap]") # check ldap now - ldapret = self.ipacheckldap(self.server, self.realm); - + ldapret = self.ipacheckldap(self.server, self.realm) + if not ldapret: return -4 # not an IPA server (or broken config) @@ -178,7 +178,11 @@ class IPADiscovery: except LDAPError, err: #no good - logging.error("Ldap Error: "+str(err)) + 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) return [] |