From c09f116f4331175b3fb01f0bd62e78ef47fab716 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Mon, 18 Jul 2011 13:36:47 +0200
Subject: Clean up of IP address checks in install scripts.

Fixes ipa-dns-install incorrect warning.

ticket 1486
---
 install/tools/ipa-dns-install     | 12 +++++-------
 install/tools/ipa-replica-install |  4 ++--
 install/tools/ipa-server-install  | 22 ++++------------------
 ipaserver/install/installutils.py | 13 ++-----------
 4 files changed, 13 insertions(+), 38 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:
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index d499754a9..6531421ab 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -186,7 +186,7 @@ def install_bind(config, options):
     ip_address = resolve_host(config.host_name)
     if not ip_address:
         sys.exit("Unable to resolve IP address for host name")
-    ip = installutils.parse_ip_address(ip_address)
+    ip = ipautil.CheckedIPAddress(ip_address, match_local=True)
     ip_address = str(ip)
 
     if options.reverse_zone:
@@ -225,7 +225,7 @@ def install_dns_records(config, options):
     ip_address = resolve_host(config.host_name)
     if not ip_address:
         sys.exit("Unable to resolve IP address for host name")
-    ip = installutils.parse_ip_address(ip_address)
+    ip = ipautil.CheckedIPAddress(ip_address, match_local=True)
     ip_address = str(ip)
     reverse_zone = bindinstance.find_reverse_zone(ip)
 
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)
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index ba49eb8b7..c6e8641e4 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -163,15 +163,6 @@ def verify_fqdn(host_name,no_host_dns=False):
     else:
         print "Warning: Hostname (%s) not found in DNS" % host_name
 
-def parse_ip_address(addr, match_local=True, parse_netmask=True):
-    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):
-    ip = parse_ip_address(addr, match_local, parse_netmask)
-
 def record_in_hosts(ip, host_name, file="/etc/hosts"):
     hosts = open(file, 'r').readlines()
     for line in hosts:
@@ -204,7 +195,7 @@ 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)
         try:
-            ip_parsed = parse_ip_address(ip)
+            ip_parsed = ipautil.CheckedIPAddress(ip, match_local=True)
         except Exception, e:
             print "Error: Invalid IP Address %s: %s" % (ip, e)
             continue
@@ -229,7 +220,7 @@ def read_dns_forwarders():
             if not ip:
                 break
             try:
-                ip_parsed = parse_ip_address(ip, match_local=False, parse_netmask=False)
+                ip_parsed = ipautil.CheckedIPAddress(ip, parse_netmask=False)
             except Exception, e:
                 print "Error: Invalid IP Address %s: %s" % (ip, e)
                 print "DNS forwarder %s not added" % ip
-- 
cgit