diff options
author | Jan Cholasta <jcholast@redhat.com> | 2011-07-18 13:36:47 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2011-07-19 12:30:47 +0200 |
commit | c09f116f4331175b3fb01f0bd62e78ef47fab716 (patch) | |
tree | 2502a418d712e9f90bc4c63d1d3ea3f84613504e /install/tools/ipa-server-install | |
parent | 9869b0971d98457fce181c6de78c173e1b5ebff1 (diff) | |
download | freeipa-c09f116f4331175b3fb01f0bd62e78ef47fab716.tar.gz freeipa-c09f116f4331175b3fb01f0bd62e78ef47fab716.tar.xz freeipa-c09f116f4331175b3fb01f0bd62e78ef47fab716.zip |
Clean up of IP address checks in install scripts.
Fixes ipa-dns-install incorrect warning.
ticket 1486
Diffstat (limited to 'install/tools/ipa-server-install')
-rwxr-xr-x | install/tools/ipa-server-install | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 316fc67f7..8f8100bc9 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -628,20 +628,11 @@ def main(): if hostaddr is not None: ip = CheckedIPAddress(hostaddr, match_local=True) else: - if not options.ip_address: - print "Unable to resolve IP address for host name" ip = options.ip_address - if ip is None and options.unattended: - sys.exit("Unable to resolve IP address for host name") - - if ip: - try: - verify_ip_address(ip) - except Exception, e: - print "Error: Invalid IP Address %s: %s" % (ip, e) - if options.unattended: - sys.exit(1) - ip = None + if ip is None: + print "Unable to resolve IP address for host name" + if options.unattended: + sys.exit(1) if options.ip_address: if options.ip_address != ip and not options.setup_dns: @@ -651,11 +642,6 @@ def main(): return 1 ip = options.ip_address - try: - verify_ip_address(ip) - except Exception, e: - print "Error: Invalid IP Address %s: %s" % (ip, e) - sys.exit(1) if ip is None: ip = read_ip_address(host_name, fstore) |