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-dns-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-dns-install')
| -rwxr-xr-x | install/tools/ipa-dns-install | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 7c83dc869..da70c85d8 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -112,13 +112,11 @@ def main(): ip = options.ip_address else: hostaddr = resolve_host(api.env.host) - ip = hostaddr and ipautil.CheckedIPAddress(hostaddr) - - try: - verify_ip_address(ip) - except Exception, e: - print "Error: Invalid IP Address %s: %s" % (ip, e) - ip = None + try: + ip = hostaddr and ipautil.CheckedIPAddress(hostaddr, match_local=True) + except Exception, e: + print "Error: Invalid IP Address %s: %s" % (ip, e) + ip = None if not ip: if options.unattended: |