From 7fd656477a84b2677925ef5b379fa2e4793d4d48 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 5 Mar 2008 16:33:12 -0500 Subject: 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 --- ipa-client/ipa-install/ipa-client-install | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'ipa-client/ipa-install/ipa-client-install') diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 31eadd9cc..8fe7965e5 100644 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -77,12 +77,11 @@ def main(): ds = ipaclient.ipadiscovery.IPADiscovery() ret = ds.search(domain=options.domain, server=options.server) - srv = "" if ret == -10: print "Can't get the fully qualified name of this host" print "Please check that the client is properly configured" return ret - if ret == -1: + if ret == -1 or not ds.getDomainName(): logging.debug("Domain not found") if options.domain: dom = options.domain @@ -94,7 +93,8 @@ def main(): while dom == "": dom = raw_input("Please provide your domain name (ex: example.com): ") ret = ds.search(domain=dom) - if ret == -2: + dom = ds.getDomainName() + if ret == -2 or not ds.getServerName(): dnsok = False logging.debug("IPA Server not found") if options.server: @@ -103,11 +103,15 @@ def main(): return ret else: print "Failed to find the IPA Server (DNS misconfigured?)" + srv = "" while srv == "": srv = raw_input("Please provide your server name (ex: ipa.example.com): ") ret = ds.search(domain=dom, server=srv) + srv = ds.getServerName() if ret != 0: - print "Failed to verify that "+srv+" is an IPA Server, aborting!" + print "Failed to verify that "+srv+" is an IPA Server." + print "This may mean that the remote server is not up or is not reachable" + print "due to network or firewall settings." return ret if dnsok: -- cgit