summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-05-31 12:51:38 +0200
committerMartin Kosek <mkosek@redhat.com>2011-06-10 08:29:14 +0200
commit915235859cb67d4f350ff506b435586fd15505e7 (patch)
tree6cd153414ded558f5ed3e987830469d99a6b321d /ipaserver
parenta26fb5aacafa91bd67061cb85bc9f0c88b735604 (diff)
downloadfreeipa-915235859cb67d4f350ff506b435586fd15505e7.zip
freeipa-915235859cb67d4f350ff506b435586fd15505e7.tar.gz
freeipa-915235859cb67d4f350ff506b435586fd15505e7.tar.xz
IPA installation with --no-host-dns fails
--no-host-dns option should allow installing IPA server on a host without a DNS resolvable name. Update parse_ip_address and verify_ip_address functions has been changed not to return None and print error messages in case of an error, but rather let the Exception be handled by the calling routine. https://fedorahosted.org/freeipa/ticket/1246
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/installutils.py37
1 files changed, 19 insertions, 18 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index d99af37..d203f4f 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -108,6 +108,10 @@ def verify_fqdn(host_name,no_host_dns=False):
if host_name != host_name.lower():
raise RuntimeError("Invalid hostname '%s', must be lower-case." % host_name)
+ if no_host_dns:
+ print "Warning: skipping DNS resolution of host", host_name
+ return
+
try:
hostaddr = socket.getaddrinfo(host_name, None)
except:
@@ -127,10 +131,6 @@ def verify_fqdn(host_name,no_host_dns=False):
if revname != host_name:
raise RuntimeError("The host name %s does not match the reverse lookup %s" % (host_name, revname))
- if no_host_dns:
- print "Warning: skipping DNS resolution of host", host_name
- return
-
# Verify this is NOT a CNAME
rs = dnsclient.query(host_name+".", dnsclient.DNS_C_IN, dnsclient.DNS_T_CNAME)
if len(rs) != 0:
@@ -152,17 +152,13 @@ def verify_fqdn(host_name,no_host_dns=False):
print "Warning: Hostname (%s) not found in DNS" % host_name
def parse_ip_address(addr, match_local=True, parse_netmask=True):
- try:
- ip = ipautil.CheckedIPAddress(addr, match_local=match_local, parse_netmask=parse_netmask)
- if match_local and not ip.is_local():
- print "Warning: No network interface matches IP address %s" % addr
- return ip
- except Exception as e:
- print "Error: Invalid IP Address %s: %s" % (addr, e)
- return None
+ ip = ipautil.CheckedIPAddress(addr, match_local=match_local, parse_netmask=parse_netmask)
+ if match_local and not ip.is_local():
+ print "Warning: No network interface matches IP address %s" % addr
+ return ip
def verify_ip_address(addr, match_local=True, parse_netmask=True):
- return parse_ip_address(addr, match_local, parse_netmask) is not None
+ ip = parse_ip_address(addr, match_local, parse_netmask)
def record_in_hosts(ip, host_name, file="/etc/hosts"):
hosts = open(file, 'r').readlines()
@@ -195,9 +191,12 @@ def add_record_to_hosts(ip, host_name, file="/etc/hosts"):
def read_ip_address(host_name, fstore):
while True:
ip = ipautil.user_input("Please provide the IP address to be used for this host name", allow_empty = False)
- ip_parsed = parse_ip_address(ip)
-
- if ip_parsed is not None:
+ try:
+ ip_parsed = parse_ip_address(ip)
+ except Exception, e:
+ print "Error: Invalid IP Address %s: %s" % (ip, e)
+ continue
+ else:
break
ip = str(ip_parsed)
@@ -217,8 +216,10 @@ def read_dns_forwarders():
allow_empty=True)
if not ip:
break
- ip_parsed = parse_ip_address(ip, match_local=False, parse_netmask=False)
- if ip_parsed is None:
+ try:
+ ip_parsed = parse_ip_address(ip, match_local=False, parse_netmask=False)
+ except Exception, e:
+ print "Error: Invalid IP Address %s: %s" % (ip, e)
print "DNS forwarder %s not added" % ip
continue