summaryrefslogtreecommitdiffstats
path: root/install/tools/ipa-dns-install
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-02-10 14:18:57 +0100
committerRob Crittenden <rcritten@redhat.com>2011-02-11 10:34:03 -0500
commit30fdafcfbe81dcd8211e8034a20a2a27389d1652 (patch)
treec93795aa9279a159c5926307f64baac9017e6eaf /install/tools/ipa-dns-install
parent5768924710a2ca64a4347c7658f12cde1b40e595 (diff)
downloadfreeipa-30fdafcfbe81dcd8211e8034a20a2a27389d1652.tar.gz
freeipa-30fdafcfbe81dcd8211e8034a20a2a27389d1652.tar.xz
freeipa-30fdafcfbe81dcd8211e8034a20a2a27389d1652.zip
ipa-dns-install does not exit on error
This patch fixes behavior of ipa-dns-install, which does not exit when an invalid configuration of /etc/hosts is detected. https://fedorahosted.org/freeipa/ticket/736
Diffstat (limited to 'install/tools/ipa-dns-install')
-rwxr-xr-xinstall/tools/ipa-dns-install29
1 files changed, 17 insertions, 12 deletions
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index 66cdaffd8..aac85bf23 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -67,19 +67,24 @@ def resolve_host(host_name):
try:
addrinfos = socket.getaddrinfo(host_name, None,
socket.AF_UNSPEC, socket.SOCK_DGRAM)
- for ai in addrinfos:
- ip = ai[4][0]
- if ip == "127.0.0.1" or ip == "::1":
- print "The hostname resolves to the localhost address (127.0.0.1/::1)"
- print "Please change your /etc/hosts file so that the hostname"
- print "resolves to the ip address of your network interface."
- print ""
- print "Please fix your /etc/hosts file and restart the setup program"
- return None
-
- ip = addrinfos[0][4][0]
except:
print "Unable to lookup the IP address of the provided host"
+ return None
+
+ for ai in addrinfos:
+ ip = ai[4][0]
+ if ip == "127.0.0.1" or ip == "::1":
+ print "The hostname resolves to the localhost address (127.0.0.1/::1)"
+ print "Please change your /etc/hosts file so that the hostname."
+ print "resolves to the ip address of your network interface."
+ print ""
+ print "Please fix your /etc/hosts file and restart the setup program."
+ print ""
+ sys.exit("Aborting installation.")
+
+ if addrinfos:
+ ip = addrinfos[0][4][0]
+
return ip
def main():
@@ -108,7 +113,7 @@ def main():
# Check bind packages are installed
if not bindinstance.check_inst(options.unattended):
- sys.exit("Aborting installation")
+ sys.exit("Aborting installation.")
# Initialize the ipalib api
cfg = dict(